Mercurial > emacs
annotate src/xfaces.c @ 105327:dcbb3800a4e1
Doc/message fixes.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 01 Oct 2009 02:50:00 +0000 |
| parents | 40593ae49f6b |
| children | 68dd71358159 |
| 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, |
| 100951 | 3 2005, 2006, 2007, 2008, 2009 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 */ |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
207 |
| 2336 | 208 #include "lisp.h" |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
209 #include "character.h" |
| 17047 | 210 #include "charset.h" |
|
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
211 #include "keyboard.h" |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
212 #include "frame.h" |
|
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
213 #include "termhooks.h" |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
214 |
| 9572 | 215 #ifdef HAVE_X_WINDOWS |
| 2336 | 216 #include "xterm.h" |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
217 #ifdef USE_MOTIF |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
218 #include <Xm/Xm.h> |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
219 #include <Xm/XmStrDefs.h> |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
220 #endif /* USE_MOTIF */ |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
221 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 222 |
| 9572 | 223 #ifdef MSDOS |
| 224 #include "dosfns.h" | |
| 225 #endif | |
| 24995 | 226 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
227 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
228 #include "w32term.h" |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
229 #include "fontset.h" |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
230 /* 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
|
231 code with #ifdef blocks. */ |
|
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
232 #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
|
233 #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
|
234 #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
|
235 #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
|
236 #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
|
237 #define GCGraphicsExposures 0 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
238 #endif /* WINDOWSNT */ |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
239 |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
240 #ifdef HAVE_NS |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
241 #include "nsterm.h" |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
242 #undef FRAME_X_DISPLAY_INFO |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
243 #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
|
244 #define x_display_info ns_display_info |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
245 #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
|
246 #define check_x check_ns |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
247 #define GCGraphicsExposures 0 |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
248 #endif /* HAVE_NS */ |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
249 |
| 2336 | 250 #include "buffer.h" |
| 2391 | 251 #include "dispextern.h" |
| 2438 | 252 #include "blockinput.h" |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
253 #include "window.h" |
| 8848 | 254 #include "intervals.h" |
|
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
255 #include "termchar.h" |
| 2336 | 256 |
|
95128
9c4d21df23ff
Include font.h unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
95044
diff
changeset
|
257 #include "font.h" |
| 90414 | 258 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
259 #include "fontset.h" |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
260 #endif /* HAVE_WINDOW_SYSTEM */ |
| 90414 | 261 |
| 9572 | 262 #ifdef HAVE_X_WINDOWS |
| 24995 | 263 |
| 264 /* 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
|
265 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
|
266 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
|
267 #included. */ |
| 24995 | 268 |
|
3436
291f28da7ea1
Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents:
3401
diff
changeset
|
269 #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
|
270 #include <time.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
271 #undef USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
272 #include <X11/Xos.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
273 #define USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
274 #define __TIMEVAL__ |
| 24995 | 275 #else /* not XOS_NEEDS_TIME_H */ |
| 2336 | 276 #include <X11/Xos.h> |
| 24995 | 277 #endif /* not XOS_NEEDS_TIME_H */ |
| 278 | |
| 9572 | 279 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 280 |
| 281 #include <ctype.h> | |
| 282 | |
| 34882 | 283 /* Number of pt per inch (from the TeXbook). */ |
| 284 | |
| 285 #define PT_PER_INCH 72.27 | |
| 286 | |
| 24995 | 287 /* Non-zero if face attribute ATTR is unspecified. */ |
| 288 | |
| 289 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) | |
| 290 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
291 /* 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
|
292 |
|
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
293 #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
|
294 |
| 24995 | 295 /* Value is the number of elements of VECTOR. */ |
| 296 | |
| 297 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) | |
| 298 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
299 /* Make a copy of string S on the stack using alloca. Value is a pointer |
| 24995 | 300 to the copy. */ |
| 301 | |
| 302 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S)) | |
| 303 | |
| 304 /* Make a copy of the contents of Lisp string S on the stack using | |
| 305 alloca. Value is a pointer to the copy. */ | |
| 306 | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
307 #define LSTRDUPA(S) STRDUPA (SDATA ((S))) |
| 24995 | 308 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
309 /* Size of hash table of realized faces in face caches (should be a |
| 24995 | 310 prime number). */ |
| 311 | |
| 312 #define FACE_CACHE_BUCKETS_SIZE 1001 | |
| 313 | |
| 314 /* Keyword symbols used for face attribute names. */ | |
| 315 | |
| 316 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; | |
| 317 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; | |
| 318 Lisp_Object QCwidth, QCfont, QCbold, QCitalic; | |
| 319 Lisp_Object QCreverse_video; | |
| 31178 | 320 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
321 Lisp_Object QCfontset; |
| 24995 | 322 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
323 /* Keywords symbols used for font properties. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
324 extern Lisp_Object QCfoundry, QCadstyle, QCregistry; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
325 extern Lisp_Object QCspacing, QCsize, QCavgwidth; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
326 extern Lisp_Object Qp; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
327 |
| 24995 | 328 /* Symbols used for attribute values. */ |
| 329 | |
| 330 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
| 331 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
| 332 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
| 333 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
| 334 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
| 335 Lisp_Object Qultra_expanded; | |
| 336 Lisp_Object Qreleased_button, Qpressed_button; | |
| 337 Lisp_Object QCstyle, QCcolor, QCline_width; | |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
338 Lisp_Object Qunspecified; |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
339 Lisp_Object Qignore_defface; |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
340 |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
341 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
| 24995 | 342 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
343 /* 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
|
344 has changed, frame_set_background_mode. */ |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
345 |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
346 Lisp_Object Qframe_set_background_mode; |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
347 |
| 24995 | 348 /* Names of basic faces. */ |
| 349 | |
|
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
350 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
|
351 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
|
352 Lisp_Object Qmode_line_inactive, Qvertical_border; |
|
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
353 extern Lisp_Object Qmode_line; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
354 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
355 /* 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
|
356 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
|
357 the aliased face. */ |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
358 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
359 Lisp_Object Qface_alias; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
360 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
361 extern Lisp_Object Qcircular_list; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
362 |
| 24995 | 363 /* Default stipple pattern used on monochrome displays. This stipple |
| 364 pattern is used on monochrome displays instead of shades of gray | |
| 365 for a face background color. See `set-face-stipple' for possible | |
| 366 values for this variable. */ | |
| 367 | |
| 368 Lisp_Object Vface_default_stipple; | |
| 369 | |
| 370 /* Alist of alternative font families. Each element is of the form | |
| 371 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
| 372 try FAMILY1, then FAMILY2, ... */ | |
| 373 | |
| 374 Lisp_Object Vface_alternative_font_family_alist; | |
| 375 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
376 /* 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
|
377 (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
|
378 loaded, try REGISTRY1, then REGISTRY2, ... */ |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
379 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
380 Lisp_Object Vface_alternative_font_registry_alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
381 |
| 24995 | 382 /* Allowed scalable fonts. A value of nil means don't allow any |
| 383 scalable fonts. A value of t means allow the use of any scalable | |
| 384 font. Otherwise, value must be a list of regular expressions. A | |
| 385 font may be scaled if its name matches a regular expression in the | |
| 386 list. */ | |
| 387 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
388 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
| 24995 | 389 |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
390 /* 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
|
391 |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
392 Lisp_Object Vface_ignored_fonts; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
393 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
394 /* 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
|
395 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
396 Lisp_Object Vface_font_rescale_alist; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
397 |
| 25270 | 398 /* Maximum number of fonts to consider in font_list. If not an |
| 399 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
| 400 | |
| 401 Lisp_Object Vfont_list_limit; | |
| 402 #define DEFAULT_FONT_LIST_LIMIT 100 | |
| 403 | |
| 24995 | 404 /* The symbols `foreground-color' and `background-color' which can be |
| 405 used as part of a `face' property. This is for compatibility with | |
| 406 Emacs 20.2. */ | |
| 407 | |
| 408 Lisp_Object Qforeground_color, Qbackground_color; | |
| 409 | |
| 410 /* The symbols `face' and `mouse-face' used as text properties. */ | |
| 2342 | 411 |
|
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
412 Lisp_Object Qface; |
| 24995 | 413 extern Lisp_Object Qmouse_face; |
| 414 | |
| 57107 | 415 /* Property for basic faces which other faces cannot inherit. */ |
| 416 | |
| 417 Lisp_Object Qface_no_inherit; | |
| 418 | |
| 24995 | 419 /* Error symbol for wrong_type_argument in load_pixmap. */ |
| 420 | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
421 Lisp_Object Qbitmap_spec_p; |
| 2391 | 422 |
| 24995 | 423 /* Alist of global face definitions. Each element is of the form |
| 424 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
| 425 is a Lisp vector of face attributes. These faces are used | |
| 426 to initialize faces for new frames. */ | |
| 427 | |
| 428 Lisp_Object Vface_new_frame_defaults; | |
| 429 | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
430 /* 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
|
431 (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
|
432 REPLACEMENT... instead. REPLACEMENT... is interpreted the same way |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
433 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
|
434 (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
|
435 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
|
436 face attribute/value pairs. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
437 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
438 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
|
439 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
|
440 over those that are later. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
441 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
442 Face-name remapping cycles are suppressed; recursive references use |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
443 the underlying face instead of the remapped face. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
444 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
445 Lisp_Object Vface_remapping_alist; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
446 |
| 24995 | 447 /* The next ID to assign to Lisp faces. */ |
| 448 | |
| 449 static int next_lface_id; | |
| 450 | |
| 451 /* A vector mapping Lisp face Id's to face names. */ | |
| 452 | |
| 453 static Lisp_Object *lface_id_to_name; | |
| 454 static int lface_id_to_name_size; | |
| 455 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
456 /* 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
|
457 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
458 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
| 24995 | 459 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
460 /* 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
|
461 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
462 Lisp_Object Qtty_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
463 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
464 /* 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
|
465 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
466 Lisp_Object Vtty_defined_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
467 |
| 24995 | 468 /* Counter for calls to clear_face_cache. If this counter reaches |
| 469 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
| 470 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
| 471 | |
| 472 static int clear_font_table_count; | |
| 473 #define CLEAR_FONT_TABLE_COUNT 100 | |
| 474 #define CLEAR_FONT_TABLE_NFONTS 10 | |
| 475 | |
| 476 /* Non-zero means face attributes have been changed since the last | |
| 477 redisplay. Used in redisplay_internal. */ | |
| 478 | |
| 479 int face_change_count; | |
| 480 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
481 /* 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
|
482 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
|
483 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
|
484 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
|
485 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
486 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
|
487 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
488 /* 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
|
489 Finternal_set_lisp_face_attribute. */ |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
490 |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
491 static Lisp_Object Vparam_value_alist; |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
492 |
| 24995 | 493 /* The total number of colors currently allocated. */ |
| 494 | |
| 495 #if GLYPH_DEBUG | |
| 496 static int ncolors_allocated; | |
| 497 static int npixmaps_allocated; | |
| 498 static int ngcs; | |
| 499 #endif | |
| 500 | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
501 /* 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
|
502 been changed. */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
503 |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
504 int menu_face_changed_default; |
| 24995 | 505 |
| 2336 | 506 |
| 24995 | 507 /* Function prototypes. */ |
| 508 | |
| 509 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
|
510 struct named_merge_point; |
| 24995 | 511 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
512 static void map_tty_color P_ ((struct frame *, struct face *, |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
513 enum lface_attribute_index, int *)); |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
514 static Lisp_Object resolve_face_name P_ ((Lisp_Object, int)); |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
515 static int may_use_scalable_font_p P_ ((const char *)); |
| 24995 | 516 static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
517 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
518 int, struct named_merge_point *)); |
| 24995 | 519 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); |
| 520 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); | |
| 521 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); | |
| 522 static void free_face_colors P_ ((struct frame *, struct face *)); | |
| 523 static int face_color_gray_p P_ ((struct frame *, char *)); | |
| 88907 | 524 static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, |
| 525 int)); | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
526 static struct face *realize_non_ascii_face P_ ((struct frame *, Lisp_Object, |
| 88907 | 527 struct face *)); |
| 528 static struct face *realize_x_face P_ ((struct face_cache *, Lisp_Object *)); | |
| 529 static struct face *realize_tty_face P_ ((struct face_cache *, Lisp_Object *)); | |
| 24995 | 530 static int realize_basic_faces P_ ((struct frame *)); |
| 531 static int realize_default_face P_ ((struct frame *)); | |
| 532 static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); | |
| 533 static int lface_fully_specified_p P_ ((Lisp_Object *)); | |
| 534 static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); | |
| 535 static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); | |
| 536 static unsigned lface_hash P_ ((Lisp_Object *)); | |
| 537 static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); | |
| 538 static struct face_cache *make_face_cache P_ ((struct frame *)); | |
| 539 static void clear_face_gcs P_ ((struct face_cache *)); | |
| 540 static void free_face_cache P_ ((struct face_cache *)); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
541 static int face_fontset P_ ((Lisp_Object *)); |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
542 static void merge_face_vectors P_ ((struct frame *, Lisp_Object *, Lisp_Object*, |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
543 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
|
544 static int merge_face_ref P_ ((struct frame *, Lisp_Object, Lisp_Object *, |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
545 int, struct named_merge_point *)); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
546 static int set_lface_from_font P_ ((struct frame *, Lisp_Object, Lisp_Object, |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
547 int)); |
| 24995 | 548 static Lisp_Object lface_from_face_name P_ ((struct frame *, Lisp_Object, int)); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
549 static struct face *make_realized_face P_ ((Lisp_Object *)); |
| 24995 | 550 static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); |
| 551 static void uncache_face P_ ((struct face_cache *, struct face *)); | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
552 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
553 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 554 |
| 555 static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); | |
| 556 static void x_free_gc P_ ((struct frame *, GC)); | |
| 557 | |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
558 #ifdef USE_X_TOOLKIT |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
559 static void x_update_menu_appearance P_ ((struct frame *)); |
| 39675 | 560 |
| 561 extern void free_frame_menubar P_ ((struct frame *)); | |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
562 #endif /* USE_X_TOOLKIT */ |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
563 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
564 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 565 |
| 566 | |
| 567 /*********************************************************************** | |
| 568 Utilities | |
| 569 ***********************************************************************/ | |
| 570 | |
| 571 #ifdef HAVE_X_WINDOWS | |
| 572 | |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
573 #ifdef DEBUG_X_COLORS |
|
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 /* 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
|
576 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
|
577 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
|
578 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
|
579 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
|
580 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
|
581 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
|
582 single display/screen. --gerd. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
583 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
584 /* Reference counts for pixel colors. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
585 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
586 int color_count[256]; |
|
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 /* Register color PIXEL as allocated. */ |
|
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 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
591 register_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
592 unsigned long pixel; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
593 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
594 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 ++color_count[pixel]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
597 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
598 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
599 /* Register color PIXEL as deallocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
600 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
601 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
602 unregister_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
603 unsigned long pixel; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
605 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
606 if (color_count[pixel] > 0) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
607 --color_count[pixel]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
608 else |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
609 abort (); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
610 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
611 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 /* Register N colors from PIXELS as deallocated. */ |
|
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 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
616 unregister_colors (pixels, n) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
617 unsigned long *pixels; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
618 int n; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
619 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
620 int i; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
621 for (i = 0; i < n; ++i) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
622 unregister_color (pixels[i]); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
623 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
624 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
625 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
626 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
|
627 doc: /* Dump currently allocated colors to stderr. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
628 () |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
629 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
630 int i, n; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
631 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
632 fputc ('\n', stderr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
633 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
634 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
|
635 if (color_count[i]) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
636 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
637 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
|
638 ++n; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
639 if (n % 5 == 0) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
640 fputc ('\n', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
641 else |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
642 fputc ('\t', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
643 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
644 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
645 if (n % 5 != 0) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
646 fputc ('\n', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
647 return Qnil; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
648 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
649 |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
650 #endif /* DEBUG_X_COLORS */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
651 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
652 |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
653 /* 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
|
654 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
|
655 is called. */ |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
656 |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
657 void |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
658 x_free_colors (f, pixels, npixels) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
659 struct frame *f; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
660 unsigned long *pixels; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
661 int npixels; |
|
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 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
664 |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
665 /* 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
|
666 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
|
667 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
668 { |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
669 #ifdef DEBUG_X_COLORS |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
670 unregister_colors (pixels, npixels); |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
671 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
672 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
|
673 pixels, npixels, 0); |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
674 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
675 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
676 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
677 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
678 /* 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
|
679 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
|
680 is called. */ |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
681 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
682 void |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
683 x_free_dpy_colors (dpy, screen, cmap, pixels, npixels) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
684 Display *dpy; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
685 Screen *screen; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
686 Colormap cmap; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
687 unsigned long *pixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
688 int npixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
689 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
690 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
|
691 int class = dpyinfo->visual->class; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
692 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
693 /* 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
|
694 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
|
695 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
696 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
697 #ifdef DEBUG_X_COLORS |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
698 unregister_colors (pixels, npixels); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
699 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
700 XFreeColors (dpy, cmap, pixels, npixels, 0); |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
701 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
702 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
703 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
704 |
| 24995 | 705 /* Create and return a GC for use on frame F. GC values and mask |
| 706 are given by XGCV and MASK. */ | |
| 707 | |
| 708 static INLINE GC | |
| 709 x_create_gc (f, mask, xgcv) | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
710 struct frame *f; |
| 24995 | 711 unsigned long mask; |
| 712 XGCValues *xgcv; | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
713 { |
| 2336 | 714 GC gc; |
| 24995 | 715 BLOCK_INPUT; |
| 716 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
| 717 UNBLOCK_INPUT; | |
| 718 IF_DEBUG (++ngcs); | |
| 719 return gc; | |
| 720 } | |
| 721 | |
| 722 | |
| 723 /* Free GC which was used on frame F. */ | |
| 724 | |
| 725 static INLINE void | |
| 726 x_free_gc (f, gc) | |
| 727 struct frame *f; | |
| 728 GC gc; | |
| 729 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
730 eassert (interrupt_input_blocked); |
|
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
731 IF_DEBUG (xassert (--ngcs >= 0)); |
| 24995 | 732 XFreeGC (FRAME_X_DISPLAY (f), gc); |
| 733 } | |
| 734 | |
| 735 #endif /* HAVE_X_WINDOWS */ | |
| 736 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
737 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
738 /* W32 emulation of GCs */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
739 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
740 static INLINE GC |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
741 x_create_gc (f, mask, xgcv) |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
742 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
743 unsigned long mask; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
744 XGCValues *xgcv; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
745 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
746 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
747 BLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
748 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
|
749 UNBLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
750 IF_DEBUG (++ngcs); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
751 return gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
752 } |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
753 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
754 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
755 /* 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
|
756 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
757 static INLINE void |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
758 x_free_gc (f, gc) |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
759 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
760 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
761 { |
|
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
762 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
|
763 xfree (gc); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
764 } |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
765 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
766 #endif /* WINDOWSNT */ |
| 24995 | 767 |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
768 #ifdef HAVE_NS |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
769 /* NS emulation of GCs */ |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
770 |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
771 static INLINE GC |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
772 x_create_gc (f, mask, xgcv) |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
773 struct frame *f; |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
774 unsigned long mask; |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
775 XGCValues *xgcv; |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
776 { |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
777 GC gc = xmalloc (sizeof (*gc)); |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
778 if (gc) |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
779 bcopy(xgcv, gc, sizeof(XGCValues)); |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
780 return gc; |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
781 } |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
782 |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
783 static INLINE void |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
784 x_free_gc (f, gc) |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
785 struct frame *f; |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
786 GC gc; |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
787 { |
|
103624
3e06f0e66062
Remove useless if-before-xfree tests.
Jim Meyering <jim@meyering.net>
parents:
103359
diff
changeset
|
788 xfree (gc); |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
789 } |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
790 #endif /* HAVE_NS */ |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
791 |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
792 /* 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
|
793 are in ISO8859-1. */ |
| 24995 | 794 |
| 795 int | |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
796 xstrcasecmp (s1, s2) |
|
46478
d6b51ec01987
(xstricmp): String pointer args now point to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
797 const unsigned char *s1, *s2; |
| 24995 | 798 { |
| 799 while (*s1 && *s2) | |
| 800 { | |
| 801 unsigned char c1 = tolower (*s1); | |
| 802 unsigned char c2 = tolower (*s2); | |
| 803 if (c1 != c2) | |
| 804 return c1 < c2 ? -1 : 1; | |
| 805 ++s1, ++s2; | |
| 806 } | |
| 807 | |
| 808 if (*s1 == 0) | |
| 809 return *s2 == 0 ? 0 : -1; | |
| 810 return 1; | |
| 811 } | |
| 812 | |
| 813 | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
814 /* 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
|
815 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
|
816 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
|
817 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
|
818 Lisp function definitions. */ |
| 24995 | 819 |
| 820 static INLINE struct frame * | |
| 821 frame_or_selected_frame (frame, nparam) | |
| 822 Lisp_Object frame; | |
| 823 int nparam; | |
| 824 { | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
825 if (NILP (frame)) |
|
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
826 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
827 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
828 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
829 return XFRAME (frame); |
| 24995 | 830 } |
| 831 | |
| 832 | |
| 833 /*********************************************************************** | |
| 834 Frames and faces | |
| 835 ***********************************************************************/ | |
| 836 | |
| 837 /* 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
|
838 |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
839 void |
| 24995 | 840 init_frame_faces (f) |
| 841 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
|
842 { |
| 24995 | 843 /* Make a face cache, if F doesn't have one. */ |
| 844 if (FRAME_FACE_CACHE (f) == NULL) | |
| 845 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
846 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
847 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 848 /* 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
|
849 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
|
850 { |
| 100398 | 851 /* We initialize the image cache when creating the first frame |
| 852 on a terminal, and not during terminal creation. This way, | |
| 853 `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
|
854 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
|
855 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
|
856 ++FRAME_IMAGE_CACHE (f)->refcount; |
| 24995 | 857 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
858 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 859 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
860 /* Realize basic faces. Must have enough information in frame |
| 24995 | 861 parameters to realize basic faces at this point. */ |
| 862 #ifdef HAVE_X_WINDOWS | |
| 863 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
| 864 #endif | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
865 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
866 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
|
867 #endif |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
868 #ifdef HAVE_NS |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
869 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
|
870 #endif |
| 24995 | 871 if (!realize_basic_faces (f)) |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
872 abort (); |
| 24995 | 873 } |
| 874 | |
| 875 | |
|
100666
dab9cf44bf3f
In comments, write delete_frame instead of Fdelete_frame.
Martin Rudalics <rudalics@gmx.at>
parents:
100398
diff
changeset
|
876 /* Free face cache of frame F. Called from delete_frame. */ |
| 24995 | 877 |
| 878 void | |
| 879 free_frame_faces (f) | |
| 880 struct frame *f; | |
| 881 { | |
| 882 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
|
883 |
| 24995 | 884 if (face_cache) |
| 885 { | |
| 886 free_face_cache (face_cache); | |
| 887 FRAME_FACE_CACHE (f) = NULL; | |
| 888 } | |
| 889 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
890 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
891 if (FRAME_WINDOW_P (f)) |
| 24995 | 892 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
893 struct image_cache *image_cache = FRAME_IMAGE_CACHE (f); |
| 24995 | 894 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
|
895 { |
| 24995 | 896 --image_cache->refcount; |
| 897 if (image_cache->refcount == 0) | |
| 898 free_image_cache (f); | |
| 899 } | |
| 900 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
901 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 902 } |
| 903 | |
| 904 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
905 /* 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
|
906 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
|
907 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
|
908 of named faces. */ |
| 24995 | 909 |
| 910 void | |
| 911 recompute_basic_faces (f) | |
| 912 struct frame *f; | |
| 913 { | |
| 914 if (FRAME_FACE_CACHE (f)) | |
| 915 { | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
916 clear_face_cache (0); |
|
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
917 if (!realize_basic_faces (f)) |
|
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
918 abort (); |
| 24995 | 919 } |
| 920 } | |
| 921 | |
| 922 | |
| 923 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
| 924 try to free unused fonts, too. */ | |
| 925 | |
| 926 void | |
| 927 clear_face_cache (clear_fonts_p) | |
| 928 int clear_fonts_p; | |
| 929 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
930 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 931 Lisp_Object tail, frame; |
| 932 struct frame *f; | |
| 933 | |
| 934 if (clear_fonts_p | |
| 935 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
| 936 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
937 #if 0 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
938 /* Not yet implemented. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
939 clear_font_cache (frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
940 #endif |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
941 |
| 24995 | 942 /* From time to time see if we can unload some fonts. This also |
| 943 frees all realized faces on all frames. Fonts needed by | |
| 944 faces will be loaded again when faces are realized again. */ | |
| 945 clear_font_table_count = 0; | |
| 946 | |
| 947 FOR_EACH_FRAME (tail, frame) | |
| 948 { | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
949 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
|
950 if (FRAME_WINDOW_P (f) |
| 24995 | 951 && 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
|
952 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
|
953 } |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
954 } |
| 24995 | 955 else |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
956 { |
| 24995 | 957 /* Clear GCs of realized faces. */ |
| 958 FOR_EACH_FRAME (tail, frame) | |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
959 { |
| 24995 | 960 f = XFRAME (frame); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
961 if (FRAME_WINDOW_P (f)) |
| 24995 | 962 clear_face_gcs (FRAME_FACE_CACHE (f)); |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
963 } |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
964 clear_image_caches (Qnil); |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
965 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
966 #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
|
967 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
968 |
| 24995 | 969 |
| 970 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
|
971 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
|
972 Optional THOROUGHLY non-nil means try to free unused fonts, too. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
973 (thoroughly) |
|
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
974 Lisp_Object thoroughly; |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
975 { |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
976 clear_face_cache (!NILP (thoroughly)); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
977 ++face_change_count; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
978 ++windows_or_buffers_changed; |
| 24995 | 979 return Qnil; |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
980 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
981 |
| 24995 | 982 |
| 983 /*********************************************************************** | |
| 984 X Pixmaps | |
| 985 ***********************************************************************/ | |
| 986 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
987 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 988 |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
989 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
|
990 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
|
991 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
|
992 \(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
|
993 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
|
994 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
|
995 \(WIDTH + 7)/8 bytes. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
996 (object) |
|
14090
24b93860d392
(Fpixmap_spec_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
997 Lisp_Object object; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
998 { |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
999 int pixmap_p = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1000 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1001 if (STRINGP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1002 /* 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
|
1003 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1004 else if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1005 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1006 /* 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
|
1007 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
|
1008 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
|
1009 Lisp_Object width, height, data; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1010 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1011 height = width = data = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1012 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1013 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1014 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1015 width = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1016 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1017 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1018 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1019 height = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1020 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1021 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1022 data = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1023 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1024 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1025 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1026 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1027 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1028 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
|
1029 / 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
|
1030 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
|
1031 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1032 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1033 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1034 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1035 return pixmap_p ? Qt : Qnil; |
|
9564
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 |
| 24995 | 1038 |
| 1039 /* Load a bitmap according to NAME (which is either a file name or a | |
| 1040 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
| 1041 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
| 1042 bitmap cannot be loaded, display a message saying so, and return | |
| 1043 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
| 1044 if these pointers are not null. */ | |
| 1045 | |
| 1046 static int | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1047 load_pixmap (f, name, w_ptr, h_ptr) |
|
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1048 FRAME_PTR f; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1049 Lisp_Object name; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1050 unsigned int *w_ptr, *h_ptr; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1051 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1052 int bitmap_id; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1053 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1054 if (NILP (name)) |
| 24995 | 1055 return 0; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1056 |
|
71845
085d9056841a
(load_pixmap): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71576
diff
changeset
|
1057 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
|
1058 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1059 BLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1060 if (CONSP (name)) |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1061 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1062 /* Decode a bitmap spec into a bitmap. */ |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1063 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1064 int h, w; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1065 Lisp_Object bits; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1066 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1067 w = XINT (Fcar (name)); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1068 h = XINT (Fcar (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1069 bits = Fcar (Fcdr (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1070 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1071 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
|
1072 w, h); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1073 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1074 else |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1075 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1076 /* 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
|
1077 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
|
1078 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1079 UNBLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1080 |
|
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1081 if (bitmap_id < 0) |
| 24995 | 1082 { |
|
72446
44f03dd44abf
(load_pixmap): Add quotes in error message.
Richard M. Stallman <rms@gnu.org>
parents:
72170
diff
changeset
|
1083 add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil); |
| 24995 | 1084 bitmap_id = 0; |
| 1085 | |
| 1086 if (w_ptr) | |
| 1087 *w_ptr = 0; | |
| 1088 if (h_ptr) | |
| 1089 *h_ptr = 0; | |
| 1090 } | |
| 1091 else | |
| 1092 { | |
| 1093 #if GLYPH_DEBUG | |
| 1094 ++npixmaps_allocated; | |
| 1095 #endif | |
| 1096 if (w_ptr) | |
| 1097 *w_ptr = x_bitmap_width (f, bitmap_id); | |
| 1098 | |
| 1099 if (h_ptr) | |
| 1100 *h_ptr = x_bitmap_height (f, bitmap_id); | |
| 1101 } | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1102 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1103 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
|
1104 } |
| 9572 | 1105 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1106 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1107 |
| 9572 | 1108 |
| 2336 | 1109 |
| 24995 | 1110 /*********************************************************************** |
| 1111 X Colors | |
| 1112 ***********************************************************************/ | |
| 1113 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1114 /* 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
|
1115 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
|
1116 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
|
1117 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1118 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1119 parse_rgb_list (rgb_list, color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1120 Lisp_Object rgb_list; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1121 XColor *color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1122 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1123 #define PARSE_RGB_LIST_FIELD(field) \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1124 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
|
1125 { \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1126 color->field = XINT (XCAR (rgb_list)); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1127 rgb_list = XCDR (rgb_list); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1128 } \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1129 else \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1130 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1131 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1132 PARSE_RGB_LIST_FIELD (red); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1133 PARSE_RGB_LIST_FIELD (green); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1134 PARSE_RGB_LIST_FIELD (blue); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1135 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1136 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1137 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1138 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1139 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1140 /* 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
|
1141 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
|
1142 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
|
1143 returned in it. */ |
|
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 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1146 tty_lookup_color (f, color, tty_color, std_color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1147 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1148 Lisp_Object color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1149 XColor *tty_color, *std_color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1150 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1151 Lisp_Object frame, color_desc; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1152 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1153 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
|
1154 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1155 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1156 XSETFRAME (frame, f); |
|
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 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
|
1159 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
|
1160 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1161 Lisp_Object rgb; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1162 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1163 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1164 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1165 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1166 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
|
1167 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1168 rgb = XCDR (XCDR (color_desc)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1169 if (! parse_rgb_list (rgb, tty_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1170 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1171 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1172 /* Should we fill in STD_COLOR too? */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1173 if (std_color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1174 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1175 /* 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
|
1176 *std_color = *tty_color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1177 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1178 /* 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
|
1179 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
|
1180 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
|
1181 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
|
1182 if ((!STRINGP (XCAR (color_desc)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1183 || 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
|
1184 && !NILP (Ffboundp (Qtty_color_standard_values))) |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1185 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1186 /* Look up STD_COLOR separately. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1187 rgb = call1 (Qtty_color_standard_values, color); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1188 if (! parse_rgb_list (rgb, std_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1189 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1190 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1191 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1192 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1193 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1194 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1195 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
|
1196 /* 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
|
1197 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
|
1198 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
|
1199 load color" messages in the *Messages* buffer. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1200 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1201 else |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1202 /* 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
|
1203 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1204 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1205 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1206 /* 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
|
1207 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1208 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1209 tty_defined_color (f, color_name, color_def, alloc) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1210 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1211 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1212 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1213 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1214 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1215 int status = 1; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1216 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1217 /* Defaults. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1218 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
|
1219 color_def->red = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1220 color_def->blue = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1221 color_def->green = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1222 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1223 if (*color_name) |
|
89554
15da46f6f0ac
(face_numeric_value): Declare dim size_t.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1224 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
|
1225 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1226 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
|
1227 { |
|
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1228 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
|
1229 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
|
1230 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
|
1231 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
|
1232 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1233 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1234 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
|
1235 status = 1; |
|
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1236 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1237 return status; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1238 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1239 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1240 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1241 /* 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
|
1242 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
|
1243 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
|
1244 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1245 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
|
1246 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1247 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1248 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
|
1249 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1250 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1251 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1252 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1253 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1254 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
|
1255 return tty_defined_color (f, color_name, color_def, alloc); |
| 24995 | 1256 #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
|
1257 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
|
1258 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
|
1259 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1260 #ifdef WINDOWSNT |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1261 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
|
1262 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
|
1263 #endif |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1264 #ifdef HAVE_NS |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1265 else if (FRAME_NS_P (f)) |
|
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1266 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
|
1267 #endif |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1268 else |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1269 abort (); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1270 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1271 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1272 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1273 /* 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
|
1274 Lisp string. */ |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1275 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1276 Lisp_Object |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1277 tty_color_name (f, idx) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1278 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1279 int idx; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1280 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1281 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
|
1282 { |
|
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1283 Lisp_Object frame; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1284 Lisp_Object coldesc; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1285 |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1286 XSETFRAME (frame, f); |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1287 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
|
1288 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1289 if (!NILP (coldesc)) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1290 return XCAR (coldesc); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1291 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1292 #ifdef MSDOS |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1293 /* 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
|
1294 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
|
1295 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
|
1296 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
|
1297 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1298 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1299 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1300 return build_string (unspecified_fg); |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1301 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1302 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
|
1303 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1304 return Qunspecified; |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1305 } |
| 24995 | 1306 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1307 |
| 24995 | 1308 /* 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
|
1309 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
|
1310 |
|
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1311 The criterion implemented here is not a terribly sophisticated one. */ |
| 24995 | 1312 |
| 1313 static int | |
| 1314 face_color_gray_p (f, color_name) | |
| 1315 struct frame *f; | |
| 1316 char *color_name; | |
| 1317 { | |
| 1318 XColor color; | |
| 1319 int gray_p; | |
| 1320 | |
| 1321 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
|
1322 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
|
1323 (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
|
1324 || |
| 85262 | 1325 ((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
|
1326 < max (color.red, color.green) / 20) |
| 85262 | 1327 && (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
|
1328 < max (color.green, color.blue) / 20) |
| 85262 | 1329 && (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
|
1330 < max (color.blue, color.red) / 20))); |
| 24995 | 1331 else |
| 1332 gray_p = 0; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1333 |
| 24995 | 1334 return gray_p; |
| 1335 } | |
| 1336 | |
| 1337 | |
| 1338 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
| 1339 BACKGROUND_P non-zero means the color will be used as background | |
| 1340 color. */ | |
| 1341 | |
| 1342 static int | |
| 1343 face_color_supported_p (f, color_name, background_p) | |
| 1344 struct frame *f; | |
| 1345 char *color_name; | |
| 1346 int background_p; | |
| 1347 { | |
| 1348 Lisp_Object frame; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1349 XColor not_used; |
| 24995 | 1350 |
| 1351 XSETFRAME (frame, f); | |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1352 return |
|
59924
3590dd3050ba
(face_color_supported_p): Use HAVE_WINDOW_SYSTEM
Eli Zaretskii <eliz@gnu.org>
parents:
59905
diff
changeset
|
1353 #ifdef HAVE_WINDOW_SYSTEM |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1354 FRAME_WINDOW_P (f) |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1355 ? (!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
|
1356 || xstrcasecmp (color_name, "black") == 0 |
|
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
1357 || 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
|
1358 || (background_p |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1359 && 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
|
1360 || (!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
|
1361 && 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
|
1362 : |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1363 #endif |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1364 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
|
1365 } |
| 24995 | 1366 |
| 1367 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1368 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
|
1369 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
|
1370 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
|
1371 If FRAME is nil or omitted, use the selected frame. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1372 (color, frame) |
| 24995 | 1373 Lisp_Object color, frame; |
| 1374 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1375 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1376 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1377 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1378 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1379 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1380 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1381 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1382 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
|
1383 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
| 24995 | 1384 } |
| 1385 | |
| 1386 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1387 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
|
1388 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
|
1389 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
|
1390 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
|
1391 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
|
1392 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
|
1393 COLOR must be a valid color name. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1394 (color, frame, background_p) |
| 24995 | 1395 Lisp_Object frame, color, background_p; |
| 1396 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1397 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1398 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1399 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1400 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1401 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1402 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1403 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1404 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
|
1405 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
| 24995 | 1406 return Qt; |
| 1407 return Qnil; | |
| 1408 } | |
| 1409 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1410 |
| 24995 | 1411 /* Load color with name NAME for use by face FACE on frame F. |
| 1412 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
| 1413 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
| 1414 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
| 1415 pixel color. If color cannot be loaded, display a message, and | |
| 1416 return the foreground, background or underline color of F, but | |
| 1417 record that fact in flags of the face so that we don't try to free | |
| 1418 these colors. */ | |
| 1419 | |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1420 unsigned long |
| 24995 | 1421 load_color (f, face, name, target_index) |
| 1422 struct frame *f; | |
| 1423 struct face *face; | |
| 1424 Lisp_Object name; | |
| 1425 enum lface_attribute_index target_index; | |
| 1426 { | |
| 1427 XColor color; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1428 |
| 24995 | 1429 xassert (STRINGP (name)); |
| 1430 xassert (target_index == LFACE_FOREGROUND_INDEX | |
| 1431 || target_index == LFACE_BACKGROUND_INDEX | |
| 1432 || target_index == LFACE_UNDERLINE_INDEX | |
| 1433 || target_index == LFACE_OVERLINE_INDEX | |
| 1434 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
| 1435 || target_index == LFACE_BOX_INDEX); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1436 |
| 24995 | 1437 /* if the color map is full, defined_color will return a best match |
| 1438 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
|
1439 if (!defined_color (f, SDATA (name), &color, 1)) |
| 24995 | 1440 { |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1441 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
|
1442 |
| 24995 | 1443 switch (target_index) |
| 1444 { | |
| 1445 case LFACE_FOREGROUND_INDEX: | |
| 1446 face->foreground_defaulted_p = 1; | |
| 1447 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1448 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1449 |
| 24995 | 1450 case LFACE_BACKGROUND_INDEX: |
| 1451 face->background_defaulted_p = 1; | |
| 1452 color.pixel = FRAME_BACKGROUND_PIXEL (f); | |
| 1453 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1454 |
| 24995 | 1455 case LFACE_UNDERLINE_INDEX: |
| 1456 face->underline_defaulted_p = 1; | |
| 1457 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1458 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1459 |
| 24995 | 1460 case LFACE_OVERLINE_INDEX: |
| 1461 face->overline_color_defaulted_p = 1; | |
| 1462 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1463 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1464 |
| 24995 | 1465 case LFACE_STRIKE_THROUGH_INDEX: |
| 1466 face->strike_through_color_defaulted_p = 1; | |
| 1467 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1468 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1469 |
| 24995 | 1470 case LFACE_BOX_INDEX: |
| 1471 face->box_color_defaulted_p = 1; | |
| 1472 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1473 break; | |
| 1474 | |
| 1475 default: | |
| 1476 abort (); | |
| 1477 } | |
| 1478 } | |
| 1479 #if GLYPH_DEBUG | |
| 1480 else | |
| 1481 ++ncolors_allocated; | |
| 1482 #endif | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1483 |
| 24995 | 1484 return color.pixel; |
| 1485 } | |
| 1486 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1487 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1488 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1489 |
| 1490 /* Load colors for face FACE which is used on frame F. Colors are | |
| 1491 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
| 1492 of ATTRS. If the background color specified is not supported on F, | |
| 1493 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
| 1494 | |
| 1495 static void | |
| 1496 load_face_colors (f, face, attrs) | |
| 1497 struct frame *f; | |
| 1498 struct face *face; | |
| 1499 Lisp_Object *attrs; | |
| 1500 { | |
| 1501 Lisp_Object fg, bg; | |
| 1502 | |
| 1503 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
| 1504 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
| 1505 | |
| 1506 /* Swap colors if face is inverse-video. */ | |
| 1507 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
| 1508 { | |
| 1509 Lisp_Object tmp; | |
| 1510 tmp = fg; | |
| 1511 fg = bg; | |
| 1512 bg = tmp; | |
| 1513 } | |
| 1514 | |
| 1515 /* Check for support for foreground, not for background because | |
| 1516 face_color_supported_p is smart enough to know that grays are | |
| 1517 "supported" as background because we are supposed to use stipple | |
| 1518 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
|
1519 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
|
1520 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
| 24995 | 1521 { |
| 1522 x_destroy_bitmap (f, face->stipple); | |
| 1523 face->stipple = load_pixmap (f, Vface_default_stipple, | |
| 1524 &face->pixmap_w, &face->pixmap_h); | |
| 1525 } | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1526 |
|
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1527 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
| 24995 | 1528 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
| 1529 } | |
| 1530 | |
| 1531 | |
| 1532 /* Free color PIXEL on frame F. */ | |
| 1533 | |
| 1534 void | |
| 1535 unload_color (f, pixel) | |
| 1536 struct frame *f; | |
| 1537 unsigned long pixel; | |
| 1538 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1539 #ifdef HAVE_X_WINDOWS |
|
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1540 if (pixel != -1) |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1541 { |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1542 BLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1543 x_free_colors (f, &pixel, 1); |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1544 UNBLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1545 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1546 #endif |
| 24995 | 1547 } |
| 1548 | |
| 1549 | |
| 1550 /* Free colors allocated for FACE. */ | |
| 1551 | |
| 1552 static void | |
| 1553 free_face_colors (f, face) | |
| 1554 struct frame *f; | |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1555 struct face *face; |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1556 { |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1557 /* 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
|
1558 #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
|
1559 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
|
1560 return; |
|
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1561 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1562 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1563 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1564 if (!face->foreground_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1565 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1566 x_free_colors (f, &face->foreground, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1567 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1568 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1569 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1570 if (!face->background_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1571 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1572 x_free_colors (f, &face->background, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1573 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1574 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1575 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1576 if (face->underline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1577 && !face->underline_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1578 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1579 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
|
1580 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1581 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1582 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1583 if (face->overline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1584 && !face->overline_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1585 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1586 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
|
1587 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1588 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1589 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1590 if (face->strike_through_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1591 && !face->strike_through_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1592 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1593 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
|
1594 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1595 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1596 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1597 if (face->box != FACE_NO_BOX |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1598 && !face->box_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1599 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1600 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
|
1601 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1602 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1603 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1604 UNBLOCK_INPUT; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1605 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 1606 } |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1607 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1608 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1609 |
| 1610 | |
| 1611 | |
| 1612 /*********************************************************************** | |
| 1613 XLFD Font Names | |
| 1614 ***********************************************************************/ | |
| 1615 | |
| 1616 /* An enumerator for each field of an XLFD font name. */ | |
| 1617 | |
| 1618 enum xlfd_field | |
| 1619 { | |
| 1620 XLFD_FOUNDRY, | |
| 1621 XLFD_FAMILY, | |
| 1622 XLFD_WEIGHT, | |
| 1623 XLFD_SLANT, | |
| 1624 XLFD_SWIDTH, | |
| 1625 XLFD_ADSTYLE, | |
| 1626 XLFD_PIXEL_SIZE, | |
| 1627 XLFD_POINT_SIZE, | |
| 1628 XLFD_RESX, | |
| 1629 XLFD_RESY, | |
| 1630 XLFD_SPACING, | |
| 1631 XLFD_AVGWIDTH, | |
| 1632 XLFD_REGISTRY, | |
| 1633 XLFD_ENCODING, | |
| 1634 XLFD_LAST | |
| 1635 }; | |
| 1636 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1637 /* An enumerator for each possible slant value of a font. Taken from |
| 24995 | 1638 the XLFD specification. */ |
| 1639 | |
| 1640 enum xlfd_slant | |
| 1641 { | |
| 1642 XLFD_SLANT_UNKNOWN, | |
| 1643 XLFD_SLANT_ROMAN, | |
| 1644 XLFD_SLANT_ITALIC, | |
| 1645 XLFD_SLANT_OBLIQUE, | |
| 1646 XLFD_SLANT_REVERSE_ITALIC, | |
| 1647 XLFD_SLANT_REVERSE_OBLIQUE, | |
| 1648 XLFD_SLANT_OTHER | |
| 1649 }; | |
| 1650 | |
| 1651 /* Relative font weight according to XLFD documentation. */ | |
| 1652 | |
| 1653 enum xlfd_weight | |
| 1654 { | |
| 1655 XLFD_WEIGHT_UNKNOWN, | |
| 1656 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
| 1657 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
| 1658 XLFD_WEIGHT_LIGHT, /* 30 */ | |
| 1659 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
| 1660 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1661 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
| 1662 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
| 1663 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
| 1664 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
| 1665 }; | |
| 1666 | |
| 1667 /* Relative proportionate width. */ | |
| 1668 | |
| 1669 enum xlfd_swidth | |
| 1670 { | |
| 1671 XLFD_SWIDTH_UNKNOWN, | |
| 1672 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
| 1673 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
| 1674 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
| 1675 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
| 1676 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1677 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
| 1678 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
| 1679 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
| 1680 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
| 1681 }; | |
| 1682 | |
| 1683 /* Order by which font selection chooses fonts. The default values | |
| 1684 mean `first, find a best match for the font width, then for the | |
| 1685 font height, then for weight, then for slant.' This variable can be | |
| 1686 set via set-face-font-sort-order. */ | |
| 1687 | |
| 1688 static int font_sort_order[4]; | |
| 1689 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1690 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1691 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1692 static enum font_property_index font_props_for_sorting[FONT_SIZE_INDEX]; |
| 24995 | 1693 |
| 1694 static int | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1695 compare_fonts_by_sort_order (v1, v2) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1696 const void *v1, *v2; |
| 24995 | 1697 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1698 Lisp_Object font1 = *(Lisp_Object *) v1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1699 Lisp_Object font2 = *(Lisp_Object *) v2; |
| 24995 | 1700 int i; |
|
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
1701 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1702 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
|
1703 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1704 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
|
1705 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
|
1706 int result; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1707 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1708 if (idx <= FONT_REGISTRY_INDEX) |
| 24995 | 1709 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1710 if (STRINGP (val1)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1711 result = STRINGP (val2) ? strcmp (SDATA (val1), SDATA (val2)) : -1; |
| 24995 | 1712 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1713 result = STRINGP (val2) ? 1 : 0; |
| 24995 | 1714 } |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
1715 else |
| 24995 | 1716 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1717 if (INTEGERP (val1)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1718 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
|
1719 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1720 result = INTEGERP (val2) ? 1 : 0; |
|
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
1721 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1722 if (result) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1723 return result; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1724 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1725 return 0; |
| 24995 | 1726 } |
| 1727 | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
1728 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
|
1729 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
|
1730 If FAMILY is omitted or nil, list all families. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1731 Otherwise, FAMILY must be a string, possibly containing wildcards |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1732 `?' and `*'. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1733 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
|
1734 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
|
1735 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1736 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
|
1737 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
|
1738 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
|
1739 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
|
1740 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
|
1741 giving the registry and encoding of the font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1742 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
|
1743 the face font sort order. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1744 (family, frame) |
| 24995 | 1745 Lisp_Object family, frame; |
| 1746 { | |
|
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1747 Lisp_Object font_spec, vec; |
| 24995 | 1748 int i, nfonts; |
| 1749 Lisp_Object result; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1750 |
|
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1751 if (NILP (frame)) |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1752 frame = selected_frame; |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1753 CHECK_LIVE_FRAME (frame); |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1754 |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1755 font_spec = Ffont_spec (0, NULL); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1756 if (!NILP (family)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1757 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1758 CHECK_STRING (family); |
|
95574
fa7d768bdd0b
(Fx_family_fonts): Use font_parse_family_registry instead of
Kenichi Handa <handa@m17n.org>
parents:
95567
diff
changeset
|
1759 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
|
1760 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1761 vec = font_list_entities (frame, font_spec); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1762 nfonts = ASIZE (vec); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1763 if (nfonts == 0) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1764 return Qnil; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1765 if (nfonts > 1) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1766 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1767 for (i = 0; i < 4; i++) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1768 switch (font_sort_order[i]) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1769 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1770 case XLFD_SWIDTH: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1771 font_props_for_sorting[i] = FONT_WIDTH_INDEX; break; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1772 case XLFD_POINT_SIZE: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1773 font_props_for_sorting[i] = FONT_SIZE_INDEX; break; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1774 case XLFD_WEIGHT: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1775 font_props_for_sorting[i] = FONT_WEIGHT_INDEX; break; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1776 default: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1777 font_props_for_sorting[i] = FONT_SLANT_INDEX; break; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1778 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1779 font_props_for_sorting[i++] = FONT_FAMILY_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1780 font_props_for_sorting[i++] = FONT_FOUNDRY_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1781 font_props_for_sorting[i++] = FONT_ADSTYLE_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1782 font_props_for_sorting[i++] = FONT_REGISTRY_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1783 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1784 qsort (XVECTOR (vec)->contents, nfonts, sizeof (Lisp_Object), |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1785 compare_fonts_by_sort_order); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1786 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1787 |
| 24995 | 1788 result = Qnil; |
| 1789 for (i = nfonts - 1; i >= 0; --i) | |
| 1790 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1791 Lisp_Object font = AREF (vec, i); |
| 25270 | 1792 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
|
1793 int point; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1794 Lisp_Object spacing; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1795 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1796 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
|
1797 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
|
1798 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
|
1799 XFRAME (frame)->resy); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1800 ASET (v, 2, make_number (point)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1801 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
|
1802 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
|
1803 spacing = Ffont_get (font, QCspacing); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1804 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
|
1805 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
|
1806 ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1807 |
| 24995 | 1808 result = Fcons (v, result); |
| 1809 } | |
| 1810 | |
| 1811 return result; | |
| 1812 } | |
| 1813 | |
| 1814 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
|
1815 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
|
1816 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
|
1817 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
|
1818 |
|
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
|
1819 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
|
1820 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
|
1821 contain wildcard characters: |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1822 the * character matches any substring, and |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1823 the ? character matches any single character. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1824 PATTERN is case-insensitive. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1825 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1826 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
|
1827 `set-face-font'. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1828 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1829 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
|
1830 even if they match PATTERN and FACE. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1831 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
|
1832 fonts to match. The first MAXIMUM fonts are reported. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1833 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
|
1834 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
|
1835 the WIDTH times as wide as FACE on FRAME. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1836 (pattern, face, frame, maximum, width) |
| 24995 | 1837 Lisp_Object pattern, face, frame, maximum, width; |
| 1838 { | |
| 1839 struct frame *f; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1840 int size, avgwidth; |
| 24995 | 1841 |
| 1842 check_x (); | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1843 CHECK_STRING (pattern); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1844 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1845 if (! NILP (maximum)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1846 CHECK_NATNUM (maximum); |
| 24995 | 1847 |
| 1848 if (!NILP (width)) | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1849 CHECK_NUMBER (width); |
| 24995 | 1850 |
| 1851 /* We can't simply call check_x_frame because this function may be | |
| 1852 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
|
1853 if (NILP (frame)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1854 frame = selected_frame; |
| 24995 | 1855 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
|
1856 if (! FRAME_WINDOW_P (f)) |
| 24995 | 1857 { |
| 1858 /* Perhaps we have not yet created any frame. */ | |
| 1859 f = NULL; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1860 frame = Qnil; |
| 24995 | 1861 face = Qnil; |
| 1862 } | |
| 1863 | |
| 1864 /* Determine the width standard for comparison with the fonts we find. */ | |
| 1865 | |
| 1866 if (NILP (face)) | |
| 1867 size = 0; | |
| 1868 else | |
| 1869 { | |
| 1870 /* This is of limited utility since it works with character | |
| 1871 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
|
1872 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
|
1873 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
|
1874 ? NULL |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1875 : 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
|
1876 |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1877 if (face && face->font) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1878 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1879 size = face->font->pixel_size; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1880 avgwidth = face->font->average_width; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1881 } |
| 24995 | 1882 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1883 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1884 size = FRAME_FONT (f)->pixel_size; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1885 avgwidth = FRAME_FONT (f)->average_width; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1886 } |
| 24995 | 1887 if (!NILP (width)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1888 avgwidth *= XINT (width); |
| 24995 | 1889 } |
| 1890 | |
| 1891 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1892 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
|
1893 Lisp_Object args[2], tail; |
| 24995 | 1894 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1895 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
|
1896 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
|
1897 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
|
1898 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1899 if (size) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1900 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1901 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
|
1902 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
|
1903 } |
|
96263
9775da34ea47
(Fx_list_fonts): Call Flist_fonts with the arg PREFER.
Kenichi Handa <handa@m17n.org>
parents:
96027
diff
changeset
|
1904 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
|
1905 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
|
1906 { |
|
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1907 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
|
1908 |
|
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1909 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
|
1910 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
|
1911 || 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
|
1912 && ! 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
|
1913 { |
|
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1914 /* 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
|
1915 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
|
1916 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
|
1917 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
|
1918 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
|
1919 } |
|
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1920 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
|
1921 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1922 if (NILP (frame)) |
| 24995 | 1923 /* We don't have to check fontsets. */ |
| 1924 return args[0]; | |
| 1925 args[1] = list_fontsets (f, pattern, size); | |
| 1926 return Fnconc (2, args); | |
| 1927 } | |
| 1928 } | |
| 1929 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1930 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1931 |
| 1932 | |
| 1933 /*********************************************************************** | |
| 1934 Lisp Faces | |
| 1935 ***********************************************************************/ | |
| 1936 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1937 /* 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
|
1938 |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1939 #define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1940 #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
|
1941 #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
|
1942 #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
|
1943 #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
|
1944 #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
|
1945 #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
|
1946 #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
|
1947 #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
|
1948 #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
|
1949 #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
|
1950 #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
|
1951 #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
|
1952 #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
|
1953 #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
|
1954 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
1955 #define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) |
| 24995 | 1956 |
| 1957 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
| 1958 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
| 1959 | |
| 1960 #define LFACEP(LFACE) \ | |
| 1961 (VECTORP (LFACE) \ | |
| 1962 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1963 && EQ (AREF (LFACE, 0), Qface)) |
| 24995 | 1964 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1965 |
| 24995 | 1966 #if GLYPH_DEBUG |
| 1967 | |
| 1968 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
| 1969 | |
| 1970 static void | |
| 1971 check_lface_attrs (attrs) | |
| 1972 Lisp_Object *attrs; | |
| 1973 { | |
| 1974 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1975 || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX]) |
| 24995 | 1976 || STRINGP (attrs[LFACE_FAMILY_INDEX])); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1977 xassert (UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX]) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1978 || IGNORE_DEFFACE_P (attrs[LFACE_FOUNDRY_INDEX]) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1979 || STRINGP (attrs[LFACE_FOUNDRY_INDEX])); |
| 24995 | 1980 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1981 || IGNORE_DEFFACE_P (attrs[LFACE_SWIDTH_INDEX]) |
| 24995 | 1982 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); |
| 1983 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1984 || IGNORE_DEFFACE_P (attrs[LFACE_HEIGHT_INDEX]) |
| 31178 | 1985 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
| 1986 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
| 1987 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
| 24995 | 1988 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1989 || IGNORE_DEFFACE_P (attrs[LFACE_WEIGHT_INDEX]) |
| 24995 | 1990 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); |
| 1991 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1992 || IGNORE_DEFFACE_P (attrs[LFACE_SLANT_INDEX]) |
| 24995 | 1993 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); |
| 1994 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1995 || IGNORE_DEFFACE_P (attrs[LFACE_UNDERLINE_INDEX]) |
| 24995 | 1996 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) |
| 1997 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
| 1998 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1999 || IGNORE_DEFFACE_P (attrs[LFACE_OVERLINE_INDEX]) |
| 24995 | 2000 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) |
| 2001 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
| 2002 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2003 || IGNORE_DEFFACE_P (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
| 24995 | 2004 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
| 2005 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
| 2006 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2007 || IGNORE_DEFFACE_P (attrs[LFACE_BOX_INDEX]) |
| 24995 | 2008 || SYMBOLP (attrs[LFACE_BOX_INDEX]) |
| 2009 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
| 2010 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
| 2011 || CONSP (attrs[LFACE_BOX_INDEX])); | |
| 2012 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2013 || IGNORE_DEFFACE_P (attrs[LFACE_INVERSE_INDEX]) |
| 24995 | 2014 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); |
| 2015 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2016 || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX]) |
| 24995 | 2017 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); |
| 2018 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2019 || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX]) |
| 24995 | 2020 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); |
| 31178 | 2021 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2022 || IGNORE_DEFFACE_P (attrs[LFACE_INHERIT_INDEX]) |
| 31178 | 2023 || NILP (attrs[LFACE_INHERIT_INDEX]) |
| 2024 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
| 2025 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
| 24995 | 2026 #ifdef HAVE_WINDOW_SYSTEM |
| 2027 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2028 || IGNORE_DEFFACE_P (attrs[LFACE_STIPPLE_INDEX]) |
| 24995 | 2029 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
2030 || !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
|
2031 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2032 || 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
|
2033 || FONTP (attrs[LFACE_FONT_INDEX])); |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2034 xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2035 || STRINGP (attrs[LFACE_FONTSET_INDEX])); |
| 24995 | 2036 #endif |
| 2037 } | |
| 2038 | |
| 2039 | |
| 2040 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
| 2041 | |
| 2042 static void | |
| 2043 check_lface (lface) | |
| 2044 Lisp_Object lface; | |
| 2045 { | |
| 2046 if (!NILP (lface)) | |
| 2047 { | |
| 2048 xassert (LFACEP (lface)); | |
| 2049 check_lface_attrs (XVECTOR (lface)->contents); | |
| 2050 } | |
| 2051 } | |
| 2052 | |
| 2053 #else /* GLYPH_DEBUG == 0 */ | |
| 2054 | |
| 2055 #define check_lface_attrs(attrs) (void) 0 | |
| 2056 #define check_lface(lface) (void) 0 | |
| 2057 | |
| 2058 #endif /* GLYPH_DEBUG == 0 */ | |
| 2059 | |
| 2060 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2061 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2062 /* 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
|
2063 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2064 enum named_merge_point_kind |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2065 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2066 NAMED_MERGE_POINT_NORMAL, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2067 NAMED_MERGE_POINT_REMAP |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2068 }; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2069 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2070 /* 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
|
2071 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
|
2072 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
|
2073 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
|
2074 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
|
2075 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
|
2076 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
|
2077 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2078 Lisp_Object face_name; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2079 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
|
2080 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
|
2081 }; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2082 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2083 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2084 /* 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
|
2085 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
|
2086 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
|
2087 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
|
2088 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2089 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
|
2090 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
|
2091 Lisp_Object face_name, |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2092 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
|
2093 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
|
2094 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2095 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
|
2096 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2097 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
|
2098 if (EQ (face_name, prev->face_name)) |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2099 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2100 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
|
2101 /* A cycle, so fail. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2102 return 0; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2103 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
|
2104 /* A remap `hides ' any previous normal merge points |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2105 (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
|
2106 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
|
2107 can just assume it's OK. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2108 break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2109 } |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2110 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2111 new_named_merge_point->face_name = face_name; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2112 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
|
2113 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
|
2114 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2115 *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
|
2116 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2117 return 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2118 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2119 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2120 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2121 |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2122 #if 0 /* Seems to be unused. */ |
|
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2123 static Lisp_Object |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2124 internal_resolve_face_name (nargs, args) |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2125 int nargs; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2126 Lisp_Object *args; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2127 { |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2128 return Fget (args[0], args[1]); |
|
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2129 } |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2130 |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2131 static Lisp_Object |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2132 resolve_face_name_error (ignore) |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2133 Lisp_Object ignore; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2134 { |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2135 return Qnil; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2136 } |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2137 #endif |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2138 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2139 /* 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
|
2140 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
|
2141 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
|
2142 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2143 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
|
2144 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2145 static Lisp_Object |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2146 resolve_face_name (face_name, signal_p) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2147 Lisp_Object face_name; |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2148 int signal_p; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2149 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2150 Lisp_Object orig_face; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2151 Lisp_Object tortoise, hare; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2152 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2153 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
|
2154 face_name = intern (SDATA (face_name)); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2155 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2156 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
|
2157 return face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2158 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2159 orig_face = face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2160 tortoise = hare = face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2161 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2162 while (1) |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2163 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2164 face_name = hare; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2165 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
|
2166 if (NILP (hare) || !SYMBOLP (hare)) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2167 break; |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2168 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2169 face_name = hare; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2170 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
|
2171 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
|
2172 break; |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2173 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2174 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
|
2175 if (EQ (hare, tortoise)) |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2176 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2177 if (signal_p) |
|
71992
760807463226
* xfaces.c (signal_error): Move to eval.c.
Kim F. Storm <storm@cua.dk>
parents:
71845
diff
changeset
|
2178 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
|
2179 return Qdefault; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2180 } |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2181 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2182 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2183 return face_name; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2184 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2185 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2186 |
| 24995 | 2187 /* 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
|
2188 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
|
2189 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
|
2190 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
|
2191 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
|
2192 is zero, value is nil if FACE_NAME is not a valid face name. */ |
| 24995 | 2193 static INLINE Lisp_Object |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2194 lface_from_face_name_no_resolve (f, face_name, signal_p) |
| 24995 | 2195 struct frame *f; |
| 2196 Lisp_Object face_name; | |
| 2197 int signal_p; | |
| 2198 { | |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2199 Lisp_Object lface; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2200 |
| 24995 | 2201 if (f) |
| 2202 lface = assq_no_quit (face_name, f->face_alist); | |
| 2203 else | |
| 2204 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
| 2205 | |
| 2206 if (CONSP (lface)) | |
| 2207 lface = XCDR (lface); | |
| 2208 else if (signal_p) | |
| 2209 signal_error ("Invalid face", face_name); | |
| 2210 | |
| 2211 check_lface (lface); | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2212 |
| 24995 | 2213 return lface; |
| 2214 } | |
| 2215 | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2216 /* 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
|
2217 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
|
2218 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
|
2219 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
|
2220 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
|
2221 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
|
2222 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
|
2223 name. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2224 static INLINE Lisp_Object |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2225 lface_from_face_name (f, face_name, signal_p) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2226 struct frame *f; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2227 Lisp_Object face_name; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2228 int signal_p; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2229 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2230 face_name = resolve_face_name (face_name, signal_p); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2231 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
|
2232 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2233 |
| 24995 | 2234 |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2235 /* 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
|
2236 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
|
2237 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
|
2238 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
|
2239 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
|
2240 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2241 static INLINE int |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2242 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
|
2243 struct frame *f; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2244 Lisp_Object face_name; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2245 Lisp_Object *attrs; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2246 int signal_p; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2247 { |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2248 Lisp_Object lface; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2249 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2250 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
|
2251 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2252 if (! NILP (lface)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2253 bcopy (XVECTOR (lface)->contents, attrs, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2254 LFACE_VECTOR_SIZE * sizeof *attrs); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2255 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2256 return !NILP (lface); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2257 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2258 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2259 /* 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
|
2260 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
|
2261 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
|
2262 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
|
2263 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
|
2264 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
|
2265 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2266 static INLINE int |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2267 get_lface_attributes (f, face_name, attrs, signal_p, named_merge_points) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2268 struct frame *f; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2269 Lisp_Object face_name; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2270 Lisp_Object *attrs; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2271 int signal_p; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2272 struct named_merge_point *named_merge_points; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2273 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2274 Lisp_Object face_remapping; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2275 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2276 face_name = resolve_face_name (face_name, signal_p); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2277 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2278 /* 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
|
2279 is done buffer-locally). */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2280 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
|
2281 if (CONSP (face_remapping)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2282 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2283 struct named_merge_point named_merge_point; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2284 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2285 if (push_named_merge_point (&named_merge_point, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2286 face_name, NAMED_MERGE_POINT_REMAP, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2287 &named_merge_points)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2288 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2289 int i; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2290 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2291 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2292 attrs[i] = Qunspecified; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2293 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2294 return merge_face_ref (f, XCDR (face_remapping), attrs, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2295 signal_p, named_merge_points); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2296 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2297 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2298 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2299 /* Default case, no remapping. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2300 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
|
2301 } |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2302 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2303 |
| 24995 | 2304 /* Non-zero if all attributes in face attribute vector ATTRS are |
| 2305 specified, i.e. are non-nil. */ | |
| 2306 | |
| 2307 static int | |
| 2308 lface_fully_specified_p (attrs) | |
| 2309 Lisp_Object *attrs; | |
| 2310 { | |
| 2311 int i; | |
| 2312 | |
| 2313 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
|
2314 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
|
2315 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
|
2316 break; |
| 24995 | 2317 |
| 2318 return i == LFACE_VECTOR_SIZE; | |
| 2319 } | |
| 2320 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2321 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 2322 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2323 /* 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
|
2324 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
|
2325 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
|
2326 of FORCE_P. */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2327 |
| 24995 | 2328 static int |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2329 set_lface_from_font (f, lface, font_object, force_p) |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2330 struct frame *f; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2331 Lisp_Object lface, font_object; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2332 int force_p; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2333 { |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2334 Lisp_Object val; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2335 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
|
2336 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2337 /* 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
|
2338 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
|
2339 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
|
2340 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2341 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
|
2342 { |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2343 Lisp_Object family = AREF (font_object, FONT_FAMILY_INDEX); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2344 |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2345 LFACE_FAMILY (lface) = SYMBOL_NAME (family); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2346 } |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2347 |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2348 if (force_p || UNSPECIFIEDP (LFACE_FOUNDRY (lface))) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2349 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2350 Lisp_Object foundry = AREF (font_object, FONT_FOUNDRY_INDEX); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2351 |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2352 LFACE_FOUNDRY (lface) = SYMBOL_NAME (foundry); |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2353 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2354 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2355 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
|
2356 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2357 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
|
2358 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2359 xassert (pt > 0); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2360 LFACE_HEIGHT (lface) = make_number (pt); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2361 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2362 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2363 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
|
2364 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2365 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
|
2366 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
|
2367 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2368 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
|
2369 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2370 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
|
2371 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
|
2372 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2373 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
|
2374 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2375 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
|
2376 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
|
2377 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2378 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2379 LFACE_FONT (lface) = font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2380 return 1; |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2381 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2382 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2383 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 2384 |
| 2385 | |
| 31178 | 2386 /* Merges the face height FROM with the face height TO, and returns the |
| 2387 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
|
2388 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
|
2389 `relative' heights; the returned value is always an absolute height |
|
100817
9ea6227529f4
Remove obsolete comment.
Chong Yidong <cyd@stupidchicken.com>
parents:
100816
diff
changeset
|
2390 unless both FROM and TO are relative. */ |
| 31178 | 2391 |
| 2392 Lisp_Object | |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2393 merge_face_heights (from, to, invalid) |
|
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2394 Lisp_Object from, to, invalid; |
| 31178 | 2395 { |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2396 Lisp_Object result = invalid; |
| 31178 | 2397 |
| 2398 if (INTEGERP (from)) | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2399 /* 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
|
2400 result = from; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2401 else if (FLOATP (from)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2402 /* 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
|
2403 { |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2404 if (INTEGERP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2405 /* relative X absolute => absolute */ |
|
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
2406 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
|
2407 else if (FLOATP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2408 /* relative X relative => relative */ |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2409 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
|
2410 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
|
2411 result = from; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2412 } |
| 31178 | 2413 else if (FUNCTIONP (from)) |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2414 /* FROM is a function, which use to adjust TO. */ |
| 31178 | 2415 { |
| 2416 /* Call function with current height as argument. | |
| 2417 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
|
2418 Lisp_Object args[2]; |
| 31178 | 2419 |
| 2420 args[0] = from; | |
| 2421 args[1] = to; | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2422 result = safe_call (2, args); |
| 31178 | 2423 |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2424 /* 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
|
2425 if (INTEGERP (to) && !INTEGERP (result)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2426 result = invalid; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2427 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2428 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2429 return result; |
| 31178 | 2430 } |
| 2431 | |
| 2432 | |
| 2433 /* 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
|
2434 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
|
2435 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
|
2436 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
|
2437 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
|
2438 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
|
2439 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
|
2440 other places. */ |
| 24995 | 2441 |
| 2442 static INLINE void | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2443 merge_face_vectors (f, from, to, named_merge_points) |
| 31178 | 2444 struct frame *f; |
| 24995 | 2445 Lisp_Object *from, *to; |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2446 struct named_merge_point *named_merge_points; |
| 24995 | 2447 { |
| 2448 int i; | |
| 31178 | 2449 |
| 2450 /* If FROM inherits from some other faces, merge their attributes into | |
| 2451 TO before merging FROM's direct attributes. Note that an :inherit | |
| 2452 attribute of `unspecified' is the same as one of nil; we never | |
| 2453 merge :inherit attributes, so nil is more correct, but lots of | |
| 2454 other code uses `unspecified' as a generic value for face attributes. */ | |
| 2455 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
| 2456 && !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
|
2457 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
| 31178 | 2458 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2459 i = LFACE_FONT_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2460 if (!UNSPECIFIEDP (from[i])) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2461 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2462 if (!UNSPECIFIEDP (to[i])) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2463 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
|
2464 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2465 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
|
2466 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
|
2467 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
|
2468 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
|
2469 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
|
2470 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
|
2471 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
|
2472 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
|
2473 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
|
2474 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
|
2475 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
|
2476 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
|
2477 } |
| 31221 | 2478 |
| 24995 | 2479 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
| 2480 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
|
2481 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2482 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
|
2483 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2484 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
|
2485 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
|
2486 } |
|
102989
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2487 else if (i != LFACE_FONT_INDEX |
|
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2488 && ! EQ (to[i], from[i])) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2489 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2490 to[i] = from[i]; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2491 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
|
2492 font_clear_prop (to, |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2493 (i == LFACE_FAMILY_INDEX ? FONT_FAMILY_INDEX |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2494 : 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
|
2495 : 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
|
2496 : 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
|
2497 : 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
|
2498 : FONT_SLANT_INDEX)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2499 } |
|
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2500 } |
| 31178 | 2501 |
| 2502 /* TO is always an absolute face, which should inherit from nothing. | |
| 2503 We blindly copy the :inherit attribute above and fix it up here. */ | |
| 2504 to[LFACE_INHERIT_INDEX] = Qnil; | |
| 2505 } | |
| 2506 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2507 /* 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
|
2508 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
|
2509 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
|
2510 merging succeeded. */ |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2511 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2512 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2513 merge_named_face (f, face_name, to, named_merge_points) |
| 31178 | 2514 struct frame *f; |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2515 Lisp_Object face_name; |
| 31178 | 2516 Lisp_Object *to; |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2517 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
|
2518 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2519 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
|
2520 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2521 if (push_named_merge_point (&named_merge_point, |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2522 face_name, NAMED_MERGE_POINT_NORMAL, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2523 &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
|
2524 { |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2525 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
|
2526 Lisp_Object from[LFACE_VECTOR_SIZE]; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2527 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
|
2528 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2529 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
|
2530 { |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2531 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
|
2532 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
|
2533 UNGCPRO; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2534 } |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2535 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2536 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
|
2537 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2538 else |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2539 return 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2540 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2541 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2542 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2543 /* 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
|
2544 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
|
2545 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
|
2546 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
|
2547 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
|
2548 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
|
2549 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2550 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
|
2551 specifications. Each face specification can be: |
| 24995 | 2552 |
| 2553 1. A symbol or string naming a Lisp face. | |
| 2554 | |
| 2555 2. A property list of the form (KEYWORD VALUE ...) where each | |
| 2556 KEYWORD is a face attribute name, and value is an appropriate value | |
| 2557 for that attribute. | |
| 2558 | |
| 2559 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
| 2560 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
| 2561 for compatibility with 20.2. | |
| 2562 | |
| 2563 Face specifications earlier in lists take precedence over later | |
| 2564 specifications. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2565 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2566 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2567 merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) |
| 24995 | 2568 struct frame *f; |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2569 Lisp_Object face_ref; |
| 24995 | 2570 Lisp_Object *to; |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2571 int err_msgs; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2572 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
|
2573 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2574 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
|
2575 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2576 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
|
2577 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2578 Lisp_Object first = XCAR (face_ref); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2579 |
| 24995 | 2580 if (EQ (first, Qforeground_color) |
| 2581 || EQ (first, Qbackground_color)) | |
| 2582 { | |
| 2583 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
| 2584 . 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
|
2585 Lisp_Object color_name = XCDR (face_ref); |
| 24995 | 2586 Lisp_Object color = first; |
| 2587 | |
| 2588 if (STRINGP (color_name)) | |
| 2589 { | |
| 2590 if (EQ (color, Qforeground_color)) | |
| 2591 to[LFACE_FOREGROUND_INDEX] = color_name; | |
| 2592 else | |
| 2593 to[LFACE_BACKGROUND_INDEX] = color_name; | |
| 2594 } | |
| 2595 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2596 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2597 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
|
2598 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
|
2599 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2600 } |
| 24995 | 2601 } |
| 2602 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
|
2603 && *SDATA (SYMBOL_NAME (first)) == ':') |
| 24995 | 2604 { |
| 2605 /* 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
|
2606 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
| 24995 | 2607 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2608 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
|
2609 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
|
2610 int err = 0; |
| 24995 | 2611 |
|
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2612 /* 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
|
2613 if (EQ (value, Qunspecified)) |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2614 ; |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2615 else if (EQ (keyword, QCfamily)) |
| 24995 | 2616 { |
| 2617 if (STRINGP (value)) | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2618 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2619 to[LFACE_FAMILY_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2620 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
|
2621 } |
| 24995 | 2622 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2623 err = 1; |
| 24995 | 2624 } |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2625 else if (EQ (keyword, QCfoundry)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2626 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2627 if (STRINGP (value)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2628 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2629 to[LFACE_FOUNDRY_INDEX] = value; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2630 font_clear_prop (to, FONT_FOUNDRY_INDEX); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2631 } |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2632 else |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2633 err = 1; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2634 } |
| 24995 | 2635 else if (EQ (keyword, QCheight)) |
| 2636 { | |
| 31178 | 2637 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
|
2638 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
| 31178 | 2639 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2640 if (! NILP (new_height)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2641 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2642 to[LFACE_HEIGHT_INDEX] = new_height; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2643 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
|
2644 } |
| 24995 | 2645 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2646 err = 1; |
| 24995 | 2647 } |
| 2648 else if (EQ (keyword, QCweight)) | |
| 2649 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2650 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
|
2651 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2652 to[LFACE_WEIGHT_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2653 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
|
2654 } |
| 24995 | 2655 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2656 err = 1; |
| 24995 | 2657 } |
| 2658 else if (EQ (keyword, QCslant)) | |
| 2659 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2660 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
|
2661 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2662 to[LFACE_SLANT_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2663 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
|
2664 } |
| 24995 | 2665 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2666 err = 1; |
| 24995 | 2667 } |
| 2668 else if (EQ (keyword, QCunderline)) | |
| 2669 { | |
| 2670 if (EQ (value, Qt) | |
| 2671 || NILP (value) | |
| 2672 || STRINGP (value)) | |
| 2673 to[LFACE_UNDERLINE_INDEX] = value; | |
| 2674 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2675 err = 1; |
| 24995 | 2676 } |
| 2677 else if (EQ (keyword, QCoverline)) | |
| 2678 { | |
| 2679 if (EQ (value, Qt) | |
| 2680 || NILP (value) | |
| 2681 || STRINGP (value)) | |
| 2682 to[LFACE_OVERLINE_INDEX] = value; | |
| 2683 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2684 err = 1; |
| 24995 | 2685 } |
| 2686 else if (EQ (keyword, QCstrike_through)) | |
| 2687 { | |
| 2688 if (EQ (value, Qt) | |
| 2689 || NILP (value) | |
| 2690 || STRINGP (value)) | |
| 2691 to[LFACE_STRIKE_THROUGH_INDEX] = value; | |
| 2692 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2693 err = 1; |
| 24995 | 2694 } |
| 2695 else if (EQ (keyword, QCbox)) | |
| 2696 { | |
| 2697 if (EQ (value, Qt)) | |
| 2698 value = make_number (1); | |
| 2699 if (INTEGERP (value) | |
| 2700 || STRINGP (value) | |
| 2701 || CONSP (value) | |
| 2702 || NILP (value)) | |
| 2703 to[LFACE_BOX_INDEX] = value; | |
| 2704 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2705 err = 1; |
| 24995 | 2706 } |
| 2707 else if (EQ (keyword, QCinverse_video) | |
| 2708 || EQ (keyword, QCreverse_video)) | |
| 2709 { | |
| 2710 if (EQ (value, Qt) || NILP (value)) | |
| 2711 to[LFACE_INVERSE_INDEX] = value; | |
| 2712 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2713 err = 1; |
| 24995 | 2714 } |
| 2715 else if (EQ (keyword, QCforeground)) | |
| 2716 { | |
| 2717 if (STRINGP (value)) | |
| 2718 to[LFACE_FOREGROUND_INDEX] = value; | |
| 2719 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2720 err = 1; |
| 24995 | 2721 } |
| 2722 else if (EQ (keyword, QCbackground)) | |
| 2723 { | |
| 2724 if (STRINGP (value)) | |
| 2725 to[LFACE_BACKGROUND_INDEX] = value; | |
| 2726 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2727 err = 1; |
| 24995 | 2728 } |
| 2729 else if (EQ (keyword, QCstipple)) | |
| 2730 { | |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
2731 #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
|
2732 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
| 24995 | 2733 if (!NILP (pixmap_p)) |
| 2734 to[LFACE_STIPPLE_INDEX] = value; | |
| 2735 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2736 err = 1; |
| 24995 | 2737 #endif |
| 2738 } | |
| 2739 else if (EQ (keyword, QCwidth)) | |
| 2740 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2741 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
|
2742 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2743 to[LFACE_SWIDTH_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2744 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
|
2745 } |
| 24995 | 2746 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2747 err = 1; |
| 24995 | 2748 } |
| 31178 | 2749 else if (EQ (keyword, QCinherit)) |
| 2750 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2751 /* 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
|
2752 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
|
2753 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
|
2754 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
|
2755 err = 1; |
| 31178 | 2756 } |
| 24995 | 2757 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2758 err = 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2759 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2760 if (err) |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2761 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2762 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
|
2763 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2764 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2765 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2766 face_ref = XCDR (XCDR (face_ref)); |
| 24995 | 2767 } |
| 2768 } | |
| 2769 else | |
| 2770 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2771 /* 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
|
2772 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
|
2773 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
|
2774 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
|
2775 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2776 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
|
2777 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
|
2778 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2779 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
|
2780 ok = 0; |
| 24995 | 2781 } |
| 2782 } | |
| 2783 else | |
| 2784 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2785 /* 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
|
2786 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
|
2787 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
|
2788 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
|
2789 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2790 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2791 return ok; |
| 24995 | 2792 } |
| 2793 | |
| 2794 | |
| 2795 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
| 2796 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
|
2797 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
|
2798 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
|
2799 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
|
2800 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
|
2801 Value is a vector of face attributes. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2802 (face, frame) |
| 24995 | 2803 Lisp_Object face, frame; |
| 2804 { | |
| 2805 Lisp_Object global_lface, lface; | |
| 2806 struct frame *f; | |
| 2807 int i; | |
| 2808 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2809 CHECK_SYMBOL (face); |
| 24995 | 2810 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
|
2811 |
| 24995 | 2812 if (!NILP (frame)) |
| 2813 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2814 CHECK_LIVE_FRAME (frame); |
| 24995 | 2815 f = XFRAME (frame); |
| 2816 lface = lface_from_face_name (f, face, 0); | |
| 2817 } | |
| 2818 else | |
| 2819 f = NULL, lface = Qnil; | |
| 2820 | |
| 2821 /* Add a global definition if there is none. */ | |
| 2822 if (NILP (global_lface)) | |
| 2823 { | |
| 2824 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 2825 Qunspecified); | |
|
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2826 ASET (global_lface, 0, Qface); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2827 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
| 24995 | 2828 Vface_new_frame_defaults); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2829 |
| 24995 | 2830 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
| 2831 face id to Lisp face is given by the vector lface_id_to_name. | |
| 2832 The mapping from Lisp face to Lisp face id is given by the | |
| 2833 property `face' of the Lisp face name. */ | |
| 2834 if (next_lface_id == lface_id_to_name_size) | |
| 2835 { | |
| 2836 int new_size = max (50, 2 * lface_id_to_name_size); | |
| 2837 int sz = new_size * sizeof *lface_id_to_name; | |
| 2838 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
| 2839 lface_id_to_name_size = new_size; | |
| 2840 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2841 |
| 24995 | 2842 lface_id_to_name[next_lface_id] = face; |
| 2843 Fput (face, Qface, make_number (next_lface_id)); | |
| 2844 ++next_lface_id; | |
| 2845 } | |
| 2846 else if (f == NULL) | |
| 2847 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
|
2848 ASET (global_lface, i, Qunspecified); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2849 |
| 24995 | 2850 /* Add a frame-local definition. */ |
| 2851 if (f) | |
| 2852 { | |
| 2853 if (NILP (lface)) | |
| 2854 { | |
| 2855 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 2856 Qunspecified); | |
|
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2857 ASET (lface, 0, Qface); |
| 24995 | 2858 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
| 2859 } | |
| 2860 else | |
| 2861 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
|
2862 ASET (lface, i, Qunspecified); |
| 24995 | 2863 } |
| 2864 else | |
| 2865 lface = global_lface; | |
| 2866 | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2867 /* 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
|
2868 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
|
2869 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
|
2870 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
|
2871 init_iterator will then free realized faces. */ |
| 57107 | 2872 if (NILP (Fget (face, Qface_no_inherit))) |
| 2873 { | |
| 2874 ++face_change_count; | |
| 2875 ++windows_or_buffers_changed; | |
| 2876 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2877 |
| 24995 | 2878 xassert (LFACEP (lface)); |
| 2879 check_lface (lface); | |
| 2880 return lface; | |
| 2881 } | |
| 2882 | |
| 2883 | |
| 2884 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
| 2885 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
|
2886 doc: /* Return non-nil if FACE names a face. |
|
64578
91757d0e430d
(Finternal_lisp_face_p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64426
diff
changeset
|
2887 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
|
2888 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
|
2889 Otherwise check for the existence of a global face. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2890 (face, frame) |
| 24995 | 2891 Lisp_Object face, frame; |
| 2892 { | |
| 2893 Lisp_Object lface; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2894 |
|
81146
8f50479e40d1
(Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents:
77903
diff
changeset
|
2895 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
|
2896 |
| 24995 | 2897 if (!NILP (frame)) |
| 2898 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2899 CHECK_LIVE_FRAME (frame); |
| 24995 | 2900 lface = lface_from_face_name (XFRAME (frame), face, 0); |
| 2901 } | |
| 2902 else | |
| 2903 lface = lface_from_face_name (NULL, face, 0); | |
| 2904 | |
| 2905 return lface; | |
| 2906 } | |
| 2907 | |
| 2908 | |
| 2909 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
| 2910 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
|
2911 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
|
2912 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
|
2913 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
|
2914 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
|
2915 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
|
2916 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
|
2917 |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2918 The value is TO. */) |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2919 (from, to, frame, new_frame) |
| 24995 | 2920 Lisp_Object from, to, frame, new_frame; |
| 2921 { | |
| 2922 Lisp_Object lface, copy; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2923 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2924 CHECK_SYMBOL (from); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2925 CHECK_SYMBOL (to); |
| 24995 | 2926 |
| 2927 if (EQ (frame, Qt)) | |
| 2928 { | |
| 2929 /* Copy global definition of FROM. We don't make copies of | |
| 2930 strings etc. because 20.2 didn't do it either. */ | |
| 2931 lface = lface_from_face_name (NULL, from, 1); | |
| 2932 copy = Finternal_make_lisp_face (to, Qnil); | |
| 2933 } | |
| 2934 else | |
| 2935 { | |
| 2936 /* 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
|
2937 if (NILP (new_frame)) |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2938 new_frame = frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2939 CHECK_LIVE_FRAME (frame); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2940 CHECK_LIVE_FRAME (new_frame); |
| 24995 | 2941 lface = lface_from_face_name (XFRAME (frame), from, 1); |
| 2942 copy = Finternal_make_lisp_face (to, new_frame); | |
| 2943 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2944 |
| 24995 | 2945 bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents, |
| 2946 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2947 |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2948 /* 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
|
2949 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
|
2950 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
|
2951 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
|
2952 init_iterator will then free realized faces. */ |
| 57107 | 2953 if (NILP (Fget (to, Qface_no_inherit))) |
| 2954 { | |
| 2955 ++face_change_count; | |
| 2956 ++windows_or_buffers_changed; | |
| 2957 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2958 |
| 24995 | 2959 return to; |
| 2960 } | |
| 2961 | |
| 2962 | |
| 2963 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
| 2964 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
|
2965 doc: /* Set attribute ATTR of FACE to VALUE. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2966 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
|
2967 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
|
2968 FRAME t means change the default for new frames. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2969 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
|
2970 for new frames. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2971 (face, attr, value, frame) |
| 24995 | 2972 Lisp_Object face, attr, value, frame; |
|
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
2973 { |
| 24995 | 2974 Lisp_Object lface; |
| 2975 Lisp_Object old_value = Qnil; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2976 /* 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
|
2977 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
|
2978 enum font_property_index prop_index = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2979 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2980 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2981 CHECK_SYMBOL (attr); |
| 24995 | 2982 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2983 face = resolve_face_name (face, 1); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2984 |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2985 /* 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
|
2986 default for new frames. */ |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2987 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
|
2988 { |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2989 Lisp_Object tail; |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
2990 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
|
2991 FOR_EACH_FRAME (tail, frame) |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2992 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
|
2993 return face; |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2994 } |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2995 |
| 24995 | 2996 /* Set lface to the Lisp attribute vector of FACE. */ |
| 2997 if (EQ (frame, Qt)) | |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
2998 { |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
2999 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
|
3000 |
|
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3001 /* 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
|
3002 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
|
3003 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
|
3004 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
|
3005 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
|
3006 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
|
3007 if (UNSPECIFIEDP (value)) |
|
67056
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3008 value = Qignore_defface; |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3009 } |
| 24995 | 3010 else |
| 3011 { | |
| 3012 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3013 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3014 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3015 CHECK_LIVE_FRAME (frame); |
| 24995 | 3016 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
|
3017 |
| 24995 | 3018 /* If a frame-local face doesn't exist yet, create one. */ |
| 3019 if (NILP (lface)) | |
| 3020 lface = Finternal_make_lisp_face (face, frame); | |
| 3021 } | |
| 3022 | |
| 3023 if (EQ (attr, QCfamily)) | |
| 3024 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3025 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3026 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3027 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
|
3028 if (SCHARS (value) == 0) |
| 24995 | 3029 signal_error ("Invalid face family", value); |
| 3030 } | |
| 3031 old_value = LFACE_FAMILY (lface); | |
| 3032 LFACE_FAMILY (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3033 prop_index = FONT_FAMILY_INDEX; |
| 24995 | 3034 } |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3035 else if (EQ (attr, QCfoundry)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3036 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3037 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3038 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3039 CHECK_STRING (value); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3040 if (SCHARS (value) == 0) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3041 signal_error ("Invalid face foundry", value); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3042 } |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3043 old_value = LFACE_FOUNDRY (lface); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3044 LFACE_FOUNDRY (lface) = value; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3045 prop_index = FONT_FOUNDRY_INDEX; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3046 } |
| 24995 | 3047 else if (EQ (attr, QCheight)) |
| 3048 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3049 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3050 { |
|
100816
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3051 if (EQ (face, Qdefault)) |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3052 { |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3053 /* 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
|
3054 if (!INTEGERP (value) || XINT (value) <= 0) |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3055 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
|
3056 } |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3057 else |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3058 { |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3059 /* 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
|
3060 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
|
3061 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
|
3062 make_number (10), |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3063 Qnil); |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3064 if (!INTEGERP (test) || XINT (test) <= 0) |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3065 signal_error ("Invalid face height", value); |
|
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3066 } |
| 24995 | 3067 } |
| 31178 | 3068 |
| 24995 | 3069 old_value = LFACE_HEIGHT (lface); |
| 3070 LFACE_HEIGHT (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3071 prop_index = FONT_SIZE_INDEX; |
| 24995 | 3072 } |
| 3073 else if (EQ (attr, QCweight)) | |
| 3074 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3075 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3076 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3077 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3078 if (FONT_WEIGHT_NAME_NUMERIC (value) < 0) |
| 24995 | 3079 signal_error ("Invalid face weight", value); |
| 3080 } | |
| 3081 old_value = LFACE_WEIGHT (lface); | |
| 3082 LFACE_WEIGHT (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3083 prop_index = FONT_WEIGHT_INDEX; |
| 24995 | 3084 } |
| 3085 else if (EQ (attr, QCslant)) | |
| 3086 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3087 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3088 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3089 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3090 if (FONT_SLANT_NAME_NUMERIC (value) < 0) |
| 24995 | 3091 signal_error ("Invalid face slant", value); |
| 3092 } | |
| 3093 old_value = LFACE_SLANT (lface); | |
| 3094 LFACE_SLANT (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3095 prop_index = FONT_SLANT_INDEX; |
| 24995 | 3096 } |
| 3097 else if (EQ (attr, QCunderline)) | |
| 3098 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3099 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3100 if ((SYMBOLP (value) |
| 3101 && !EQ (value, Qt) | |
| 3102 && !EQ (value, Qnil)) | |
| 3103 /* Underline color. */ | |
| 3104 || (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
|
3105 && SCHARS (value) == 0)) |
| 24995 | 3106 signal_error ("Invalid face underline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3107 |
| 24995 | 3108 old_value = LFACE_UNDERLINE (lface); |
| 3109 LFACE_UNDERLINE (lface) = value; | |
| 3110 } | |
| 3111 else if (EQ (attr, QCoverline)) | |
| 3112 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3113 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3114 if ((SYMBOLP (value) |
| 3115 && !EQ (value, Qt) | |
| 3116 && !EQ (value, Qnil)) | |
| 3117 /* Overline color. */ | |
| 3118 || (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
|
3119 && SCHARS (value) == 0)) |
| 24995 | 3120 signal_error ("Invalid face overline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3121 |
| 24995 | 3122 old_value = LFACE_OVERLINE (lface); |
| 3123 LFACE_OVERLINE (lface) = value; | |
| 3124 } | |
| 3125 else if (EQ (attr, QCstrike_through)) | |
| 3126 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3127 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3128 if ((SYMBOLP (value) |
| 3129 && !EQ (value, Qt) | |
| 3130 && !EQ (value, Qnil)) | |
| 3131 /* Strike-through color. */ | |
| 3132 || (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
|
3133 && SCHARS (value) == 0)) |
| 24995 | 3134 signal_error ("Invalid face strike-through", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3135 |
| 24995 | 3136 old_value = LFACE_STRIKE_THROUGH (lface); |
| 3137 LFACE_STRIKE_THROUGH (lface) = value; | |
| 3138 } | |
| 3139 else if (EQ (attr, QCbox)) | |
| 3140 { | |
| 3141 int valid_p; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3142 |
| 24995 | 3143 /* Allow t meaning a simple box of width 1 in foreground color |
| 3144 of the face. */ | |
| 3145 if (EQ (value, Qt)) | |
| 3146 value = make_number (1); | |
| 3147 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3148 if (UNSPECIFIEDP (value) || IGNORE_DEFFACE_P (value)) |
| 24995 | 3149 valid_p = 1; |
| 3150 else if (NILP (value)) | |
| 3151 valid_p = 1; | |
| 3152 else if (INTEGERP (value)) | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3153 valid_p = XINT (value) != 0; |
| 24995 | 3154 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
|
3155 valid_p = SCHARS (value) > 0; |
| 24995 | 3156 else if (CONSP (value)) |
| 3157 { | |
| 3158 Lisp_Object tem; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3159 |
| 24995 | 3160 tem = value; |
| 3161 while (CONSP (tem)) | |
| 3162 { | |
| 3163 Lisp_Object k, v; | |
| 3164 | |
| 3165 k = XCAR (tem); | |
| 3166 tem = XCDR (tem); | |
| 3167 if (!CONSP (tem)) | |
| 3168 break; | |
| 3169 v = XCAR (tem); | |
| 3170 tem = XCDR (tem); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3171 |
| 24995 | 3172 if (EQ (k, QCline_width)) |
| 3173 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3174 if (!INTEGERP (v) || XINT (v) == 0) |
| 24995 | 3175 break; |
| 3176 } | |
| 3177 else if (EQ (k, QCcolor)) | |
| 3178 { | |
|
60150
ffb5cb773521
(Finternal_set_lisp_face_attribute): Allow :color property
Kim F. Storm <storm@cua.dk>
parents:
59924
diff
changeset
|
3179 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0)) |
| 24995 | 3180 break; |
| 3181 } | |
| 3182 else if (EQ (k, QCstyle)) | |
| 3183 { | |
| 3184 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
| 3185 break; | |
| 3186 } | |
| 3187 else | |
| 3188 break; | |
| 3189 } | |
| 3190 | |
| 3191 valid_p = NILP (tem); | |
| 3192 } | |
| 3193 else | |
| 3194 valid_p = 0; | |
| 3195 | |
| 3196 if (!valid_p) | |
| 3197 signal_error ("Invalid face box", value); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3198 |
| 24995 | 3199 old_value = LFACE_BOX (lface); |
| 3200 LFACE_BOX (lface) = value; | |
| 3201 } | |
| 3202 else if (EQ (attr, QCinverse_video) | |
| 3203 || EQ (attr, QCreverse_video)) | |
| 3204 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3205 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3206 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3207 CHECK_SYMBOL (value); |
| 24995 | 3208 if (!EQ (value, Qt) && !NILP (value)) |
| 3209 signal_error ("Invalid inverse-video face attribute value", value); | |
| 3210 } | |
| 3211 old_value = LFACE_INVERSE (lface); | |
| 3212 LFACE_INVERSE (lface) = value; | |
| 3213 } | |
| 3214 else if (EQ (attr, QCforeground)) | |
| 3215 { | |
|
98780
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3216 /* Compatibility with 20.x. */ |
|
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3217 if (NILP (value)) |
|
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3218 value = Qunspecified; |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3219 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3220 { |
| 3221 /* Don't check for valid color names here because it depends | |
| 3222 on the frame (display) whether the color will be valid | |
| 3223 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
|
3224 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
|
3225 if (SCHARS (value) == 0) |
| 24995 | 3226 signal_error ("Empty foreground color value", value); |
| 3227 } | |
| 3228 old_value = LFACE_FOREGROUND (lface); | |
| 3229 LFACE_FOREGROUND (lface) = value; | |
| 3230 } | |
| 3231 else if (EQ (attr, QCbackground)) | |
| 3232 { | |
|
98780
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3233 /* Compatibility with 20.x. */ |
|
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3234 if (NILP (value)) |
|
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3235 value = Qunspecified; |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3236 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3237 { |
| 3238 /* Don't check for valid color names here because it depends | |
| 3239 on the frame (display) whether the color will be valid | |
| 3240 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
|
3241 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
|
3242 if (SCHARS (value) == 0) |
| 24995 | 3243 signal_error ("Empty background color value", value); |
| 3244 } | |
| 3245 old_value = LFACE_BACKGROUND (lface); | |
| 3246 LFACE_BACKGROUND (lface) = value; | |
| 3247 } | |
| 3248 else if (EQ (attr, QCstipple)) | |
| 3249 { | |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
3250 #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
|
3251 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
| 24995 | 3252 && !NILP (value) |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3253 && NILP (Fbitmap_spec_p (value))) |
| 24995 | 3254 signal_error ("Invalid stipple attribute", value); |
| 3255 old_value = LFACE_STIPPLE (lface); | |
| 3256 LFACE_STIPPLE (lface) = value; | |
|
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
3257 #endif /* HAVE_X_WINDOWS || HAVE_NS */ |
| 24995 | 3258 } |
| 3259 else if (EQ (attr, QCwidth)) | |
| 3260 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3261 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3262 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3263 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3264 if (FONT_WIDTH_NAME_NUMERIC (value) < 0) |
| 24995 | 3265 signal_error ("Invalid face width", value); |
| 3266 } | |
| 3267 old_value = LFACE_SWIDTH (lface); | |
| 3268 LFACE_SWIDTH (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3269 prop_index = FONT_WIDTH_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3270 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3271 else if (EQ (attr, QCfont)) |
| 24995 | 3272 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3273 #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
|
3274 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
|
3275 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3276 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
|
3277 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3278 FRAME_PTR f; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3279 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3280 old_value = LFACE_FONT (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3281 if (! FONTP (value)) |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3282 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3283 if (STRINGP (value)) |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3284 { |
|
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
|
3285 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
|
3286 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
|
3287 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3288 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
|
3289 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
|
3290 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
|
3291 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
|
3292 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
|
3293 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3294 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3295 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
|
3296 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3297 if (EQ (frame, Qt)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3298 f = XFRAME (selected_frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3299 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3300 f = XFRAME (frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3301 if (! FONT_OBJECT_P (value)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3302 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3303 Lisp_Object *attrs = XVECTOR (lface)->contents; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3304 Lisp_Object font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3305 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3306 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
|
3307 if (NILP (font_object)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3308 signal_error ("Font not available", value); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3309 value = font_object; |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3310 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3311 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
|
3312 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3313 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3314 LFACE_FONT (lface) = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3315 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3316 #endif /* HAVE_WINDOW_SYSTEM */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3317 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3318 else if (EQ (attr, QCfontset)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3319 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3320 #ifdef HAVE_WINDOW_SYSTEM |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3321 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
|
3322 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3323 Lisp_Object tmp; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3324 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3325 old_value = LFACE_FONTSET (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3326 tmp = Fquery_fontset (value, Qnil); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3327 if (NILP (tmp)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3328 signal_error ("Invalid fontset name", value); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3329 LFACE_FONTSET (lface) = value = tmp; |
|
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
3330 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3331 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3332 } |
| 31178 | 3333 else if (EQ (attr, QCinherit)) |
| 3334 { | |
| 3335 Lisp_Object tail; | |
| 3336 if (SYMBOLP (value)) | |
| 3337 tail = Qnil; | |
| 3338 else | |
| 3339 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
| 3340 if (!SYMBOLP (XCAR (tail))) | |
| 3341 break; | |
| 3342 if (NILP (tail)) | |
| 3343 LFACE_INHERIT (lface) = value; | |
| 3344 else | |
|
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3345 signal_error ("Invalid face inheritance", value); |
| 31178 | 3346 } |
| 24995 | 3347 else if (EQ (attr, QCbold)) |
| 3348 { | |
| 3349 old_value = LFACE_WEIGHT (lface); | |
| 3350 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
|
3351 prop_index = FONT_WEIGHT_INDEX; |
| 24995 | 3352 } |
| 3353 else if (EQ (attr, QCitalic)) | |
| 3354 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3355 attr = QCslant; |
| 24995 | 3356 old_value = LFACE_SLANT (lface); |
| 3357 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
|
3358 prop_index = FONT_SLANT_INDEX; |
| 24995 | 3359 } |
| 3360 else | |
| 3361 signal_error ("Invalid face attribute name", attr); | |
| 3362 | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3363 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
|
3364 { |
|
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3365 /* 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
|
3366 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
|
3367 (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
|
3368 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
|
3369 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
|
3370 width. */ |
|
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3371 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
|
3372 } |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3373 |
| 24995 | 3374 /* Changing a named face means that all realized faces depending on |
| 3375 that face are invalid. Since we cannot tell which realized faces | |
| 3376 depend on the face, make sure they are all removed. This is done | |
| 3377 by incrementing face_change_count. The next call to | |
| 3378 init_iterator will then free realized faces. */ | |
| 3379 if (!EQ (frame, Qt) | |
| 57107 | 3380 && 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
|
3381 && NILP (Fequal (old_value, value))) |
| 24995 | 3382 { |
| 3383 ++face_change_count; | |
| 3384 ++windows_or_buffers_changed; | |
| 3385 } | |
| 3386 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3387 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
| 24995 | 3388 && NILP (Fequal (old_value, value))) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3389 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3390 Lisp_Object param; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3391 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3392 param = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3393 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3394 if (EQ (face, Qdefault)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3395 { |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3396 #ifdef HAVE_WINDOW_SYSTEM |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3397 /* 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
|
3398 reflected in changed `font' frame parameters. */ |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3399 if (FRAMEP (frame) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3400 && (prop_index || EQ (attr, QCfont)) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3401 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3402 set_font_frame_param (frame, lface); |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3403 else |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3404 #endif /* HAVE_WINDOW_SYSTEM */ |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3405 |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3406 if (EQ (attr, QCforeground)) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3407 param = Qforeground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3408 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3409 param = Qbackground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3410 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3411 #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
|
3412 #ifndef WINDOWSNT |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3413 else if (EQ (face, Qscroll_bar)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3414 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3415 /* 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
|
3416 `scroll-bar-foreground' and `scroll-bar-background'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3417 if (EQ (attr, QCforeground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3418 param = Qscroll_bar_foreground; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3419 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3420 param = Qscroll_bar_background; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3421 } |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3422 #endif /* not WINDOWSNT */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3423 else if (EQ (face, Qborder)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3424 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3425 /* Changing background color of `border' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3426 `border-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3427 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3428 param = Qborder_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3429 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3430 else if (EQ (face, Qcursor)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3431 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3432 /* Changing background color of `cursor' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3433 `cursor-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3434 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3435 param = Qcursor_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3436 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3437 else if (EQ (face, Qmouse)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3438 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3439 /* Changing background color of `mouse' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3440 `mouse-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3441 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3442 param = Qmouse_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3443 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3444 #endif /* HAVE_WINDOW_SYSTEM */ |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
3445 else if (EQ (face, Qmenu)) |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3446 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3447 /* 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
|
3448 realizing faces on FRAME. FRAME t change the |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3449 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
|
3450 setting the flag in new face caches */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3451 if (FRAMEP (frame)) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3452 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3453 struct frame *f = XFRAME (frame); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3454 if (FRAME_FACE_CACHE (f) == NULL) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3455 FRAME_FACE_CACHE (f) = make_face_cache (f); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3456 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
|
3457 } |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3458 else |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3459 menu_face_changed_default = 1; |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3460 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3461 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3462 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
|
3463 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3464 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
|
3465 /* 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
|
3466 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3467 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
|
3468 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3469 else |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3470 /* 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
|
3471 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3472 Lisp_Object cons; |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3473 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
|
3474 XSETCAR (cons, param); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3475 XSETCDR (cons, value); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3476 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
|
3477 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3478 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3479 } |
| 24995 | 3480 |
| 3481 return face; | |
| 3482 } | |
| 3483 | |
| 3484 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3485 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 3486 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3487 /* Set the `font' frame parameter of FRAME determined from the |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3488 font-object set in `default' face attributes LFACE. */ |
| 24995 | 3489 |
| 3490 static void | |
| 3491 set_font_frame_param (frame, lface) | |
| 3492 Lisp_Object frame, lface; | |
| 3493 { | |
| 3494 struct frame *f = XFRAME (frame); | |
|
96532
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3495 Lisp_Object font; |
|
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3496 |
|
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3497 if (FRAME_WINDOW_P (f) |
|
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3498 /* Don't do anything if the font is `unspecified'. This can |
|
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3499 happen during frame creation. */ |
|
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3500 && (font = LFACE_FONT (lface), |
|
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3501 ! UNSPECIFIEDP (font))) |
|
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3502 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3503 if (FONT_SPEC_P (font)) |
| 90414 | 3504 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3505 font = font_load_for_lface (f, XVECTOR (lface)->contents, font); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3506 if (NILP (font)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3507 return; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3508 LFACE_FONT (lface) = font; |
| 90414 | 3509 } |
|
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
3510 f->default_face_done_p = 0; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3511 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font), Qnil)); |
|
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
3512 } |
| 24995 | 3513 } |
| 3514 | |
| 3515 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3516 /* 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
|
3517 has been assigned the value NEW_VALUE. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3518 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3519 void |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3520 update_face_from_frame_parameter (f, param, new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3521 struct frame *f; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3522 Lisp_Object param, new_value; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3523 { |
| 57107 | 3524 Lisp_Object face = Qnil; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3525 Lisp_Object lface; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3526 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3527 /* 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
|
3528 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
|
3529 face-set-after-frame-defaults. */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3530 if (NILP (f->face_alist)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3531 return; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3532 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3533 if (EQ (param, Qforeground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3534 { |
| 57107 | 3535 face = Qdefault; |
| 3536 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
|
3537 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3538 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3539 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3540 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3541 else if (EQ (param, Qbackground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3542 { |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3543 Lisp_Object frame; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3544 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3545 /* 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
|
3546 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
|
3547 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
|
3548 XSETFRAME (frame, f); |
|
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
3549 call1 (Qframe_set_background_mode, frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3550 |
| 57107 | 3551 face = Qdefault; |
| 3552 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
|
3553 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3554 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3555 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3556 } |
| 57107 | 3557 else if (EQ (param, Qborder_color)) |
| 3558 { | |
| 3559 face = Qborder; | |
| 3560 lface = lface_from_face_name (f, face, 1); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3561 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3562 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3563 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3564 else if (EQ (param, Qcursor_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3565 { |
| 57107 | 3566 face = Qcursor; |
| 3567 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
|
3568 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3569 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3570 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3571 else if (EQ (param, Qmouse_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3572 { |
| 57107 | 3573 face = Qmouse; |
| 3574 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
|
3575 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3576 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3577 } |
| 57107 | 3578 |
| 3579 /* Changing a named face means that all realized faces depending on | |
| 3580 that face are invalid. Since we cannot tell which realized faces | |
| 3581 depend on the face, make sure they are all removed. This is done | |
| 3582 by incrementing face_change_count. The next call to | |
| 3583 init_iterator will then free realized faces. */ | |
| 3584 if (!NILP (face) | |
| 3585 && NILP (Fget (face, Qface_no_inherit))) | |
| 3586 { | |
| 3587 ++face_change_count; | |
| 3588 ++windows_or_buffers_changed; | |
| 3589 } | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3590 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3591 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3592 |
| 24995 | 3593 /* Get the value of X resource RESOURCE, class CLASS for the display |
| 3594 of frame FRAME. This is here because ordinary `x-get-resource' | |
| 3595 doesn't take a frame argument. */ | |
| 3596 | |
| 3597 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
|
3598 Sinternal_face_x_get_resource, 3, 3, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3599 (resource, class, frame) |
| 24995 | 3600 Lisp_Object resource, class, frame; |
| 3601 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3602 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
|
3603 CHECK_STRING (resource); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3604 CHECK_STRING (class); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3605 CHECK_LIVE_FRAME (frame); |
| 24995 | 3606 BLOCK_INPUT; |
| 3607 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
| 3608 resource, class, Qnil, Qnil); | |
| 3609 UNBLOCK_INPUT; | |
| 3610 return value; | |
| 3611 } | |
| 3612 | |
| 3613 | |
| 3614 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
| 3615 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
| 3616 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
| 3617 error; if SIGNAL_P is zero, return 0. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3618 |
| 24995 | 3619 static Lisp_Object |
| 3620 face_boolean_x_resource_value (value, signal_p) | |
| 3621 Lisp_Object value; | |
| 3622 int signal_p; | |
| 3623 { | |
| 3624 Lisp_Object result = make_number (0); | |
| 3625 | |
| 3626 xassert (STRINGP (value)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3627 |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3628 if (xstrcasecmp (SDATA (value), "on") == 0 |
|
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3629 || xstrcasecmp (SDATA (value), "true") == 0) |
| 24995 | 3630 result = Qt; |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3631 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
|
3632 || xstrcasecmp (SDATA (value), "false") == 0) |
| 24995 | 3633 result = Qnil; |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3634 else if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
| 24995 | 3635 result = Qunspecified; |
| 3636 else if (signal_p) | |
| 3637 signal_error ("Invalid face attribute value from X resource", value); | |
| 3638 | |
| 3639 return result; | |
| 3640 } | |
| 3641 | |
| 3642 | |
| 3643 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
| 3644 Finternal_set_lisp_face_attribute_from_resource, | |
| 3645 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
|
3646 3, 4, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3647 (face, attr, value, frame) |
| 24995 | 3648 Lisp_Object face, attr, value, frame; |
| 3649 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3650 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3651 CHECK_SYMBOL (attr); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3652 CHECK_STRING (value); |
| 24995 | 3653 |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3654 if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
| 24995 | 3655 value = Qunspecified; |
| 3656 else if (EQ (attr, QCheight)) | |
| 3657 { | |
| 3658 value = Fstring_to_number (value, make_number (10)); | |
| 3659 if (XINT (value) <= 0) | |
| 3660 signal_error ("Invalid face height from X resource", value); | |
| 3661 } | |
| 3662 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
| 3663 value = face_boolean_x_resource_value (value, 1); | |
| 3664 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
|
3665 value = intern (SDATA (value)); |
| 24995 | 3666 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
| 3667 value = face_boolean_x_resource_value (value, 1); | |
| 3668 else if (EQ (attr, QCunderline) | |
| 3669 || EQ (attr, QCoverline) | |
|
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
3670 || EQ (attr, QCstrike_through)) |
| 24995 | 3671 { |
| 3672 Lisp_Object boolean_value; | |
| 3673 | |
| 3674 /* If the result of face_boolean_x_resource_value is t or nil, | |
| 3675 VALUE does NOT specify a color. */ | |
| 3676 boolean_value = face_boolean_x_resource_value (value, 0); | |
| 3677 if (SYMBOLP (boolean_value)) | |
| 3678 value = boolean_value; | |
| 3679 } | |
|
67130
c5ff1098b0b8
(Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
Eli Zaretskii <eliz@gnu.org>
parents:
67056
diff
changeset
|
3680 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
|
3681 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
| 24995 | 3682 |
| 3683 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
|
3684 } |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
3685 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3686 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3687 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3688 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3689 /*********************************************************************** |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3690 Menu face |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3691 ***********************************************************************/ |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3692 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3693 #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
|
3694 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3695 /* 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
|
3696 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3697 static void |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3698 x_update_menu_appearance (f) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3699 struct frame *f; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3700 { |
|
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3701 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
|
3702 XrmDatabase rdb; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3703 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3704 if (dpyinfo |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3705 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3706 rdb != NULL)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3707 { |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3708 char line[512]; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3709 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
|
3710 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
|
3711 const char *myname = SDATA (Vx_resource_name); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3712 int changed_p = 0; |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3713 #ifdef USE_MOTIF |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3714 const char *popup_path = "popup_menu"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3715 #else |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3716 const char *popup_path = "menu.popup"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3717 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3718 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3719 if (STRINGP (LFACE_FOREGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3720 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3721 sprintf (line, "%s.%s*foreground: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3722 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
|
3723 SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3724 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3725 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
|
3726 myname, SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3727 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3728 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3729 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3730 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3731 if (STRINGP (LFACE_BACKGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3732 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3733 sprintf (line, "%s.%s*background: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3734 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
|
3735 SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3736 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3737 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
|
3738 myname, SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3739 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3740 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3741 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3742 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3743 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
|
3744 /* 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
|
3745 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
|
3746 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
|
3747 && FONTP (LFACE_FONT (lface)) |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3748 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3749 || !UNSPECIFIEDP (LFACE_FOUNDRY (lface)) |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3750 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3751 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3752 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3753 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3754 { |
|
95189
70380eb2fa9d
(x_update_menu_appearance): Call Ffont_xlfd_name with
Kenichi Handa <handa@m17n.org>
parents:
95178
diff
changeset
|
3755 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
|
3756 #ifdef USE_MOTIF |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3757 const char *suffix = "List"; |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3758 Bool motif = True; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3759 #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
|
3760 #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
|
3761 |
|
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3762 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
|
3763 #else |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3764 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
|
3765 #endif |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3766 Bool motif = False; |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3767 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3768 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3769 if (! NILP (xlfd)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3770 { |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3771 #if defined HAVE_X_I18N |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3772 extern char *xic_create_fontsetname |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3773 P_ ((char *base_fontname, Bool motif)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3774 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
|
3775 #else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3776 char *fontsetname = (char *) SDATA (xlfd); |
|
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
3777 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3778 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
|
3779 myname, suffix, fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3780 XrmPutLineResource (&rdb, line); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3781 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
|
3782 myname, popup_path, suffix, fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3783 XrmPutLineResource (&rdb, line); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3784 changed_p = 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3785 if (fontsetname != (char *) SDATA (xlfd)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3786 xfree (fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3787 } |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3788 } |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3789 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3790 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
|
3791 free_frame_menubar (f); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3792 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3793 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3794 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3795 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
| 24995 | 3796 |
| 3797 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3798 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
|
3799 Sface_attribute_relative_p, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3800 2, 2, 0, |
|
71576
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3801 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
|
3802 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
|
3803 with the value VALUE is relative. |
|
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3804 |
|
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3805 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
|
3806 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
|
3807 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
|
3808 However, for :height, floating point values are also relative. */) |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3809 (attribute, value) |
|
40532
221868112227
(Fface_attribute_relative_p): Declare args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40441
diff
changeset
|
3810 Lisp_Object attribute, value; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3811 { |
|
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3812 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
|
3813 return Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3814 else if (EQ (attribute, QCheight)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3815 return INTEGERP (value) ? Qnil : Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3816 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3817 return Qnil; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3818 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3819 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3820 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
|
3821 3, 3, 0, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3822 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
|
3823 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
|
3824 the result will be absolute, otherwise it will be relative. */) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3825 (attribute, value1, value2) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3826 Lisp_Object attribute, value1, value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3827 { |
|
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3828 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
|
3829 return value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3830 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
|
3831 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
|
3832 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3833 return value1; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3834 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3835 |
| 24995 | 3836 |
| 3837 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
| 3838 Sinternal_get_lisp_face_attribute, | |
| 3839 2, 3, 0, | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3840 doc: /* Return face attribute KEYWORD of face SYMBOL. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3841 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
|
3842 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
|
3843 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
|
3844 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
|
3845 frames). If FRAME is omitted or nil, use the selected frame. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3846 (symbol, keyword, frame) |
| 24995 | 3847 Lisp_Object symbol, keyword, frame; |
| 3848 { | |
| 3849 Lisp_Object lface, value = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3850 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3851 CHECK_SYMBOL (symbol); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3852 CHECK_SYMBOL (keyword); |
| 24995 | 3853 |
| 3854 if (EQ (frame, Qt)) | |
| 3855 lface = lface_from_face_name (NULL, symbol, 1); | |
| 3856 else | |
| 3857 { | |
| 3858 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3859 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3860 CHECK_LIVE_FRAME (frame); |
| 24995 | 3861 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
| 3862 } | |
| 3863 | |
| 3864 if (EQ (keyword, QCfamily)) | |
| 3865 value = LFACE_FAMILY (lface); | |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3866 else if (EQ (keyword, QCfoundry)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3867 value = LFACE_FOUNDRY (lface); |
| 24995 | 3868 else if (EQ (keyword, QCheight)) |
| 3869 value = LFACE_HEIGHT (lface); | |
| 3870 else if (EQ (keyword, QCweight)) | |
| 3871 value = LFACE_WEIGHT (lface); | |
| 3872 else if (EQ (keyword, QCslant)) | |
| 3873 value = LFACE_SLANT (lface); | |
| 3874 else if (EQ (keyword, QCunderline)) | |
| 3875 value = LFACE_UNDERLINE (lface); | |
| 3876 else if (EQ (keyword, QCoverline)) | |
| 3877 value = LFACE_OVERLINE (lface); | |
| 3878 else if (EQ (keyword, QCstrike_through)) | |
| 3879 value = LFACE_STRIKE_THROUGH (lface); | |
| 3880 else if (EQ (keyword, QCbox)) | |
| 3881 value = LFACE_BOX (lface); | |
| 3882 else if (EQ (keyword, QCinverse_video) | |
| 3883 || EQ (keyword, QCreverse_video)) | |
| 3884 value = LFACE_INVERSE (lface); | |
| 3885 else if (EQ (keyword, QCforeground)) | |
| 3886 value = LFACE_FOREGROUND (lface); | |
| 3887 else if (EQ (keyword, QCbackground)) | |
| 3888 value = LFACE_BACKGROUND (lface); | |
| 3889 else if (EQ (keyword, QCstipple)) | |
| 3890 value = LFACE_STIPPLE (lface); | |
| 3891 else if (EQ (keyword, QCwidth)) | |
| 3892 value = LFACE_SWIDTH (lface); | |
| 31178 | 3893 else if (EQ (keyword, QCinherit)) |
| 3894 value = LFACE_INHERIT (lface); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3895 else if (EQ (keyword, QCfont)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3896 value = LFACE_FONT (lface); |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3897 else if (EQ (keyword, QCfontset)) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3898 value = LFACE_FONTSET (lface); |
| 24995 | 3899 else |
| 3900 signal_error ("Invalid face attribute name", keyword); | |
| 3901 | |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3902 if (IGNORE_DEFFACE_P (value)) |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3903 return Qunspecified; |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3904 |
| 24995 | 3905 return value; |
| 3906 } | |
| 3907 | |
| 3908 | |
| 3909 DEFUN ("internal-lisp-face-attribute-values", | |
| 3910 Finternal_lisp_face_attribute_values, | |
| 3911 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
|
3912 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
|
3913 Value is nil if ATTR doesn't have a discrete set of valid values. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3914 (attr) |
| 24995 | 3915 Lisp_Object attr; |
| 3916 { | |
| 3917 Lisp_Object result = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3918 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3919 CHECK_SYMBOL (attr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3920 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3921 if (EQ (attr, QCunderline)) |
| 24995 | 3922 result = Fcons (Qt, Fcons (Qnil, Qnil)); |
| 3923 else if (EQ (attr, QCoverline)) | |
| 3924 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3925 else if (EQ (attr, QCstrike_through)) | |
| 3926 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3927 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
| 3928 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3929 | |
| 3930 return result; | |
| 3931 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3932 |
| 24995 | 3933 |
| 3934 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
|
3935 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
|
3936 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
|
3937 Default face attributes override any local face attributes. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3938 (face, frame) |
| 24995 | 3939 Lisp_Object face, frame; |
| 3940 { | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3941 int i; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3942 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
|
3943 struct frame *f = XFRAME (frame); |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3944 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3945 CHECK_LIVE_FRAME (frame); |
| 24995 | 3946 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
|
3947 local_lface = lface_from_face_name (f, face, 0); |
| 24995 | 3948 if (NILP (local_lface)) |
| 3949 local_lface = Finternal_make_lisp_face (face, frame); | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3950 |
|
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
3951 /* 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
|
3952 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
|
3953 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
|
3954 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
|
3955 "global before local" priority. */ |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3956 lvec = XVECTOR (local_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3957 gvec = XVECTOR (global_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3958 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
|
3959 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
|
3960 lvec[i] = Qunspecified; |
|
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3961 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
|
3962 lvec[i] = gvec[i]; |
|
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3963 |
|
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3964 /* 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
|
3965 `font' frame parameter. */ |
|
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3966 if (EQ (face, Qdefault)) |
|
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3967 { |
|
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3968 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
|
3969 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
|
3970 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
|
3971 |
|
96529
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3972 /* 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
|
3973 if (oldface) |
|
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3974 { |
|
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3975 /* 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
|
3976 the previously-cached vector. */ |
|
96529
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3977 bcopy (oldface->lface, attrs, sizeof attrs); |
|
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3978 merge_face_vectors (f, lvec, attrs, 0); |
|
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3979 bcopy (attrs, lvec, sizeof attrs); |
|
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3980 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
|
3981 |
|
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3982 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
|
3983 || ! 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
|
3984 || ! 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
|
3985 || ! 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
|
3986 || ! 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
|
3987 || ! 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
|
3988 || ! 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
|
3989 && newface->font) |
|
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3990 { |
|
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3991 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
|
3992 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
|
3993 Qnil)); |
|
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3994 } |
|
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3995 } |
|
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3996 } |
|
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
3997 |
|
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
3998 return Qnil; |
| 24995 | 3999 } |
| 4000 | |
| 4001 | |
| 4002 /* The following function is implemented for compatibility with 20.2. | |
| 4003 The function is used in x-resolve-fonts when it is asked to | |
| 4004 return fonts with the same size as the font of a face. This is | |
| 4005 done in fontset.el. */ | |
| 4006 | |
|
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4007 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
|
4008 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
|
4009 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
|
4010 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
|
4011 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
|
4012 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
|
4013 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
|
4014 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
|
4015 if the optional third argument CHARACTER is given, |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4016 return the font name used for CHARACTER. */) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4017 (face, frame, character) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4018 Lisp_Object face, frame, character; |
| 24995 | 4019 { |
| 4020 if (EQ (frame, Qt)) | |
| 4021 { | |
| 4022 Lisp_Object result = Qnil; | |
| 4023 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
| 4024 | |
| 4025 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
| 4026 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
| 4027 result = Fcons (Qbold, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4028 |
|
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
4029 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
| 24995 | 4030 && !EQ (LFACE_SLANT (lface), Qnormal)) |
| 4031 result = Fcons (Qitalic, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4032 |
| 24995 | 4033 return result; |
| 4034 } | |
| 4035 else | |
| 4036 { | |
| 4037 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
|
4038 int face_id = lookup_named_face (f, face, 1); |
| 24995 | 4039 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
|
4040 |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4041 if (! face) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4042 return Qnil; |
|
89947
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4043 #ifdef HAVE_WINDOW_SYSTEM |
|
89948
e94e49dc760e
(Fface_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89947
diff
changeset
|
4044 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
|
4045 { |
|
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4046 CHECK_CHARACTER (character); |
|
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4047 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
|
4048 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
|
4049 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4050 return (face->font |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4051 ? face->font->props[FONT_NAME_INDEX] |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4052 : Qnil); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4053 #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
|
4054 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
|
4055 ? "ms-dos" |
|
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4056 : 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
|
4057 :"tty"); |
|
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4058 #endif |
| 24995 | 4059 } |
| 4060 } | |
| 4061 | |
| 4062 | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4063 /* 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
|
4064 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
|
4065 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
|
4066 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4067 static INLINE int |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4068 face_attr_equal_p (v1, v2) |
|
56063
109c0a603543
(face_attr_equal_p): Declare parameters.
Andreas Schwab <schwab@suse.de>
parents:
55982
diff
changeset
|
4069 Lisp_Object v1, v2; |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4070 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4071 /* 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
|
4072 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
|
4073 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
|
4074 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4075 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4076 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
|
4077 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4078 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4079 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
|
4080 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4081 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
|
4082 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
|
4083 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4084 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4085 return bcmp (SDATA (v1), SDATA (v2), SBYTES (v1)) == 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4086 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4087 case Lisp_Int: |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4088 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
|
4089 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4090 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4091 default: |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4092 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
|
4093 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4094 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4095 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4096 |
| 24995 | 4097 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
| 4098 all attributes are `equal'. Tries to be fast because this function | |
| 4099 is called quite often. */ | |
| 4100 | |
| 4101 static INLINE int | |
| 4102 lface_equal_p (v1, v2) | |
| 4103 Lisp_Object *v1, *v2; | |
| 4104 { | |
| 4105 int i, equal_p = 1; | |
| 4106 | |
| 4107 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
|
4108 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
|
4109 |
| 24995 | 4110 return equal_p; |
| 4111 } | |
| 4112 | |
| 4113 | |
| 4114 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
| 4115 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
|
4116 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
|
4117 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
|
4118 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
|
4119 If FRAME is omitted or nil, use the selected frame. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4120 (face1, face2, frame) |
| 24995 | 4121 Lisp_Object face1, face2, frame; |
| 4122 { | |
| 4123 int equal_p; | |
| 4124 struct frame *f; | |
| 4125 Lisp_Object lface1, lface2; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4126 |
| 24995 | 4127 if (EQ (frame, Qt)) |
| 4128 f = NULL; | |
| 4129 else | |
| 4130 /* Don't use check_x_frame here because this function is called | |
| 4131 before X frames exist. At that time, if FRAME is nil, | |
| 4132 selected_frame will be used which is the frame dumped with | |
| 4133 Emacs. That frame is not an X frame. */ | |
| 4134 f = frame_or_selected_frame (frame, 2); | |
| 4135 | |
|
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
|
4136 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
|
4137 lface2 = lface_from_face_name (f, face2, 1); |
| 24995 | 4138 equal_p = lface_equal_p (XVECTOR (lface1)->contents, |
| 4139 XVECTOR (lface2)->contents); | |
| 4140 return equal_p ? Qt : Qnil; | |
| 4141 } | |
| 4142 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4143 |
| 24995 | 4144 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
| 4145 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
|
4146 doc: /* True if FACE has no attribute specified. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4147 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
|
4148 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
|
4149 If FRAME is omitted or nil, use the selected frame. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4150 (face, frame) |
| 24995 | 4151 Lisp_Object face, frame; |
| 4152 { | |
| 4153 struct frame *f; | |
| 4154 Lisp_Object lface; | |
| 4155 int i; | |
| 4156 | |
| 4157 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4158 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4159 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4160 f = XFRAME (frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4161 |
| 24995 | 4162 if (EQ (frame, Qt)) |
| 4163 lface = lface_from_face_name (NULL, face, 1); | |
| 4164 else | |
| 4165 lface = lface_from_face_name (f, face, 1); | |
| 4166 | |
| 4167 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
|
4168 if (!UNSPECIFIEDP (AREF (lface, i))) |
| 24995 | 4169 break; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4170 |
| 24995 | 4171 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
| 4172 } | |
| 4173 | |
| 4174 | |
| 4175 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
|
4176 0, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4177 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
|
4178 For internal use only. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4179 (frame) |
| 24995 | 4180 Lisp_Object frame; |
| 4181 { | |
| 4182 struct frame *f = frame_or_selected_frame (frame, 0); | |
| 4183 return f->face_alist; | |
| 4184 } | |
| 4185 | |
| 4186 | |
| 4187 /* Return a hash code for Lisp string STRING with case ignored. Used | |
| 4188 below in computing a hash value for a Lisp face. */ | |
| 4189 | |
| 4190 static INLINE unsigned | |
| 4191 hash_string_case_insensitive (string) | |
| 4192 Lisp_Object string; | |
| 4193 { | |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
4194 const unsigned char *s; |
| 24995 | 4195 unsigned hash = 0; |
| 4196 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
|
4197 for (s = SDATA (string); *s; ++s) |
| 24995 | 4198 hash = (hash << 1) ^ tolower (*s); |
| 4199 return hash; | |
| 4200 } | |
| 4201 | |
| 4202 | |
| 4203 /* Return a hash code for face attribute vector V. */ | |
| 4204 | |
| 4205 static INLINE unsigned | |
| 4206 lface_hash (v) | |
| 4207 Lisp_Object *v; | |
| 4208 { | |
| 4209 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4210 ^ hash_string_case_insensitive (v[LFACE_FOUNDRY_INDEX]) |
| 24995 | 4211 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) |
| 4212 ^ 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
|
4213 ^ XHASH (v[LFACE_WEIGHT_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4214 ^ XHASH (v[LFACE_SLANT_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4215 ^ XHASH (v[LFACE_SWIDTH_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4216 ^ XHASH (v[LFACE_HEIGHT_INDEX])); |
| 24995 | 4217 } |
| 4218 | |
| 4219 | |
| 4220 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
| 4221 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
|
4222 family, point size, weight, width, slant, and font. Both |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4223 LFACE1 and LFACE2 must be fully-specified. */ |
| 24995 | 4224 |
| 4225 static INLINE int | |
| 4226 lface_same_font_attributes_p (lface1, lface2) | |
| 4227 Lisp_Object *lface1, *lface2; | |
| 4228 { | |
| 4229 xassert (lface_fully_specified_p (lface1) | |
| 4230 && lface_fully_specified_p (lface2)); | |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4231 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
|
4232 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4233 && xstrcasecmp (SDATA (lface1[LFACE_FOUNDRY_INDEX]), |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4234 SDATA (lface2[LFACE_FOUNDRY_INDEX])) == 0 |
| 31178 | 4235 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
| 24995 | 4236 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX]) |
| 4237 && 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
|
4238 && 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
|
4239 && EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX]) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4240 && (EQ (lface1[LFACE_FONTSET_INDEX], lface2[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4241 || (STRINGP (lface1[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4242 && STRINGP (lface2[LFACE_FONTSET_INDEX]) |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4243 && ! xstrcasecmp (SDATA (lface1[LFACE_FONTSET_INDEX]), |
|
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4244 SDATA (lface2[LFACE_FONTSET_INDEX])))) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4245 ); |
| 24995 | 4246 } |
| 4247 | |
| 4248 | |
| 4249 | |
| 4250 /*********************************************************************** | |
| 4251 Realized Faces | |
| 4252 ***********************************************************************/ | |
| 4253 | |
| 4254 /* 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
|
4255 vector ATTR. */ |
| 24995 | 4256 |
| 4257 static struct face * | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4258 make_realized_face (attr) |
| 24995 | 4259 Lisp_Object *attr; |
| 4260 { | |
| 4261 struct face *face = (struct face *) xmalloc (sizeof *face); | |
| 4262 bzero (face, sizeof *face); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4263 face->ascii_face = face; |
| 24995 | 4264 bcopy (attr, face->lface, sizeof face->lface); |
| 4265 return face; | |
| 4266 } | |
| 4267 | |
| 4268 | |
| 4269 /* Free realized face FACE, including its X resources. FACE may | |
| 4270 be null. */ | |
| 4271 | |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4272 void |
| 24995 | 4273 free_realized_face (f, face) |
| 4274 struct frame *f; | |
| 4275 struct face *face; | |
| 4276 { | |
| 4277 if (face) | |
| 4278 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4279 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4280 if (FRAME_WINDOW_P (f)) |
| 24995 | 4281 { |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4282 /* 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
|
4283 if (face->fontset >= 0 && face == face->ascii_face) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4284 free_face_fontset (f, face); |
| 24995 | 4285 if (face->gc) |
| 4286 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4287 BLOCK_INPUT; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4288 if (face->font) |
| 90414 | 4289 font_done_for_face (f, face); |
| 24995 | 4290 x_free_gc (f, face->gc); |
| 4291 face->gc = 0; | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4292 UNBLOCK_INPUT; |
| 24995 | 4293 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4294 |
| 24995 | 4295 free_face_colors (f, face); |
| 4296 x_destroy_bitmap (f, face->stipple); | |
| 4297 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4298 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4299 |
| 4300 xfree (face); | |
| 4301 } | |
| 4302 } | |
| 4303 | |
| 4304 | |
| 4305 /* Prepare face FACE for subsequent display on frame F. This | |
| 4306 allocated GCs if they haven't been allocated yet or have been freed | |
| 4307 by clearing the face cache. */ | |
| 4308 | |
| 4309 void | |
| 4310 prepare_face_for_display (f, face) | |
| 4311 struct frame *f; | |
| 4312 struct face *face; | |
| 4313 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4314 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4315 xassert (FRAME_WINDOW_P (f)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4316 |
| 24995 | 4317 if (face->gc == 0) |
| 4318 { | |
| 4319 XGCValues xgcv; | |
| 4320 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
| 4321 | |
| 4322 xgcv.foreground = face->foreground; | |
| 4323 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
|
4324 #ifdef HAVE_X_WINDOWS |
| 24995 | 4325 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
|
4326 #endif |
| 24995 | 4327 |
| 4328 BLOCK_INPUT; | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4329 #ifdef HAVE_X_WINDOWS |
| 24995 | 4330 if (face->stipple) |
| 4331 { | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
4332 xgcv.fill_style = FillOpaqueStippled; |
| 24995 | 4333 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
| 4334 mask |= GCFillStyle | GCStipple; | |
| 4335 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4336 #endif |
| 24995 | 4337 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
|
4338 if (face->font) |
| 90414 | 4339 font_prepare_for_face (f, face); |
| 24995 | 4340 UNBLOCK_INPUT; |
| 4341 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4342 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4343 } |
| 4344 | |
| 4345 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4346 /* 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
|
4347 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4348 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4349 color_distance (x, y) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4350 XColor *x, *y; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4351 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4352 /* 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
|
4353 Quoting from that paper: |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4354 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4355 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
|
4356 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
|
4357 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
|
4358 gives far from optimal results. |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4359 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4360 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
|
4361 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4362 long r = (x->red - y->red) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4363 long g = (x->green - y->green) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4364 long b = (x->blue - y->blue) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4365 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
|
4366 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4367 return |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4368 (((512 + r_mean) * r * r) >> 8) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4369 + 4 * g * g |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4370 + (((767 - r_mean) * b * b) >> 8); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4371 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4372 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4373 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4374 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
|
4375 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
|
4376 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
|
4377 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
|
4378 If FRAME is unspecified or nil, the current frame is used. */) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4379 (color1, color2, frame) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4380 Lisp_Object color1, color2, frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4381 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4382 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4383 XColor cdef1, cdef2; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4384 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4385 if (NILP (frame)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4386 frame = selected_frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4387 CHECK_LIVE_FRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4388 f = XFRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4389 |
|
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
|
4390 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
|
4391 && !(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
|
4392 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
|
4393 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
|
4394 && !(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
|
4395 signal_error ("Invalid color", color2); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4396 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4397 return make_number (color_distance (&cdef1, &cdef2)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4398 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4399 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4400 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4401 /*********************************************************************** |
| 24995 | 4402 Face Cache |
| 4403 ***********************************************************************/ | |
| 4404 | |
| 4405 /* Return a new face cache for frame F. */ | |
| 4406 | |
| 4407 static struct face_cache * | |
| 4408 make_face_cache (f) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4409 struct frame *f; |
| 24995 | 4410 { |
| 4411 struct face_cache *c; | |
| 4412 int size; | |
| 4413 | |
| 4414 c = (struct face_cache *) xmalloc (sizeof *c); | |
| 4415 bzero (c, sizeof *c); | |
| 4416 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 4417 c->buckets = (struct face **) xmalloc (size); | |
| 4418 bzero (c->buckets, size); | |
| 4419 c->size = 50; | |
| 4420 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
| 4421 c->f = f; | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4422 c->menu_face_changed_p = menu_face_changed_default; |
| 24995 | 4423 return c; |
| 4424 } | |
| 4425 | |
| 4426 | |
| 4427 /* Clear out all graphics contexts for all realized faces, except for | |
| 4428 the basic faces. This should be done from time to time just to avoid | |
| 4429 keeping too many graphics contexts that are no longer needed. */ | |
| 4430 | |
| 4431 static void | |
| 4432 clear_face_gcs (c) | |
| 4433 struct face_cache *c; | |
| 4434 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4435 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
|
4436 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4437 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4438 int i; |
| 4439 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
| 4440 { | |
| 4441 struct face *face = c->faces_by_id[i]; | |
| 4442 if (face && face->gc) | |
| 4443 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4444 BLOCK_INPUT; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4445 if (face->font) |
| 90414 | 4446 font_done_for_face (c->f, face); |
| 24995 | 4447 x_free_gc (c->f, face->gc); |
| 4448 face->gc = 0; | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4449 UNBLOCK_INPUT; |
| 24995 | 4450 } |
| 4451 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4452 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4453 } |
| 4454 } | |
| 4455 | |
| 4456 | |
|
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4457 /* 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
|
4458 C may be null. If faces are freed, make sure the frame's current |
| 24995 | 4459 matrix is marked invalid, so that a display caused by an expose |
| 4460 event doesn't try to use faces we destroyed. */ | |
| 4461 | |
| 4462 static void | |
| 4463 free_realized_faces (c) | |
| 4464 struct face_cache *c; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4465 { |
| 24995 | 4466 if (c && c->used) |
| 4467 { | |
| 4468 int i, size; | |
| 4469 struct frame *f = c->f; | |
| 4470 | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4471 /* 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
|
4472 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
|
4473 current matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4474 BLOCK_INPUT; |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4475 |
| 24995 | 4476 for (i = 0; i < c->used; ++i) |
| 4477 { | |
| 4478 free_realized_face (f, c->faces_by_id[i]); | |
| 4479 c->faces_by_id[i] = NULL; | |
| 4480 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4481 |
| 24995 | 4482 c->used = 0; |
| 4483 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 4484 bzero (c->buckets, size); | |
| 4485 | |
| 4486 /* Must do a thorough redisplay the next time. Mark current | |
| 4487 matrices as invalid because they will reference faces freed | |
| 4488 above. This function is also called when a frame is | |
| 4489 destroyed. In this case, the root window of F is nil. */ | |
| 4490 if (WINDOWP (f->root_window)) | |
| 4491 { | |
| 4492 clear_current_matrices (f); | |
| 4493 ++windows_or_buffers_changed; | |
| 4494 } | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4495 |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4496 UNBLOCK_INPUT; |
| 24995 | 4497 } |
| 4498 } | |
| 4499 | |
| 4500 | |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4501 /* 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
|
4502 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4503 void |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4504 free_realized_faces_for_fontset (f, fontset) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4505 struct frame *f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4506 int fontset; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4507 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4508 struct face_cache *cache = FRAME_FACE_CACHE (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4509 struct face *face; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4510 int i; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4511 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4512 /* 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
|
4513 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
|
4514 matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4515 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4516 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4517 for (i = 0; i < cache->used; i++) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4518 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4519 face = cache->faces_by_id[i]; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4520 if (face |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4521 && face->fontset == fontset) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4522 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4523 uncache_face (cache, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4524 free_realized_face (f, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4525 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4526 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4527 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4528 /* 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
|
4529 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
|
4530 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
|
4531 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
|
4532 if (WINDOWP (f->root_window)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4533 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4534 clear_current_matrices (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4535 ++windows_or_buffers_changed; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4536 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4537 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4538 UNBLOCK_INPUT; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4539 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4540 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4541 |
| 24995 | 4542 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
| 4543 This is done after attributes of a named face have been changed, | |
| 4544 because we can't tell which realized faces depend on that face. */ | |
| 4545 | |
| 4546 void | |
| 4547 free_all_realized_faces (frame) | |
| 4548 Lisp_Object frame; | |
| 4549 { | |
| 4550 if (NILP (frame)) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4551 { |
| 24995 | 4552 Lisp_Object rest; |
| 4553 FOR_EACH_FRAME (rest, frame) | |
| 4554 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 4555 } | |
| 4556 else | |
| 4557 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 4558 } | |
| 4559 | |
| 4560 | |
| 4561 /* Free face cache C and faces in it, including their X resources. */ | |
| 4562 | |
| 4563 static void | |
| 4564 free_face_cache (c) | |
| 4565 struct face_cache *c; | |
| 4566 { | |
| 4567 if (c) | |
| 4568 { | |
| 4569 free_realized_faces (c); | |
| 4570 xfree (c->buckets); | |
| 4571 xfree (c->faces_by_id); | |
| 4572 xfree (c); | |
| 4573 } | |
| 4574 } | |
| 4575 | |
| 4576 | |
| 4577 /* Cache realized face FACE in face cache C. HASH is the hash value | |
| 88907 | 4578 of FACE. If FACE is for ASCII characters (i.e. FACE->ascii_face == |
| 4579 FACE), insert the new face to the beginning of the collision list | |
| 4580 of the face hash table of C. Otherwise, add the new face to the | |
| 4581 end of the collision list. This way, lookup_face can quickly find | |
| 4582 that a requested face is not cached. */ | |
| 24995 | 4583 |
| 4584 static void | |
| 4585 cache_face (c, face, hash) | |
| 4586 struct face_cache *c; | |
| 4587 struct face *face; | |
| 4588 unsigned hash; | |
| 4589 { | |
| 4590 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
| 4591 | |
| 4592 face->hash = hash; | |
| 4593 | |
| 88907 | 4594 if (face->ascii_face != face) |
| 24995 | 4595 { |
| 4596 struct face *last = c->buckets[i]; | |
| 4597 if (last) | |
| 4598 { | |
| 4599 while (last->next) | |
| 4600 last = last->next; | |
| 4601 last->next = face; | |
| 4602 face->prev = last; | |
| 4603 face->next = NULL; | |
| 4604 } | |
| 4605 else | |
| 4606 { | |
| 4607 c->buckets[i] = face; | |
| 4608 face->prev = face->next = NULL; | |
| 4609 } | |
| 4610 } | |
| 4611 else | |
| 4612 { | |
| 4613 face->prev = NULL; | |
| 4614 face->next = c->buckets[i]; | |
| 4615 if (face->next) | |
| 4616 face->next->prev = face; | |
| 4617 c->buckets[i] = face; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4618 } |
|
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4619 |
| 24995 | 4620 /* Find a free slot in C->faces_by_id and use the index of the free |
| 4621 slot as FACE->id. */ | |
| 4622 for (i = 0; i < c->used; ++i) | |
| 4623 if (c->faces_by_id[i] == NULL) | |
| 4624 break; | |
| 4625 face->id = i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4626 |
| 24995 | 4627 /* 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
|
4628 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
|
4629 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4630 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
|
4631 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4632 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
|
4633 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
|
4634 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
|
4635 abort (); /* Alternatives? ++kfs */ |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4636 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
|
4637 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
|
4638 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
|
4639 } |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4640 c->used++; |
| 24995 | 4641 } |
| 4642 | |
| 4643 #if GLYPH_DEBUG | |
| 4644 /* Check that FACE got a unique id. */ | |
| 4645 { | |
| 4646 int j, n; | |
| 4647 struct face *face; | |
| 4648 | |
| 4649 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
| 4650 for (face = c->buckets[j]; face; face = face->next) | |
| 4651 if (face->id == i) | |
| 4652 ++n; | |
| 4653 | |
| 4654 xassert (n == 1); | |
| 4655 } | |
| 4656 #endif /* GLYPH_DEBUG */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4657 |
| 24995 | 4658 c->faces_by_id[i] = face; |
| 4659 } | |
| 4660 | |
| 4661 | |
| 4662 /* Remove face FACE from cache C. */ | |
| 4663 | |
| 4664 static void | |
| 4665 uncache_face (c, face) | |
| 4666 struct face_cache *c; | |
| 4667 struct face *face; | |
| 4668 { | |
| 4669 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4670 |
| 24995 | 4671 if (face->prev) |
| 4672 face->prev->next = face->next; | |
| 4673 else | |
| 4674 c->buckets[i] = face->next; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4675 |
| 24995 | 4676 if (face->next) |
| 4677 face->next->prev = face->prev; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4678 |
| 24995 | 4679 c->faces_by_id[face->id] = NULL; |
| 4680 if (face->id == c->used) | |
| 4681 --c->used; | |
| 4682 } | |
| 4683 | |
| 4684 | |
| 4685 /* Look up a realized face with face attributes ATTR in the face cache | |
| 88907 | 4686 of frame F. The face will be used to display ASCII characters. |
| 4687 Value is the ID of the face found. If no suitable face is found, | |
| 4688 realize a new one. */ | |
| 24995 | 4689 |
| 4690 INLINE int | |
| 88907 | 4691 lookup_face (f, attr) |
| 24995 | 4692 struct frame *f; |
| 4693 Lisp_Object *attr; | |
| 4694 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4695 struct face_cache *cache = FRAME_FACE_CACHE (f); |
| 24995 | 4696 unsigned hash; |
| 4697 int i; | |
| 4698 struct face *face; | |
| 4699 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4700 xassert (cache != NULL); |
| 24995 | 4701 check_lface_attrs (attr); |
| 4702 | |
| 4703 /* Look up ATTR in the face cache. */ | |
| 4704 hash = lface_hash (attr); | |
| 4705 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4706 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4707 for (face = cache->buckets[i]; face; face = face->next) |
| 88907 | 4708 { |
| 4709 if (face->ascii_face != face) | |
| 4710 { | |
| 4711 /* There's no more ASCII face. */ | |
| 4712 face = NULL; | |
| 4713 break; | |
| 4714 } | |
| 4715 if (face->hash == hash | |
| 4716 && lface_equal_p (face->lface, attr)) | |
| 4717 break; | |
| 4718 } | |
| 24995 | 4719 |
| 4720 /* If not found, realize a new face. */ | |
| 4721 if (face == NULL) | |
| 88907 | 4722 face = realize_face (cache, attr, -1); |
| 24995 | 4723 |
| 4724 #if GLYPH_DEBUG | |
| 4725 xassert (face == FACE_FROM_ID (f, face->id)); | |
| 4726 #endif /* GLYPH_DEBUG */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4727 |
| 24995 | 4728 return face->id; |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4729 } |
| 24995 | 4730 |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4731 #ifdef HAVE_WINDOW_SYSTEM |
| 88907 | 4732 /* 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
|
4733 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
|
4734 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
|
4735 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
|
4736 suitable face is found, realize a new one. */ |
| 24995 | 4737 |
| 4738 int | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4739 face_for_font (f, font_object, base_face) |
| 88907 | 4740 struct frame *f; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4741 Lisp_Object font_object; |
| 88907 | 4742 struct face *base_face; |
| 4743 { | |
| 4744 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
| 4745 unsigned hash; | |
| 4746 int i; | |
| 4747 struct face *face; | |
| 4748 | |
| 4749 xassert (cache != NULL); | |
| 4750 base_face = base_face->ascii_face; | |
| 4751 hash = lface_hash (base_face->lface); | |
| 4752 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
| 4753 | |
| 4754 for (face = cache->buckets[i]; face; face = face->next) | |
| 4755 { | |
| 4756 if (face->ascii_face == face) | |
| 4757 continue; | |
| 4758 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
|
4759 && face->font == (NILP (font_object) ? NULL |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4760 : XFONT_OBJECT (font_object)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4761 && lface_equal_p (face->lface, base_face->lface)) |
| 90414 | 4762 return face->id; |
| 4763 } | |
| 4764 | |
| 4765 /* 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
|
4766 face = realize_non_ascii_face (f, font_object, base_face); |
| 90414 | 4767 return face->id; |
| 4768 } | |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4769 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4770 |
| 4771 /* Return the face id of the realized face for named face SYMBOL on | |
| 88907 | 4772 frame F suitable for displaying ASCII characters. Value is -1 if |
| 4773 the face couldn't be determined, which might happen if the default | |
| 4774 face isn't realized and cannot be realized. */ | |
| 24995 | 4775 |
| 4776 int | |
|
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
4777 lookup_named_face (f, symbol, signal_p) |
| 24995 | 4778 struct frame *f; |
| 4779 Lisp_Object symbol; | |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4780 int signal_p; |
| 24995 | 4781 { |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4782 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
|
4783 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; |
| 24995 | 4784 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
| 4785 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4786 if (default_face == NULL) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4787 { |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4788 if (!realize_basic_faces (f)) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4789 return -1; |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4790 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
|
4791 if (default_face == NULL) |
|
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
4792 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
|
4793 } |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4794 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4795 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
|
4796 return -1; |
|
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4797 |
| 24995 | 4798 bcopy (default_face->lface, attrs, sizeof attrs); |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4799 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
|
4800 |
| 88907 | 4801 return lookup_face (f, attrs); |
| 24995 | 4802 } |
| 4803 | |
| 4804 | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4805 /* 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
|
4806 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
|
4807 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
|
4808 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
|
4809 rather than signal an error. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4810 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4811 int |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4812 lookup_basic_face (f, face_id) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4813 struct frame *f; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4814 int face_id; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4815 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4816 Lisp_Object name, mapping; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4817 int remapped_face_id; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4818 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4819 if (NILP (Vface_remapping_alist)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4820 return face_id; /* Nothing to do. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4821 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4822 switch (face_id) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4823 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4824 case DEFAULT_FACE_ID: name = Qdefault; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4825 case MODE_LINE_FACE_ID: name = Qmode_line; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4826 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
|
4827 case HEADER_LINE_FACE_ID: name = Qheader_line; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4828 case TOOL_BAR_FACE_ID: name = Qtool_bar; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4829 case FRINGE_FACE_ID: name = Qfringe; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4830 case SCROLL_BAR_FACE_ID: name = Qscroll_bar; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4831 case BORDER_FACE_ID: name = Qborder; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4832 case CURSOR_FACE_ID: name = Qcursor; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4833 case MOUSE_FACE_ID: name = Qmouse; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4834 case MENU_FACE_ID: name = Qmenu; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4835 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4836 default: |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4837 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
|
4838 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4839 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4840 /* 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
|
4841 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
|
4842 for the very common no-remapping case. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4843 mapping = assq_no_quit (name, Vface_remapping_alist); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4844 if (NILP (mapping)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4845 return face_id; /* Give up. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4846 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4847 /* 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
|
4848 handle the remapping too. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4849 remapped_face_id = lookup_named_face (f, name, 0); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4850 if (remapped_face_id < 0) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4851 return face_id; /* Give up. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4852 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4853 return remapped_face_id; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4854 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4855 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4856 |
| 24995 | 4857 /* Return the ID of the realized ASCII face of Lisp face with ID |
| 4858 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
| 4859 | |
| 4860 int | |
| 4861 ascii_face_of_lisp_face (f, lface_id) | |
| 4862 struct frame *f; | |
| 4863 int lface_id; | |
| 4864 { | |
| 4865 int face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4866 |
| 24995 | 4867 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
| 4868 { | |
| 4869 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
|
4870 face_id = lookup_named_face (f, face_name, 1); |
| 24995 | 4871 } |
| 4872 else | |
| 4873 face_id = -1; | |
| 4874 | |
| 4875 return face_id; | |
| 4876 } | |
| 4877 | |
| 4878 | |
| 4879 /* Return a face for charset ASCII that is like the face with id | |
| 4880 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
| 4881 STEPS < 0 means larger. Value is the id of the face. */ | |
| 4882 | |
| 4883 int | |
| 4884 smaller_face (f, face_id, steps) | |
| 4885 struct frame *f; | |
| 4886 int face_id, steps; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4887 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4888 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4889 struct face *face; |
| 4890 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 4891 int pt, last_pt, last_height; | |
| 4892 int delta; | |
| 4893 int new_face_id; | |
| 4894 struct face *new_face; | |
| 4895 | |
| 4896 /* If not called for an X frame, just return the original face. */ | |
| 4897 if (FRAME_TERMCAP_P (f)) | |
| 4898 return face_id; | |
| 4899 | |
| 4900 /* Try in increments of 1/2 pt. */ | |
| 4901 delta = steps < 0 ? 5 : -5; | |
| 85262 | 4902 steps = eabs (steps); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4903 |
| 24995 | 4904 face = FACE_FROM_ID (f, face_id); |
| 4905 bcopy (face->lface, attrs, sizeof attrs); | |
| 4906 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
| 4907 new_face_id = face_id; | |
| 4908 last_height = FONT_HEIGHT (face->font); | |
| 4909 | |
| 4910 while (steps | |
| 4911 && pt + delta > 0 | |
| 4912 /* Give up if we cannot find a font within 10pt. */ | |
| 85262 | 4913 && eabs (last_pt - pt) < 100) |
| 24995 | 4914 { |
| 4915 /* Look up a face for a slightly smaller/larger font. */ | |
| 4916 pt += delta; | |
| 4917 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
| 88907 | 4918 new_face_id = lookup_face (f, attrs); |
| 24995 | 4919 new_face = FACE_FROM_ID (f, new_face_id); |
| 4920 | |
| 4921 /* 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
|
4922 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
|
4923 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
| 24995 | 4924 { |
| 4925 --steps; | |
| 4926 last_height = FONT_HEIGHT (new_face->font); | |
| 4927 last_pt = pt; | |
| 4928 } | |
| 4929 } | |
| 4930 | |
| 4931 return new_face_id; | |
| 4932 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4933 #else /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 4934 |
| 4935 return face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4936 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4937 #endif /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 4938 } |
| 4939 | |
| 4940 | |
| 4941 /* Return a face for charset ASCII that is like the face with id | |
| 4942 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
|
4943 |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
4944 int |
| 24995 | 4945 face_with_height (f, face_id, height) |
| 4946 struct frame *f; | |
| 4947 int face_id; | |
| 4948 int height; | |
| 4949 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4950 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4951 struct face *face; |
| 4952 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 4953 | |
| 4954 if (FRAME_TERMCAP_P (f) | |
| 4955 || height <= 0) | |
| 4956 return face_id; | |
| 4957 | |
| 4958 face = FACE_FROM_ID (f, face_id); | |
| 4959 bcopy (face->lface, attrs, sizeof attrs); | |
| 4960 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
|
4961 font_clear_prop (attrs, FONT_SIZE_INDEX); |
| 88907 | 4962 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
|
4963 #endif /* HAVE_WINDOW_SYSTEM */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4964 |
| 24995 | 4965 return face_id; |
| 4966 } | |
| 4967 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4968 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4969 /* Return the face id of the realized face for named face SYMBOL on |
| 88907 | 4970 frame F suitable for displaying ASCII characters, and use |
| 4971 attributes of the face FACE_ID for attributes that aren't | |
| 4972 completely specified by SYMBOL. This is like lookup_named_face, | |
| 4973 except that the default attributes come from FACE_ID, not from the | |
| 4974 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
|
4975 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4976 int |
|
90128
13796b0653c7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-29
Miles Bader <miles@gnu.org>
diff
changeset
|
4977 lookup_derived_face (f, symbol, face_id, signal_p) |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4978 struct frame *f; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4979 Lisp_Object symbol; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4980 int face_id; |
|
65713
ad24f42046b1
* xlwmenu.c (find_next_selectable):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
65347
diff
changeset
|
4981 int signal_p; |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4982 { |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4983 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
|
4984 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
|
4985 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
|
4986 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4987 if (!default_face) |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4988 abort (); |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4989 |
|
97502
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
4990 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
|
4991 return -1; |
|
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
4992 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4993 bcopy (default_face->lface, attrs, sizeof attrs); |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4994 merge_face_vectors (f, symbol_attrs, attrs, 0); |
| 88907 | 4995 return lookup_face (f, attrs); |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4996 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4997 |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4998 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
|
4999 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
|
5000 doc: /* Return a vector of face attributes corresponding to PLIST. */) |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5001 (plist) |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5002 Lisp_Object plist; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5003 { |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5004 Lisp_Object lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5005 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
|
5006 Qunspecified); |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5007 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
|
5008 1, 0); |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5009 return lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5010 } |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5011 |
| 24995 | 5012 |
| 5013 | |
| 5014 /*********************************************************************** | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5015 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
|
5016 ***********************************************************************/ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5017 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5018 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5019 /* 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
|
5020 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
|
5021 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
|
5022 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5023 #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
|
5024 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5025 #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
|
5026 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5027 /* 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
|
5028 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
|
5029 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5030 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
|
5031 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
|
5032 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
|
5033 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5034 \(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
|
5035 \(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
|
5036 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5037 static int |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5038 x_supports_face_attributes_p (f, attrs, def_face) |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5039 struct frame *f; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5040 Lisp_Object *attrs; |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5041 struct face *def_face; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5042 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5043 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
|
5044 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5045 /* 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
|
5046 face. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5047 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
|
5048 && 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
|
5049 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
|
5050 || (!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
|
5051 && 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
|
5052 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
|
5053 || (!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
|
5054 && 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
|
5055 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
|
5056 || (!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
|
5057 && 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
|
5058 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
|
5059 || (!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
|
5060 && 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
|
5061 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
|
5062 || (!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
|
5063 && 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
|
5064 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
|
5065 || (!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
|
5066 && 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
|
5067 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
|
5068 || (!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
|
5069 && 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
|
5070 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
|
5071 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5072 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5073 /* 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
|
5074 "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
|
5075 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5076 || !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
|
5077 || !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
|
5078 || !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
|
5079 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5080 || !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
|
5081 { |
|
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5082 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
|
5083 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
|
5084 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
|
5085 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
|
5086 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5087 bcopy (def_attrs, merged_attrs, sizeof merged_attrs); |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5088 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5089 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
|
5090 |
|
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5091 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
|
5092 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
|
5093 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5094 if (! face) |
|
63705
9e649a045c18
(x_supports_face_attributes_p): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
5095 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
|
5096 |
|
95471
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5097 /* 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
|
5098 supported. */ |
|
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5099 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
|
5100 || ! 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
|
5101 return 0; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5102 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
|
5103 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
|
5104 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5105 Lisp_Object s1, s2; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5106 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5107 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
|
5108 || face->font->driver->case_sensitive) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5109 return 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5110 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
|
5111 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
|
5112 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
|
5113 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
|
5114 return 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5115 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5116 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
|
5117 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5118 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5119 /* 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
|
5120 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5121 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5122 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5123 #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
|
5124 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5125 /* 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
|
5126 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
|
5127 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5128 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
|
5129 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
|
5130 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
|
5131 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5132 \(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
|
5133 \(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
|
5134 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5135 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
|
5136 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
|
5137 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
|
5138 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
|
5139 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
|
5140 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5141 static int |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5142 tty_supports_face_attributes_p (f, attrs, def_face) |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5143 struct frame *f; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5144 Lisp_Object *attrs; |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5145 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
|
5146 { |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5147 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
|
5148 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
|
5149 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
|
5150 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
|
5151 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
|
5152 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
|
5153 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5154 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5155 /* 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
|
5156 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
|
5157 (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
|
5158 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
|
5159 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
|
5160 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
|
5161 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
|
5162 specifies. */ |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5163 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5164 || !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
|
5165 || !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
|
5166 || !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
|
5167 || !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
|
5168 || !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
|
5169 || !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
|
5170 || !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
|
5171 || !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
|
5172 return 0; |
|
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 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5175 /* 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
|
5176 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5177 /* font weight (bold/dim) */ |
|
103228
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5178 val = attrs[LFACE_WEIGHT_INDEX]; |
|
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5179 if (!UNSPECIFIEDP (val) |
|
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5180 && (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
|
5181 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5182 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
|
5183 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5184 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
|
5185 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5186 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
|
5187 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
|
5188 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
|
5189 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5190 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
|
5191 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5192 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
|
5193 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
|
5194 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
|
5195 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5196 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
|
5197 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
|
5198 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5199 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5200 /* underlining */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5201 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
|
5202 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
|
5203 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5204 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
|
5205 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
|
5206 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
|
5207 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
|
5208 else |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5209 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
|
5210 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5211 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5212 /* inverse video */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5213 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
|
5214 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
|
5215 { |
|
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5216 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
|
5217 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
|
5218 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5219 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
|
5220 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5221 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5222 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5223 /* Color testing. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5224 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5225 /* 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
|
5226 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
|
5227 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
|
5228 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
|
5229 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
|
5230 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5231 /* 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
|
5232 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
|
5233 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
|
5234 { |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5235 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
|
5236 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5237 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
|
5238 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
|
5239 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
|
5240 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
|
5241 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
|
5242 > 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
|
5243 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
|
5244 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5245 /* 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
|
5246 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5247 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
|
5248 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
|
5249 && (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
|
5250 <= 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
|
5251 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5252 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5253 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5254 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5255 /* 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
|
5256 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
|
5257 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
|
5258 { |
|
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5259 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
|
5260 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5261 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
|
5262 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
|
5263 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
|
5264 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
|
5265 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
|
5266 > 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
|
5267 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
|
5268 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5269 /* 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
|
5270 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5271 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
|
5272 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
|
5273 && (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
|
5274 <= 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
|
5275 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5276 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5277 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5278 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5279 /* 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
|
5280 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
|
5281 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
|
5282 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
|
5283 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
|
5284 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5285 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
|
5286 = (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
|
5287 - 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
|
5288 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
|
5289 || 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
|
5290 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5291 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5292 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5293 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5294 /* 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
|
5295 given colors. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5296 if (test_caps != 0 && |
| 83145 | 5297 ! 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
|
5298 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5299 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5300 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5301 /* 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
|
5302 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5303 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5304 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5305 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5306 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
|
5307 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
|
5308 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
|
5309 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
|
5310 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
|
5311 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
|
5312 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5313 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
|
5314 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
|
5315 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
|
5316 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5317 \(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
|
5318 \(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
|
5319 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5320 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
|
5321 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
|
5322 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
|
5323 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
|
5324 face for italic. */) |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5325 (attributes, display) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5326 Lisp_Object attributes, display; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5327 { |
|
74071
ea7f3c26d52b
(Fdisplay_supports_face_attributes_p): Initialize
Andreas Schwab <schwab@suse.de>
parents:
73509
diff
changeset
|
5328 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
|
5329 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
|
5330 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
|
5331 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
|
5332 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
|
5333 |
|
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5334 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
|
5335 /* 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
|
5336 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
|
5337 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
|
5338 return Qnil; |
|
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5339 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5340 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
|
5341 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
|
5342 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
|
5343 frame = display; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5344 else |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5345 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5346 /* 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
|
5347 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
|
5348 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5349 frame = Qnil; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5350 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
|
5351 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5352 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
|
5353 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
|
5354 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
|
5355 display))) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5356 break; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5357 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5358 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5359 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5360 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
|
5361 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
|
5362 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5363 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
|
5364 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
|
5365 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
|
5366 |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5367 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
|
5368 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
|
5369 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5370 if (! realize_basic_faces (f)) |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5371 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
|
5372 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
|
5373 if (def_face == NULL) |
|
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
5374 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
|
5375 } |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5376 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5377 /* 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
|
5378 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
|
5379 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
|
5380 #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
|
5381 else |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5382 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
|
5383 #endif |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5384 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5385 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
|
5386 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5387 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5388 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5389 /*********************************************************************** |
| 24995 | 5390 Font selection |
| 5391 ***********************************************************************/ | |
| 5392 | |
|
102232
7de4f0f549a4
(Finternal_set_font_selection_order): Remove leading whitespace that
Glenn Morris <rgm@gnu.org>
parents:
101292
diff
changeset
|
5393 DEFUN ("internal-set-font-selection-order", |
| 24995 | 5394 Finternal_set_font_selection_order, |
| 5395 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
|
5396 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
|
5397 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
|
5398 `:height', `:weight', and `:slant'. Face attributes appearing |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5399 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
|
5400 `: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
|
5401 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
|
5402 Value is ORDER. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5403 (order) |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5404 Lisp_Object order; |
| 24995 | 5405 { |
| 5406 Lisp_Object list; | |
| 5407 int i; | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5408 int indices[DIM (font_sort_order)]; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5409 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5410 CHECK_LIST (order); |
| 24995 | 5411 bzero (indices, sizeof indices); |
| 5412 i = 0; | |
| 5413 | |
| 5414 for (list = order; | |
| 5415 CONSP (list) && i < DIM (indices); | |
| 5416 list = XCDR (list), ++i) | |
| 5417 { | |
| 5418 Lisp_Object attr = XCAR (list); | |
| 5419 int xlfd; | |
| 5420 | |
| 5421 if (EQ (attr, QCwidth)) | |
| 5422 xlfd = XLFD_SWIDTH; | |
| 5423 else if (EQ (attr, QCheight)) | |
| 5424 xlfd = XLFD_POINT_SIZE; | |
| 5425 else if (EQ (attr, QCweight)) | |
| 5426 xlfd = XLFD_WEIGHT; | |
| 5427 else if (EQ (attr, QCslant)) | |
| 5428 xlfd = XLFD_SLANT; | |
| 5429 else | |
| 5430 break; | |
| 5431 | |
| 5432 if (indices[i] != 0) | |
| 5433 break; | |
| 5434 indices[i] = xlfd; | |
| 5435 } | |
| 5436 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5437 if (!NILP (list) || i != DIM (indices)) |
| 24995 | 5438 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
|
5439 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
|
5440 if (indices[i] == 0) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5441 signal_error ("Invalid font sort order", order); |
| 24995 | 5442 |
| 5443 if (bcmp (indices, font_sort_order, sizeof indices) != 0) | |
| 5444 { | |
| 5445 bcopy (indices, font_sort_order, sizeof font_sort_order); | |
| 5446 free_all_realized_faces (Qnil); | |
| 5447 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5448 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5449 font_update_sort_order (font_sort_order); |
| 90414 | 5450 |
| 24995 | 5451 return Qnil; |
| 5452 } | |
| 5453 | |
| 5454 | |
| 5455 DEFUN ("internal-set-alternative-font-family-alist", | |
| 5456 Finternal_set_alternative_font_family_alist, | |
| 5457 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
|
5458 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
|
5459 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5460 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
|
5461 be found. Value is ALIST. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5462 (alist) |
| 24995 | 5463 Lisp_Object alist; |
| 5464 { | |
|
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5465 Lisp_Object entry, tail, tail2; |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5466 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5467 CHECK_LIST (alist); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5468 alist = Fcopy_sequence (alist); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5469 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
|
5470 { |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5471 entry = XCAR (tail); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5472 CHECK_LIST (entry); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5473 entry = Fcopy_sequence (entry); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5474 XSETCAR (tail, entry); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5475 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2)) |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5476 XSETCAR (tail2, Fintern (XCAR (tail2), Qnil)); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5477 } |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5478 |
| 24995 | 5479 Vface_alternative_font_family_alist = alist; |
| 5480 free_all_realized_faces (Qnil); | |
| 5481 return alist; | |
| 5482 } | |
| 5483 | |
| 5484 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5485 DEFUN ("internal-set-alternative-font-registry-alist", |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5486 Finternal_set_alternative_font_registry_alist, |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5487 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
|
5488 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
|
5489 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5490 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
|
5491 be found. Value is ALIST. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5492 (alist) |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5493 Lisp_Object alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5494 { |
|
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5495 Lisp_Object entry, tail, tail2; |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5496 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5497 CHECK_LIST (alist); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5498 alist = Fcopy_sequence (alist); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5499 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
|
5500 { |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5501 entry = XCAR (tail); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5502 CHECK_LIST (entry); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5503 entry = Fcopy_sequence (entry); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5504 XSETCAR (tail, entry); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5505 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2)) |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5506 XSETCAR (tail2, Fdowncase (XCAR (tail2))); |
|
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5507 } |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5508 Vface_alternative_font_registry_alist = alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5509 free_all_realized_faces (Qnil); |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5510 return alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5511 } |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5512 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5513 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5514 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 5515 |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5516 /* 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
|
5517 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5518 #define FONT_POINT_SIZE_QUANTUM 5 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5519 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5520 /* 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
|
5521 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
|
5522 attribute of ATTRS doesn't name a fontset. */ |
| 24995 | 5523 |
| 5524 static int | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5525 face_fontset (attrs) |
| 24995 | 5526 Lisp_Object *attrs; |
| 5527 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5528 Lisp_Object name; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5529 |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
5530 name = attrs[LFACE_FONTSET_INDEX]; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5531 if (!STRINGP (name)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5532 return -1; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5533 return fs_query_fontset (name, 0); |
| 24995 | 5534 } |
| 5535 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5536 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5537 |
| 5538 | |
| 5539 | |
| 5540 /*********************************************************************** | |
| 5541 Face Realization | |
| 5542 ***********************************************************************/ | |
| 5543 | |
| 5544 /* Realize basic faces on frame F. Value is zero if frame parameters | |
| 5545 of F don't contain enough information needed to realize the default | |
| 5546 face. */ | |
| 5547 | |
| 5548 static int | |
| 5549 realize_basic_faces (f) | |
| 2342 | 5550 struct frame *f; |
| 24995 | 5551 { |
| 5552 int success_p = 0; | |
|
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
5553 int count = SPECPDL_INDEX (); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5554 |
|
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
5555 /* 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
|
5556 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
|
5557 BLOCK_INPUT; |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5558 specbind (Qscalable_fonts_allowed, Qt); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5559 |
| 24995 | 5560 if (realize_default_face (f)) |
| 5561 { | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
5562 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
|
5563 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
|
5564 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
| 41129 | 5565 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
| 25546 | 5566 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
|
5567 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
|
5568 realize_named_face (f, Qborder, BORDER_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5569 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5570 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
|
5571 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
|
5572 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
|
5573 |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5574 /* 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
|
5575 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
|
5576 { |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5577 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
|
5578 #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
|
5579 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
|
5580 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
|
5581 #endif |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
5582 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5583 |
| 24995 | 5584 success_p = 1; |
| 5585 } | |
| 5586 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5587 unbind_to (count, Qnil); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5588 UNBLOCK_INPUT; |
| 24995 | 5589 return success_p; |
| 5590 } | |
| 5591 | |
| 5592 | |
| 5593 /* Realize the default face on frame F. If the face is not fully | |
| 5594 specified, make it fully-specified. Attributes of the default face | |
| 5595 that are not explicitly specified are taken from frame parameters. */ | |
| 5596 | |
| 5597 static int | |
| 5598 realize_default_face (f) | |
| 5599 struct frame *f; | |
| 5600 { | |
| 5601 struct face_cache *c = FRAME_FACE_CACHE (f); | |
| 5602 Lisp_Object lface; | |
| 5603 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 5604 struct face *face; | |
| 5605 | |
| 5606 /* If the `default' face is not yet known, create it. */ | |
| 5607 lface = lface_from_face_name (f, Qdefault, 0); | |
| 5608 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
|
5609 { |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5610 Lisp_Object frame; |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5611 XSETFRAME (frame, f); |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5612 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
|
5613 } |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5614 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5615 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5616 if (FRAME_WINDOW_P (f)) |
| 24995 | 5617 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5618 Lisp_Object font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5619 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5620 XSETFONT (font_object, FRAME_FONT (f)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5621 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
|
5622 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
|
5623 f->default_face_done_p = 1; |
| 24995 | 5624 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5625 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5626 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5627 if (!FRAME_WINDOW_P (f)) |
| 24995 | 5628 { |
| 5629 LFACE_FAMILY (lface) = build_string ("default"); | |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5630 LFACE_FOUNDRY (lface) = LFACE_FAMILY (lface); |
| 24995 | 5631 LFACE_SWIDTH (lface) = Qnormal; |
| 5632 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
|
5633 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
|
5634 LFACE_WEIGHT (lface) = Qnormal; |
|
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
5635 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
|
5636 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
|
5637 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
|
5638 LFACE_FONTSET (lface) = Qnil; |
| 24995 | 5639 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5640 |
| 24995 | 5641 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
| 5642 LFACE_UNDERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5643 |
| 24995 | 5644 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
| 5645 LFACE_OVERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5646 |
| 24995 | 5647 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
| 5648 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5649 |
| 24995 | 5650 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
| 5651 LFACE_BOX (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5652 |
| 24995 | 5653 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
| 5654 LFACE_INVERSE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5655 |
| 24995 | 5656 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
| 5657 { | |
| 5658 /* This function is called so early that colors are not yet | |
| 5659 set in the frame parameter list. */ | |
| 5660 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
|
5661 |
| 24995 | 5662 if (CONSP (color) && STRINGP (XCDR (color))) |
| 5663 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
|
5664 else if (FRAME_WINDOW_P (f)) |
| 24995 | 5665 return 0; |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5666 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
|
5667 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
|
5668 else |
| 24995 | 5669 abort (); |
| 5670 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5671 |
| 24995 | 5672 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
| 5673 { | |
| 5674 /* This function is called so early that colors are not yet | |
| 5675 set in the frame parameter list. */ | |
| 5676 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
| 5677 if (CONSP (color) && STRINGP (XCDR (color))) | |
| 5678 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
|
5679 else if (FRAME_WINDOW_P (f)) |
| 24995 | 5680 return 0; |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5681 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
|
5682 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
|
5683 else |
| 24995 | 5684 abort (); |
| 5685 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5686 |
| 24995 | 5687 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
| 5688 LFACE_STIPPLE (lface) = Qnil; | |
| 5689 | |
| 5690 /* Realize the face; it must be fully-specified now. */ | |
| 5691 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
| 5692 check_lface (lface); | |
| 5693 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | |
| 88907 | 5694 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
|
5695 |
|
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5696 #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
|
5697 #ifdef HAVE_X_WINDOWS |
|
83519
717426715b03
Fix stupid crash during startup.
Karoly Lorentey <lorentey@elte.hu>
parents:
83518
diff
changeset
|
5698 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
|
5699 { |
|
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5700 /* 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
|
5701 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
|
5702 if (!face->font) |
|
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5703 return 0; |
|
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
5704 |
|
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5705 /* 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
|
5706 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
|
5707 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
|
5708 font. */ |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5709 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
|
5710 } |
|
70566
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5711 #endif /* HAVE_X_WINDOWS */ |
|
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5712 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5713 return 1; |
| 5714 } | |
| 5715 | |
| 5716 | |
| 5717 /* Realize basic faces other than the default face in face cache C. | |
| 5718 SYMBOL is the face name, ID is the face id the realized face must | |
| 5719 have. The default face must have been realized already. */ | |
| 5720 | |
| 5721 static void | |
| 5722 realize_named_face (f, symbol, id) | |
| 5723 struct frame *f; | |
| 5724 Lisp_Object symbol; | |
| 5725 int id; | |
| 5726 { | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5727 struct face_cache *c = FRAME_FACE_CACHE (f); |
| 24995 | 5728 Lisp_Object lface = lface_from_face_name (f, symbol, 0); |
| 5729 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
|
5730 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
|
5731 struct face *new_face; |
| 24995 | 5732 |
| 5733 /* 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
|
5734 get_lface_attributes_no_remap (f, Qdefault, attrs, 1); |
| 24995 | 5735 check_lface_attrs (attrs); |
| 5736 xassert (lface_fully_specified_p (attrs)); | |
| 5737 | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5738 /* If SYMBOL isn't know as a face, create it. */ |
| 24995 | 5739 if (NILP (lface)) |
| 5740 { | |
| 5741 Lisp_Object frame; | |
| 5742 XSETFRAME (frame, f); | |
| 5743 lface = Finternal_make_lisp_face (symbol, frame); | |
| 5744 } | |
| 5745 | |
| 5746 /* Merge SYMBOL's face with the default face. */ | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
5747 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
|
5748 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
|
5749 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5750 /* 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
|
5751 new_face = realize_face (c, attrs, id); |
| 24995 | 5752 } |
| 5753 | |
| 5754 | |
| 5755 /* Realize the fully-specified face with attributes ATTRS in face | |
| 88907 | 5756 cache CACHE for ASCII characters. If FORMER_FACE_ID is |
| 5757 non-negative, it is an ID of face to remove before caching the new | |
| 5758 face. Value is a pointer to the newly created realized face. */ | |
| 24995 | 5759 |
| 5760 static struct face * | |
| 88907 | 5761 realize_face (cache, attrs, former_face_id) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5762 struct face_cache *cache; |
| 24995 | 5763 Lisp_Object *attrs; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5764 int former_face_id; |
| 24995 | 5765 { |
| 5766 struct face *face; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5767 |
| 24995 | 5768 /* LFACE must be fully specified. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5769 xassert (cache != NULL); |
| 24995 | 5770 check_lface_attrs (attrs); |
| 5771 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5772 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
|
5773 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5774 /* Remove the former face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5775 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
|
5776 uncache_face (cache, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5777 free_realized_face (cache->f, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5778 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5779 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5780 if (FRAME_WINDOW_P (cache->f)) |
| 88907 | 5781 face = realize_x_face (cache, attrs); |
| 35443 | 5782 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) |
| 88907 | 5783 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
|
5784 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
|
5785 { |
|
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5786 /* Create a dummy face. */ |
|
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5787 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
|
5788 } |
| 24995 | 5789 else |
| 5790 abort (); | |
| 5791 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5792 /* Insert the new face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5793 cache_face (cache, face, lface_hash (attrs)); |
| 88907 | 5794 return face; |
| 5795 } | |
| 5796 | |
| 5797 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5798 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5799 /* 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
|
5800 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
|
5801 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
|
5802 no-font. */ |
| 88907 | 5803 |
| 5804 static struct face * | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5805 realize_non_ascii_face (f, font_object, base_face) |
| 88907 | 5806 struct frame *f; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5807 Lisp_Object font_object; |
| 88907 | 5808 struct face *base_face; |
| 5809 { | |
| 5810 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
| 89483 | 5811 struct face *face; |
| 88907 | 5812 |
| 5813 face = (struct face *) xmalloc (sizeof *face); | |
| 5814 *face = *base_face; | |
| 5815 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
|
5816 face->extra = NULL; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5817 face->overstrike |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5818 = (! NILP (font_object) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5819 && 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
|
5820 && FONT_WEIGHT_NUMERIC (font_object) <= 100); |
| 88907 | 5821 |
| 5822 /* Don't try to free the colors copied bitwise from BASE_FACE. */ | |
| 5823 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
|
5824 face->font = NILP (font_object) ? NULL : XFONT_OBJECT (font_object); |
| 88907 | 5825 face->gc = 0; |
| 5826 | |
| 5827 cache_face (cache, face, face->hash); | |
| 5828 | |
| 24995 | 5829 return face; |
| 5830 } | |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
5831 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5832 |
| 5833 | |
| 5834 /* Realize the fully-specified face with attributes ATTRS in face | |
| 88907 | 5835 cache CACHE for ASCII characters. Do it for X frame CACHE->f. If |
| 5836 the new face doesn't share font with the default face, a fontname | |
| 5837 is allocated from the heap and set in `font_name' of the new face, | |
| 5838 but it is not yet loaded here. Value is a pointer to the newly | |
| 5839 created realized face. */ | |
| 24995 | 5840 |
| 5841 static struct face * | |
| 88907 | 5842 realize_x_face (cache, attrs) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5843 struct face_cache *cache; |
| 24995 | 5844 Lisp_Object *attrs; |
| 5845 { | |
|
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5846 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
|
5847 #ifdef HAVE_WINDOW_SYSTEM |
|
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5848 struct face *default_face; |
|
26875
d6aa11f2a4af
(choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents:
26759
diff
changeset
|
5849 struct frame *f; |
| 24995 | 5850 Lisp_Object stipple, overline, strike_through, box; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5851 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5852 xassert (FRAME_WINDOW_P (cache->f)); |
| 24995 | 5853 |
| 5854 /* Allocate a new realized face. */ | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5855 face = make_realized_face (attrs); |
| 88907 | 5856 face->ascii_face = face; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5857 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5858 f = cache->f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5859 |
| 24995 | 5860 /* Determine the font to use. Most of the time, the font will be |
| 5861 the same as the font of the default face, so try that first. */ | |
| 5862 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 5863 if (default_face | |
| 5864 && lface_same_font_attributes_p (default_face->lface, attrs)) | |
| 5865 { | |
| 5866 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
|
5867 face->fontset |
|
4170d7f0d918
(realize_x_face): If the font-related face attributes
Kenichi Handa <handa@m17n.org>
parents:
95471
diff
changeset
|
5868 = make_fontset_for_ascii_face (f, default_face->fontset, face); |
| 24995 | 5869 } |
| 5870 else | |
| 5871 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5872 /* 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
|
5873 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
|
5874 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
|
5875 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
|
5876 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
|
5877 are constructed from ATTRS. */ |
|
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
5878 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
|
5879 |
| 88907 | 5880 /* If we are realizing the default face, ATTRS should specify a |
| 5881 fontset. In other words, if FONTSET is -1, we are not | |
| 5882 realizing the default face, thus the default face should have | |
| 5883 already been realized. */ | |
| 5884 if (fontset == -1) | |
|
100102
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5885 { |
|
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5886 if (default_face) |
|
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5887 fontset = default_face->fontset; |
|
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5888 if (fontset == -1) |
|
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5889 abort (); |
|
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5890 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5891 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
|
5892 attrs[LFACE_FONT_INDEX] |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5893 = 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
|
5894 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
|
5895 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5896 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
|
5897 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
|
5898 } |
| 90414 | 5899 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5900 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5901 face->font = NULL; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5902 face->fontset = -1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5903 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5904 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5905 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5906 if (face->font |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5907 && 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
|
5908 && 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
|
5909 face->overstrike = 1; |
| 24995 | 5910 |
| 5911 /* Load colors, and set remaining attributes. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5912 |
| 24995 | 5913 load_face_colors (f, face, attrs); |
| 5914 | |
| 5915 /* Set up box. */ | |
| 5916 box = attrs[LFACE_BOX_INDEX]; | |
| 5917 if (STRINGP (box)) | |
| 5918 { | |
| 5919 /* A simple box of line width 1 drawn in color given by | |
| 5920 the string. */ | |
| 5921 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX], | |
| 5922 LFACE_BOX_INDEX); | |
| 5923 face->box = FACE_SIMPLE_BOX; | |
| 5924 face->box_line_width = 1; | |
| 5925 } | |
| 5926 else if (INTEGERP (box)) | |
| 5927 { | |
| 5928 /* Simple box of specified line width in foreground color of the | |
| 5929 face. */ | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5930 xassert (XINT (box) != 0); |
| 24995 | 5931 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
|
5932 face->box_line_width = XINT (box); |
| 24995 | 5933 face->box_color = face->foreground; |
| 5934 face->box_color_defaulted_p = 1; | |
| 5935 } | |
| 5936 else if (CONSP (box)) | |
| 5937 { | |
| 5938 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW | |
| 5939 being one of `raised' or `sunken'. */ | |
| 5940 face->box = FACE_SIMPLE_BOX; | |
| 5941 face->box_color = face->foreground; | |
| 5942 face->box_color_defaulted_p = 1; | |
| 5943 face->box_line_width = 1; | |
| 5944 | |
| 5945 while (CONSP (box)) | |
| 5946 { | |
| 5947 Lisp_Object keyword, value; | |
| 5948 | |
| 5949 keyword = XCAR (box); | |
| 5950 box = XCDR (box); | |
| 5951 | |
| 5952 if (!CONSP (box)) | |
| 5953 break; | |
| 5954 value = XCAR (box); | |
| 5955 box = XCDR (box); | |
| 5956 | |
| 5957 if (EQ (keyword, QCline_width)) | |
| 5958 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5959 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
|
5960 face->box_line_width = XINT (value); |
| 24995 | 5961 } |
| 5962 else if (EQ (keyword, QCcolor)) | |
| 5963 { | |
| 5964 if (STRINGP (value)) | |
| 5965 { | |
| 5966 face->box_color = load_color (f, face, value, | |
| 5967 LFACE_BOX_INDEX); | |
| 5968 face->use_box_color_for_shadows_p = 1; | |
| 5969 } | |
| 5970 } | |
| 5971 else if (EQ (keyword, QCstyle)) | |
| 5972 { | |
| 5973 if (EQ (value, Qreleased_button)) | |
| 5974 face->box = FACE_RAISED_BOX; | |
| 5975 else if (EQ (value, Qpressed_button)) | |
| 5976 face->box = FACE_SUNKEN_BOX; | |
| 5977 } | |
| 5978 } | |
| 5979 } | |
| 5980 | |
| 5981 /* Text underline, overline, strike-through. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5982 |
| 24995 | 5983 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt)) |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5984 { |
| 24995 | 5985 /* Use default color (same as foreground color). */ |
| 5986 face->underline_p = 1; | |
| 5987 face->underline_defaulted_p = 1; | |
| 5988 face->underline_color = 0; | |
| 5989 } | |
| 5990 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 5991 { | |
| 5992 /* Use specified color. */ | |
| 5993 face->underline_p = 1; | |
| 5994 face->underline_defaulted_p = 0; | |
| 5995 face->underline_color | |
| 5996 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX], | |
| 5997 LFACE_UNDERLINE_INDEX); | |
| 5998 } | |
| 5999 else if (NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 6000 { | |
| 6001 face->underline_p = 0; | |
| 6002 face->underline_defaulted_p = 0; | |
| 6003 face->underline_color = 0; | |
| 6004 } | |
| 6005 | |
| 6006 overline = attrs[LFACE_OVERLINE_INDEX]; | |
| 6007 if (STRINGP (overline)) | |
| 6008 { | |
| 6009 face->overline_color | |
| 6010 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX], | |
| 6011 LFACE_OVERLINE_INDEX); | |
| 6012 face->overline_p = 1; | |
| 6013 } | |
| 6014 else if (EQ (overline, Qt)) | |
| 6015 { | |
| 6016 face->overline_color = face->foreground; | |
| 6017 face->overline_color_defaulted_p = 1; | |
| 6018 face->overline_p = 1; | |
| 6019 } | |
| 6020 | |
| 6021 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX]; | |
| 6022 if (STRINGP (strike_through)) | |
| 6023 { | |
| 6024 face->strike_through_color | |
| 6025 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX], | |
| 6026 LFACE_STRIKE_THROUGH_INDEX); | |
| 6027 face->strike_through_p = 1; | |
| 6028 } | |
| 6029 else if (EQ (strike_through, Qt)) | |
| 6030 { | |
| 6031 face->strike_through_color = face->foreground; | |
| 6032 face->strike_through_color_defaulted_p = 1; | |
| 6033 face->strike_through_p = 1; | |
| 6034 } | |
| 6035 | |
| 6036 stipple = attrs[LFACE_STIPPLE_INDEX]; | |
| 6037 if (!NILP (stipple)) | |
| 6038 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
|
6039 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 6040 |
| 6041 return face; | |
| 6042 } | |
| 6043 | |
| 6044 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6045 /* 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
|
6046 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
|
6047 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
|
6048 default foreground/background colors. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6049 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6050 static void |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6051 map_tty_color (f, face, idx, defaulted) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6052 struct frame *f; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6053 struct face *face; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6054 enum lface_attribute_index idx; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6055 int *defaulted; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6056 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6057 Lisp_Object frame, color, def; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6058 int foreground_p = idx == LFACE_FOREGROUND_INDEX; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6059 unsigned long default_pixel, default_other_pixel, pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6060 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6061 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
|
6062 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6063 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6064 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6065 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6066 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6067 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6068 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6069 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6070 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6071 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6072 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6073 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6074 XSETFRAME (frame, f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6075 color = face->lface[idx]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6076 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6077 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
|
6078 && SCHARS (color) |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6079 && CONSP (Vtty_defined_color_alist) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6080 && (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
|
6081 CONSP (def))) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6082 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6083 /* 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
|
6084 (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
|
6085 pixel = XINT (XCAR (XCDR (def))); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6086 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6087 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6088 if (pixel == default_pixel && STRINGP (color)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6089 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6090 pixel = load_color (f, face, color, idx); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6091 |
|
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6092 #ifdef MSDOS |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6093 /* 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
|
6094 use the foreground color defined by the frame. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6095 if (FRAME_MSDOS_P (f)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6096 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6097 if (pixel == default_pixel |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6098 || pixel == FACE_TTY_DEFAULT_COLOR) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6099 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6100 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6101 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6102 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6103 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6104 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6105 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6106 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6107 else if (pixel == default_other_pixel) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6108 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6109 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6110 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6111 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6112 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6113 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6114 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6115 } |
|
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6116 } |
|
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6117 #endif /* MSDOS */ |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6118 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6119 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6120 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6121 face->foreground = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6122 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6123 face->background = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6124 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6125 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6126 |
| 24995 | 6127 /* Realize the fully-specified face with attributes ATTRS in face |
| 88907 | 6128 cache CACHE for ASCII characters. Do it for TTY frame CACHE->f. |
| 6129 Value is a pointer to the newly created realized face. */ | |
| 24995 | 6130 |
| 6131 static struct face * | |
| 88907 | 6132 realize_tty_face (cache, attrs) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6133 struct face_cache *cache; |
| 24995 | 6134 Lisp_Object *attrs; |
| 6135 { | |
| 6136 struct face *face; | |
| 6137 int weight, slant; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6138 int face_colors_defaulted = 0; |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6139 struct frame *f = cache->f; |
| 24995 | 6140 |
| 6141 /* Frame must be a termcap frame. */ | |
| 35443 | 6142 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
|
6143 |
| 24995 | 6144 /* Allocate a new realized face. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6145 face = make_realized_face (attrs); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6146 #if 0 |
| 35443 | 6147 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
|
6148 #endif |
| 24995 | 6149 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6150 /* Map face attributes to TTY appearances. We map slant to |
| 24995 | 6151 dimmed text because we want italic text to appear differently |
| 6152 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
|
6153 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
|
6154 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
|
6155 if (weight > 100) |
| 24995 | 6156 face->tty_bold_p = 1; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6157 if (weight < 100 || slant != 100) |
| 24995 | 6158 face->tty_dim_p = 1; |
| 6159 if (!NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 6160 face->tty_underline_p = 1; | |
| 6161 if (!NILP (attrs[LFACE_INVERSE_INDEX])) | |
| 6162 face->tty_reverse_p = 1; | |
| 6163 | |
| 6164 /* Map color names to color indices. */ | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6165 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
|
6166 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
|
6167 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6168 /* 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
|
6169 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
|
6170 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
|
6171 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
|
6172 { |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6173 unsigned long tem = face->foreground; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6174 face->foreground = face->background; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6175 face->background = tem; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6176 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6177 |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6178 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
|
6179 && face->tty_bold_p |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6180 && 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
|
6181 && 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
|
6182 face->tty_bold_p = 0; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6183 |
| 24995 | 6184 return face; |
| 6185 } | |
| 6186 | |
| 6187 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6188 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
|
6189 Ftty_suppress_bold_inverse_default_colors, |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6190 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
|
6191 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
|
6192 SUPPRESS non-nil means suppress it. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6193 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
|
6194 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
|
6195 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
|
6196 is non-nil. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6197 (suppress) |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6198 Lisp_Object suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6199 { |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6200 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
|
6201 ++face_change_count; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6202 return suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6203 } |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6204 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6205 |
| 24995 | 6206 |
| 6207 /*********************************************************************** | |
| 6208 Computing Faces | |
| 6209 ***********************************************************************/ | |
| 6210 | |
| 6211 /* Return the ID of the face to use to display character CH with face | |
| 6212 property PROP on frame F in current_buffer. */ | |
| 6213 | |
| 6214 int | |
| 6215 compute_char_face (f, ch, prop) | |
| 6216 struct frame *f; | |
| 6217 int ch; | |
| 6218 Lisp_Object prop; | |
| 6219 { | |
| 6220 int face_id; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6221 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6222 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
|
6223 ch = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6224 |
| 24995 | 6225 if (NILP (prop)) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6226 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6227 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
|
6228 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
|
6229 } |
| 24995 | 6230 else |
| 6231 { | |
| 6232 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6233 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 6234 bcopy (default_face->lface, attrs, sizeof attrs); | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
6235 merge_face_ref (f, prop, attrs, 1, 0); |
| 88907 | 6236 face_id = lookup_face (f, attrs); |
| 24995 | 6237 } |
| 6238 | |
| 6239 return face_id; | |
| 6240 } | |
| 6241 | |
| 6242 /* Return the face ID associated with buffer position POS for | |
| 6243 displaying ASCII characters. Return in *ENDPTR the position at | |
| 6244 which a different face is needed, as far as text properties and | |
| 6245 overlays are concerned. W is a window displaying current_buffer. | |
| 6246 | |
| 6247 REGION_BEG, REGION_END delimit the region, so it can be | |
| 6248 highlighted. | |
| 6249 | |
| 6250 LIMIT is a position not to scan beyond. That is to limit the time | |
| 6251 this function can take. | |
| 6252 | |
| 6253 If MOUSE is non-zero, use the character's mouse-face, not its face. | |
| 6254 | |
|
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6255 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
|
6256 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
|
6257 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6258 The face returned is suitable for displaying ASCII characters. */ |
| 24995 | 6259 |
| 6260 int | |
| 6261 face_at_buffer_position (w, pos, region_beg, region_end, | |
|
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6262 endptr, limit, mouse, base_face_id) |
| 2391 | 6263 struct window *w; |
|
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6264 EMACS_INT pos; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6265 EMACS_INT region_beg, region_end; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6266 EMACS_INT *endptr; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6267 EMACS_INT limit; |
|
6615
96ddf85642d1
(compute_char_face): New arg MOUSE.
Richard M. Stallman <rms@gnu.org>
parents:
5858
diff
changeset
|
6268 int mouse; |
|
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6269 int base_face_id; |
| 2342 | 6270 { |
| 24995 | 6271 struct frame *f = XFRAME (w->frame); |
| 6272 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
|
6273 Lisp_Object prop, position; |
| 24995 | 6274 int i, noverlays; |
| 2342 | 6275 Lisp_Object *overlay_vec; |
| 2391 | 6276 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
|
6277 EMACS_INT endpos; |
| 24995 | 6278 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
| 6279 Lisp_Object limit1, end; | |
| 6280 struct face *default_face; | |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6281 |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6282 /* 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
|
6283 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
|
6284 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
| 2391 | 6285 |
|
9284
a969e0eefaf5
(compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9186
diff
changeset
|
6286 XSETFRAME (frame, f); |
| 24995 | 6287 XSETFASTINT (position, pos); |
| 2342 | 6288 |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6289 endpos = ZV; |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6290 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
|
6291 endpos = region_beg; |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6292 |
| 24995 | 6293 /* Get the `face' or `mouse_face' text property at POS, and |
| 6294 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
|
6295 prop = Fget_text_property (position, propname, w->buffer); |
| 24995 | 6296 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
| 6297 end = Fnext_single_property_change (position, propname, w->buffer, limit1); | |
| 6298 if (INTEGERP (end)) | |
| 6299 endpos = XINT (end); | |
| 6300 | |
| 6301 /* 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
|
6302 { |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
6303 EMACS_INT next_overlay; |
|
55654
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6304 |
|
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6305 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
|
6306 if (next_overlay < endpos) |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6307 endpos = next_overlay; |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6308 } |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6309 |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6310 *endptr = endpos; |
| 2342 | 6311 |
|
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6312 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
|
6313 : 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
|
6314 : lookup_basic_face (f, DEFAULT_FACE_ID)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6315 |
| 24995 | 6316 /* Optimize common cases where we can use the default face. */ |
| 6317 if (noverlays == 0 | |
| 6318 && NILP (prop) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6319 && !(pos >= region_beg && pos < region_end)) |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6320 return default_face->id; |
| 24995 | 6321 |
| 6322 /* Begin with attributes from the default face. */ | |
| 6323 bcopy (default_face->lface, attrs, sizeof attrs); | |
| 6324 | |
| 6325 /* Merge in attributes specified via text properties. */ | |
| 6326 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
|
6327 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 6328 |
| 6329 /* 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
|
6330 noverlays = sort_overlays (overlay_vec, noverlays, w); |
| 2342 | 6331 for (i = 0; i < noverlays; i++) |
| 6332 { | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6333 Lisp_Object oend; |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6334 int oendpos; |
|
9186
45bac5feb065
(compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents:
9184
diff
changeset
|
6335 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6336 prop = Foverlay_get (overlay_vec[i], propname); |
| 24995 | 6337 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
|
6338 merge_face_ref (f, prop, attrs, 1, 0); |
| 2342 | 6339 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6340 oend = OVERLAY_END (overlay_vec[i]); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6341 oendpos = OVERLAY_POSITION (oend); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6342 if (oendpos < endpos) |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6343 endpos = oendpos; |
| 2342 | 6344 } |
| 6345 | |
| 24995 | 6346 /* 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
|
6347 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
|
6348 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
6349 merge_named_face (f, Qregion, attrs, 0); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6350 |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6351 if (region_end < endpos) |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6352 endpos = region_end; |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6353 } |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6354 |
| 2342 | 6355 *endptr = endpos; |
| 6356 | |
| 24995 | 6357 /* 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
|
6358 or realize a new one for ASCII characters. */ |
| 88907 | 6359 return lookup_face (f, attrs); |
| 2342 | 6360 } |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6361 |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6362 /* 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
|
6363 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
|
6364 |
|
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6365 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
|
6366 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
|
6367 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6368 int |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6369 face_for_overlay_string (w, pos, region_beg, region_end, |
|
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6370 endptr, limit, mouse, overlay) |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6371 struct window *w; |
|
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6372 EMACS_INT pos; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6373 EMACS_INT region_beg, region_end; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6374 EMACS_INT *endptr; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6375 EMACS_INT limit; |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6376 int mouse; |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6377 Lisp_Object overlay; |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6378 { |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6379 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
|
6380 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
|
6381 Lisp_Object prop, position; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6382 Lisp_Object frame; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6383 int endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6384 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
|
6385 Lisp_Object limit1, end; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6386 struct face *default_face; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6387 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6388 /* 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
|
6389 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
|
6390 /* 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
|
6391 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6392 XSETFRAME (frame, f); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6393 XSETFASTINT (position, pos); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6394 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6395 endpos = ZV; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6396 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
|
6397 endpos = region_beg; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6398 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6399 /* 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
|
6400 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
|
6401 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
|
6402 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
|
6403 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
|
6404 if (INTEGERP (end)) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6405 endpos = XINT (end); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6406 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6407 *endptr = endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6408 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6409 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
|
6410 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6411 /* 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
|
6412 if (NILP (prop) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6413 && !(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
|
6414 return DEFAULT_FACE_ID; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6415 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6416 /* Begin with attributes from the default face. */ |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6417 bcopy (default_face->lface, attrs, sizeof attrs); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6418 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6419 /* 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
|
6420 if (!NILP (prop)) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6421 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
|
6422 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6423 /* 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
|
6424 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
|
6425 { |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6426 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
|
6427 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6428 if (region_end < endpos) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6429 endpos = region_end; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6430 } |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6431 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6432 *endptr = endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6433 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6434 /* 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
|
6435 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
|
6436 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
|
6437 } |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6438 |
| 24995 | 6439 |
| 6440 /* 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
|
6441 window W, for ASCII characters. |
| 24995 | 6442 |
| 6443 If STRING is an overlay string, it comes from position BUFPOS in | |
| 6444 current_buffer, otherwise BUFPOS is zero to indicate that STRING is | |
| 6445 not an overlay string. W must display the current buffer. | |
| 6446 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
|
6447 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
|
6448 |
|
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
6449 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
|
6450 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
|
6451 |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6452 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
|
6453 |
| 24995 | 6454 Set *ENDPTR to the next position where to check for faces in |
| 6455 STRING; -1 if the face is constant from POS to the end of the | |
| 6456 string. | |
| 6457 | |
| 6458 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
|
6459 for displaying ASCII characters. */ |
| 24995 | 6460 |
| 6461 int | |
| 6462 face_at_string_position (w, string, pos, bufpos, region_beg, | |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6463 region_end, endptr, base_face_id, mouse_p) |
| 24995 | 6464 struct window *w; |
| 6465 Lisp_Object string; | |
|
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6466 EMACS_INT pos, bufpos; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6467 EMACS_INT region_beg, region_end; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6468 EMACS_INT *endptr; |
| 24995 | 6469 enum face_id base_face_id; |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6470 int mouse_p; |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6471 { |
| 24995 | 6472 Lisp_Object prop, position, end, limit; |
| 6473 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
| 6474 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6475 struct face *base_face; | |
| 6476 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
|
6477 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface; |
| 24995 | 6478 |
| 6479 /* Get the value of the face property at the current position within | |
| 6480 STRING. Value is nil if there is no face property. */ | |
| 6481 XSETFASTINT (position, pos); | |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6482 prop = Fget_text_property (position, prop_name, string); |
| 24995 | 6483 |
| 6484 /* Get the next position at which to check for faces. Value of end | |
| 6485 is nil if face is constant all the way to the end of the string. | |
| 6486 Otherwise it is a string position where to check faces next. | |
| 6487 Limit is the maximum position up to which to check for property | |
| 6488 changes in Fnext_single_property_change. Strings are usually | |
| 6489 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
|
6490 XSETFASTINT (limit, SCHARS (string)); |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6491 end = Fnext_single_property_change (position, prop_name, string, limit); |
| 24995 | 6492 if (INTEGERP (end)) |
| 6493 *endptr = XFASTINT (end); | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6494 else |
| 24995 | 6495 *endptr = -1; |
| 6496 | |
| 6497 base_face = FACE_FROM_ID (f, base_face_id); | |
| 6498 xassert (base_face); | |
| 6499 | |
| 6500 /* Optimize the default case that there is no face property and we | |
| 6501 are not in the region. */ | |
| 6502 if (NILP (prop) | |
| 6503 && (base_face_id != DEFAULT_FACE_ID | |
| 6504 /* BUFPOS <= 0 means STRING is not an overlay string, so | |
| 6505 that the region doesn't have to be taken into account. */ | |
| 6506 || bufpos <= 0 | |
| 6507 || bufpos < region_beg | |
| 6508 || bufpos >= region_end) | |
| 6509 && (multibyte_p | |
| 6510 /* We can't realize faces for different charsets differently | |
| 6511 if we don't have fonts, so we can stop here if not working | |
| 6512 on a window-system frame. */ | |
| 6513 || !FRAME_WINDOW_P (f) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6514 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0))) |
| 24995 | 6515 return base_face->id; |
| 6516 | |
| 6517 /* Begin with attributes from the base face. */ | |
| 6518 bcopy (base_face->lface, attrs, sizeof attrs); | |
| 6519 | |
| 6520 /* Merge in attributes specified via text properties. */ | |
| 6521 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
|
6522 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 6523 |
| 6524 /* If in the region, merge in the region face. */ | |
| 6525 if (bufpos | |
| 6526 && bufpos >= region_beg | |
| 6527 && 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
|
6528 merge_named_face (f, Qregion, attrs, 0); |
| 24995 | 6529 |
| 6530 /* 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
|
6531 or realize a new one for ASCII characters. */ |
| 88907 | 6532 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
|
6533 } |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6534 |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6535 |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6536 /* 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
|
6537 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6538 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
|
6539 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6540 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
|
6541 |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6542 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
|
6543 |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6544 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
|
6545 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6546 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
|
6547 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6548 Return new face id. |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6549 */ |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6550 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6551 int |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6552 merge_faces (f, face_name, face_id, base_face_id) |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6553 struct frame *f; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6554 Lisp_Object face_name; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6555 int face_id, base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6556 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6557 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
|
6558 struct face *base_face; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6559 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6560 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
|
6561 if (!base_face) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6562 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6563 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6564 if (EQ (face_name, Qt)) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6565 { |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6566 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
|
6567 return base_face_id; |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6568 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
|
6569 /* 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
|
6570 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
|
6571 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
|
6572 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
|
6573 } |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6574 |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6575 /* Begin with attributes from the base face. */ |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6576 bcopy (base_face->lface, attrs, sizeof attrs); |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6577 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6578 if (!NILP (face_name)) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6579 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6580 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
|
6581 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6582 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6583 else |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6584 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6585 struct face *face; |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6586 if (face_id < 0) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6587 return base_face_id; |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6588 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
|
6589 if (!face) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6590 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6591 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
|
6592 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6593 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6594 /* 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
|
6595 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
|
6596 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
|
6597 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6598 |
| 2336 | 6599 |
|
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
|
6600 |
|
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
|
6601 #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
|
6602 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
|
6603 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
|
6604 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
|
6605 |
|
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
|
6606 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
|
6607 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
|
6608 where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6609 (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
|
6610 Lisp_Object filename; |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6611 { |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6612 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
|
6613 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
|
6614 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
|
6615 |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6616 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
|
6617 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
|
6618 |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6619 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
|
6620 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
|
6621 { |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6622 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
|
6623 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
|
6624 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
|
6625 |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6626 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
|
6627 |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6628 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
|
6629 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
|
6630 { |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6631 char *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
|
6632 num = strlen (name) - 1; |
|
103359
eb941fcd33b4
x-load-color-file: avoid array bounds error
Jim Meyering <jim@meyering.net>
parents:
103228
diff
changeset
|
6633 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
|
6634 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
|
6635 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
|
6636 #ifdef WINDOWSNT |
|
f0079131098b
* xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents:
97200
diff
changeset
|
6637 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
|
6638 #else |
|
97217
f0079131098b
* xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents:
97200
diff
changeset
|
6639 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
|
6640 #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
|
6641 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
|
6642 } |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6643 } |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6644 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
|
6645 |
|
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
|
6646 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
|
6647 } |
|
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
|
6648 |
|
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
|
6649 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
|
6650 } |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6651 #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
|
6652 |
|
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6653 |
| 24995 | 6654 /*********************************************************************** |
| 6655 Tests | |
| 6656 ***********************************************************************/ | |
| 6657 | |
| 6658 #if GLYPH_DEBUG | |
| 6659 | |
| 6660 /* Print the contents of the realized face FACE to stderr. */ | |
| 6661 | |
| 6662 static void | |
| 6663 dump_realized_face (face) | |
| 6664 struct face *face; | |
| 2336 | 6665 { |
| 24995 | 6666 fprintf (stderr, "ID: %d\n", face->id); |
| 6667 #ifdef HAVE_X_WINDOWS | |
|
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
6668 fprintf (stderr, "gc: %ld\n", (long) face->gc); |
| 24995 | 6669 #endif |
| 6670 fprintf (stderr, "foreground: 0x%lx (%s)\n", | |
| 6671 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
|
6672 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
| 24995 | 6673 fprintf (stderr, "background: 0x%lx (%s)\n", |
| 6674 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
|
6675 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
|
6676 if (face->font) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6677 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
|
6678 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
|
6679 SDATA (face->lface[LFACE_FAMILY_INDEX])); |
| 24995 | 6680 #ifdef HAVE_X_WINDOWS |
| 6681 fprintf (stderr, "font = %p\n", face->font); | |
| 6682 #endif | |
| 6683 fprintf (stderr, "fontset: %d\n", face->fontset); | |
| 6684 fprintf (stderr, "underline: %d (%s)\n", | |
| 6685 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
|
6686 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))); |
| 24995 | 6687 fprintf (stderr, "hash: %d\n", face->hash); |
| 6688 } | |
| 6689 | |
| 6690 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6691 DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6692 (n) |
| 24995 | 6693 Lisp_Object n; |
| 6694 { | |
| 6695 if (NILP (n)) | |
| 2336 | 6696 { |
| 24995 | 6697 int i; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6698 |
| 24995 | 6699 fprintf (stderr, "font selection order: "); |
| 6700 for (i = 0; i < DIM (font_sort_order); ++i) | |
| 6701 fprintf (stderr, "%d ", font_sort_order[i]); | |
| 6702 fprintf (stderr, "\n"); | |
| 6703 | |
| 6704 fprintf (stderr, "alternative fonts: "); | |
| 6705 debug_print (Vface_alternative_font_family_alist); | |
| 6706 fprintf (stderr, "\n"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6707 |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6708 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i) |
| 24995 | 6709 Fdump_face (make_number (i)); |
| 2336 | 6710 } |
| 24995 | 6711 else |
| 6712 { | |
| 6713 struct face *face; | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6714 CHECK_NUMBER (n); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6715 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n)); |
| 24995 | 6716 if (face == NULL) |
| 6717 error ("Not a valid face"); | |
| 6718 dump_realized_face (face); | |
| 6719 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6720 |
| 2336 | 6721 return Qnil; |
| 6722 } | |
| 6723 | |
| 6724 | |
| 24995 | 6725 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
|
6726 0, 0, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6727 () |
| 2336 | 6728 { |
| 24995 | 6729 fprintf (stderr, "number of colors = %d\n", ncolors_allocated); |
| 6730 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated); | |
| 6731 fprintf (stderr, "number of GCs = %d\n", ngcs); | |
| 2336 | 6732 return Qnil; |
| 6733 } | |
| 24995 | 6734 |
| 6735 #endif /* GLYPH_DEBUG != 0 */ | |
| 6736 | |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6737 |
|
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6738 |
| 24995 | 6739 /*********************************************************************** |
| 6740 Initialization | |
| 6741 ***********************************************************************/ | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
6742 |
| 2336 | 6743 void |
| 2391 | 6744 syms_of_xfaces () |
| 2336 | 6745 { |
| 2391 | 6746 Qface = intern ("face"); |
| 6747 staticpro (&Qface); | |
| 57107 | 6748 Qface_no_inherit = intern ("face-no-inherit"); |
| 6749 staticpro (&Qface_no_inherit); | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6750 Qbitmap_spec_p = intern ("bitmap-spec-p"); |
|
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6751 staticpro (&Qbitmap_spec_p); |
|
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
6752 Qframe_set_background_mode = intern ("frame-set-background-mode"); |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
6753 staticpro (&Qframe_set_background_mode); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6754 |
| 24995 | 6755 /* Lisp face attribute keywords. */ |
| 6756 QCfamily = intern (":family"); | |
| 6757 staticpro (&QCfamily); | |
| 6758 QCheight = intern (":height"); | |
| 6759 staticpro (&QCheight); | |
| 6760 QCweight = intern (":weight"); | |
| 6761 staticpro (&QCweight); | |
| 6762 QCslant = intern (":slant"); | |
| 6763 staticpro (&QCslant); | |
| 6764 QCunderline = intern (":underline"); | |
| 6765 staticpro (&QCunderline); | |
| 6766 QCinverse_video = intern (":inverse-video"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6767 staticpro (&QCinverse_video); |
| 24995 | 6768 QCreverse_video = intern (":reverse-video"); |
| 6769 staticpro (&QCreverse_video); | |
| 6770 QCforeground = intern (":foreground"); | |
| 6771 staticpro (&QCforeground); | |
| 6772 QCbackground = intern (":background"); | |
| 6773 staticpro (&QCbackground); | |
|
77903
9a64509cb354
(syms_of_xfaces): Delete stray semicolon.
Chong Yidong <cyd@stupidchicken.com>
parents:
75885
diff
changeset
|
6774 QCstipple = intern (":stipple"); |
| 24995 | 6775 staticpro (&QCstipple); |
| 6776 QCwidth = intern (":width"); | |
| 6777 staticpro (&QCwidth); | |
| 6778 QCfont = intern (":font"); | |
| 6779 staticpro (&QCfont); | |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6780 QCfontset = intern (":fontset"); |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6781 staticpro (&QCfontset); |
| 24995 | 6782 QCbold = intern (":bold"); |
| 6783 staticpro (&QCbold); | |
| 6784 QCitalic = intern (":italic"); | |
| 6785 staticpro (&QCitalic); | |
| 6786 QCoverline = intern (":overline"); | |
| 6787 staticpro (&QCoverline); | |
| 6788 QCstrike_through = intern (":strike-through"); | |
| 6789 staticpro (&QCstrike_through); | |
| 6790 QCbox = intern (":box"); | |
| 6791 staticpro (&QCbox); | |
| 31178 | 6792 QCinherit = intern (":inherit"); |
| 6793 staticpro (&QCinherit); | |
| 24995 | 6794 |
| 6795 /* Symbols used for Lisp face attribute values. */ | |
| 6796 QCcolor = intern (":color"); | |
| 6797 staticpro (&QCcolor); | |
| 6798 QCline_width = intern (":line-width"); | |
| 6799 staticpro (&QCline_width); | |
| 6800 QCstyle = intern (":style"); | |
| 6801 staticpro (&QCstyle); | |
| 6802 Qreleased_button = intern ("released-button"); | |
| 6803 staticpro (&Qreleased_button); | |
| 6804 Qpressed_button = intern ("pressed-button"); | |
| 6805 staticpro (&Qpressed_button); | |
| 6806 Qnormal = intern ("normal"); | |
| 6807 staticpro (&Qnormal); | |
| 6808 Qultra_light = intern ("ultra-light"); | |
| 6809 staticpro (&Qultra_light); | |
| 6810 Qextra_light = intern ("extra-light"); | |
| 6811 staticpro (&Qextra_light); | |
| 6812 Qlight = intern ("light"); | |
| 6813 staticpro (&Qlight); | |
| 6814 Qsemi_light = intern ("semi-light"); | |
| 6815 staticpro (&Qsemi_light); | |
| 6816 Qsemi_bold = intern ("semi-bold"); | |
| 6817 staticpro (&Qsemi_bold); | |
| 6818 Qbold = intern ("bold"); | |
| 6819 staticpro (&Qbold); | |
| 6820 Qextra_bold = intern ("extra-bold"); | |
| 6821 staticpro (&Qextra_bold); | |
| 6822 Qultra_bold = intern ("ultra-bold"); | |
| 6823 staticpro (&Qultra_bold); | |
| 6824 Qoblique = intern ("oblique"); | |
| 6825 staticpro (&Qoblique); | |
| 6826 Qitalic = intern ("italic"); | |
| 6827 staticpro (&Qitalic); | |
| 6828 Qreverse_oblique = intern ("reverse-oblique"); | |
| 6829 staticpro (&Qreverse_oblique); | |
| 6830 Qreverse_italic = intern ("reverse-italic"); | |
| 6831 staticpro (&Qreverse_italic); | |
| 6832 Qultra_condensed = intern ("ultra-condensed"); | |
| 6833 staticpro (&Qultra_condensed); | |
| 6834 Qextra_condensed = intern ("extra-condensed"); | |
| 6835 staticpro (&Qextra_condensed); | |
| 6836 Qcondensed = intern ("condensed"); | |
| 6837 staticpro (&Qcondensed); | |
| 6838 Qsemi_condensed = intern ("semi-condensed"); | |
| 6839 staticpro (&Qsemi_condensed); | |
| 6840 Qsemi_expanded = intern ("semi-expanded"); | |
| 6841 staticpro (&Qsemi_expanded); | |
| 6842 Qexpanded = intern ("expanded"); | |
| 6843 staticpro (&Qexpanded); | |
| 6844 Qextra_expanded = intern ("extra-expanded"); | |
| 6845 staticpro (&Qextra_expanded); | |
| 6846 Qultra_expanded = intern ("ultra-expanded"); | |
| 6847 staticpro (&Qultra_expanded); | |
| 6848 Qbackground_color = intern ("background-color"); | |
| 6849 staticpro (&Qbackground_color); | |
| 6850 Qforeground_color = intern ("foreground-color"); | |
| 6851 staticpro (&Qforeground_color); | |
| 6852 Qunspecified = intern ("unspecified"); | |
| 6853 staticpro (&Qunspecified); | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6854 Qignore_defface = intern (":ignore-defface"); |
|
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6855 staticpro (&Qignore_defface); |
| 24995 | 6856 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6857 Qface_alias = intern ("face-alias"); |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6858 staticpro (&Qface_alias); |
| 24995 | 6859 Qdefault = intern ("default"); |
| 6860 staticpro (&Qdefault); | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
6861 Qtool_bar = intern ("tool-bar"); |
|
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
6862 staticpro (&Qtool_bar); |
| 24995 | 6863 Qregion = intern ("region"); |
| 6864 staticpro (&Qregion); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6865 Qfringe = intern ("fringe"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6866 staticpro (&Qfringe); |
| 25546 | 6867 Qheader_line = intern ("header-line"); |
| 6868 staticpro (&Qheader_line); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6869 Qscroll_bar = intern ("scroll-bar"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6870 staticpro (&Qscroll_bar); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6871 Qmenu = intern ("menu"); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6872 staticpro (&Qmenu); |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6873 Qcursor = intern ("cursor"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6874 staticpro (&Qcursor); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6875 Qborder = intern ("border"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6876 staticpro (&Qborder); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6877 Qmouse = intern ("mouse"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6878 staticpro (&Qmouse); |
|
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
6879 Qmode_line_inactive = intern ("mode-line-inactive"); |
|
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
6880 staticpro (&Qmode_line_inactive); |
|
63649
144440a09db1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents:
63642
diff
changeset
|
6881 Qvertical_border = intern ("vertical-border"); |
|
144440a09db1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents:
63642
diff
changeset
|
6882 staticpro (&Qvertical_border); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6883 Qtty_color_desc = intern ("tty-color-desc"); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6884 staticpro (&Qtty_color_desc); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6885 Qtty_color_standard_values = intern ("tty-color-standard-values"); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6886 staticpro (&Qtty_color_standard_values); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6887 Qtty_color_by_index = intern ("tty-color-by-index"); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6888 staticpro (&Qtty_color_by_index); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6889 Qtty_color_alist = intern ("tty-color-alist"); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6890 staticpro (&Qtty_color_alist); |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6891 Qscalable_fonts_allowed = intern ("scalable-fonts-allowed"); |
|
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6892 staticpro (&Qscalable_fonts_allowed); |
| 24995 | 6893 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6894 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil); |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6895 staticpro (&Vparam_value_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6896 Vface_alternative_font_family_alist = Qnil; |
|
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6897 staticpro (&Vface_alternative_font_family_alist); |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6898 Vface_alternative_font_registry_alist = Qnil; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6899 staticpro (&Vface_alternative_font_registry_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6900 |
| 24995 | 6901 defsubr (&Sinternal_make_lisp_face); |
| 6902 defsubr (&Sinternal_lisp_face_p); | |
| 6903 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
|
6904 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 6905 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
|
6906 #endif |
|
27120
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6907 defsubr (&Scolor_gray_p); |
|
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6908 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
|
6909 #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
|
6910 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
|
6911 #endif |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6912 defsubr (&Sface_attribute_relative_p); |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6913 defsubr (&Smerge_face_attribute); |
| 24995 | 6914 defsubr (&Sinternal_get_lisp_face_attribute); |
| 6915 defsubr (&Sinternal_lisp_face_attribute_values); | |
| 6916 defsubr (&Sinternal_lisp_face_equal_p); | |
| 6917 defsubr (&Sinternal_lisp_face_empty_p); | |
| 6918 defsubr (&Sinternal_copy_lisp_face); | |
| 6919 defsubr (&Sinternal_merge_in_global_face); | |
| 6920 defsubr (&Sface_font); | |
| 6921 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
|
6922 defsubr (&Sdisplay_supports_face_attributes_p); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6923 defsubr (&Scolor_distance); |
| 24995 | 6924 defsubr (&Sinternal_set_font_selection_order); |
| 6925 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
|
6926 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
|
6927 defsubr (&Sface_attributes_as_vector); |
| 24995 | 6928 #if GLYPH_DEBUG |
| 6929 defsubr (&Sdump_face); | |
| 6930 defsubr (&Sshow_face_resources); | |
| 6931 #endif /* GLYPH_DEBUG */ | |
| 6932 defsubr (&Sclear_face_cache); | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6933 defsubr (&Stty_suppress_bold_inverse_default_colors); |
| 24995 | 6934 |
|
29711
913fab478495
(syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents:
29599
diff
changeset
|
6935 #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
|
6936 defsubr (&Sdump_colors); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6937 #endif |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6938 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6939 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
|
6940 doc: /* *Limit for font matching. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6941 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
|
6942 that number of fonts when searching for a matching font. */); |
| 25270 | 6943 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
| 6944 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6945 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
|
6946 doc: /* List of global face definitions (for internal use only.) */); |
| 24995 | 6947 Vface_new_frame_defaults = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6948 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6949 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
|
6950 doc: /* *Default stipple pattern used on monochrome displays. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6951 This stipple pattern is used on monochrome displays |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6952 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
|
6953 See `set-face-stipple' for possible values for this variable. */); |
| 24995 | 6954 Vface_default_stipple = build_string ("gray3"); |
| 6955 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6956 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
|
6957 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
|
6958 Vtty_defined_color_alist = Qnil; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6959 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6960 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
|
6961 doc: /* Allowed scalable fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6962 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
|
6963 A value of t means allow any scalable font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6964 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
|
6965 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
|
6966 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
|
6967 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
|
6968 Vscalable_fonts_allowed = Qnil; |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6969 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6970 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
|
6971 doc: /* List of ignored fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6972 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
|
6973 ignore. */); |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6974 Vface_ignored_fonts = Qnil; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6975 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6976 DEFVAR_LISP ("face-remapping-alist", &Vface_remapping_alist, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6977 doc: /* Alist of face remappings. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6978 Each element is of the form: |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6979 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6980 (FACE REPLACEMENT...), |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6981 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6982 which causes display of the face FACE to use REPLACEMENT... instead. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6983 REPLACEMENT... is interpreted the same way the value of a `face' text |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6984 property is: it may be (1) A face name, (2) A list of face names, (3) A |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6985 property-list of face attribute/value pairs, or (4) A list of face names |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6986 intermixed with lists containing face attribute/value pairs. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6987 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6988 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
|
6989 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
|
6990 over those that are later. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6991 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6992 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
|
6993 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
|
6994 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6995 (FACE EXTRA-FACE... FACE) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6996 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6997 or: |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6998 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6999 (FACE (FACE-ATTR VAL ...) FACE) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7000 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7001 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
|
7002 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
|
7003 necessary, as every face inherits from the default face. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7004 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7005 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
|
7006 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
|
7007 `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
|
7008 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7009 (set (make-local-variable 'face-remapping-alist) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7010 '((default my-mode-default)))). */); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7011 Vface_remapping_alist = Qnil; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7012 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
7013 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
|
7014 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
|
7015 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
|
7016 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
|
7017 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
|
7018 \(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
|
7019 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
|
7020 Vface_font_rescale_alist = Qnil; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
7021 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
7022 #ifdef HAVE_WINDOW_SYSTEM |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
7023 defsubr (&Sbitmap_spec_p); |
| 24995 | 7024 defsubr (&Sx_list_fonts); |
| 7025 defsubr (&Sinternal_face_x_get_resource); | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7026 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
|
7027 #endif |
| 2336 | 7028 } |
| 52401 | 7029 |
| 7030 /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 | |
| 7031 (do not change this comment) */ |
