Mercurial > emacs
annotate src/xfaces.c @ 95948:d55ec23f052d
*** empty log message ***
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 15 Jun 2008 02:53:17 +0000 |
| parents | 99530dd346d3 |
| children | 6cece6cbe017 |
| 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, |
| 79759 | 3 2005, 2006, 2007, 2008 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 x_list_fonts w32_list_fonts |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
238 #define GCGraphicsExposures 0 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
239 #endif /* WINDOWSNT */ |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
240 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
241 #ifdef MAC_OS |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
242 #include "macterm.h" |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
243 #define x_display_info mac_display_info |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
244 #define check_x check_mac |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
245 #endif /* MAC_OS */ |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
246 |
| 2336 | 247 #include "buffer.h" |
| 2391 | 248 #include "dispextern.h" |
| 2438 | 249 #include "blockinput.h" |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
250 #include "window.h" |
| 8848 | 251 #include "intervals.h" |
|
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
252 #include "termchar.h" |
| 2336 | 253 |
|
95128
9c4d21df23ff
Include font.h unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
95044
diff
changeset
|
254 #include "font.h" |
| 90414 | 255 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
256 #include "fontset.h" |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
257 #endif /* HAVE_WINDOW_SYSTEM */ |
| 90414 | 258 |
| 9572 | 259 #ifdef HAVE_X_WINDOWS |
| 24995 | 260 |
| 261 /* 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
|
262 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
|
263 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
|
264 #included. */ |
| 24995 | 265 |
|
3436
291f28da7ea1
Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents:
3401
diff
changeset
|
266 #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
|
267 #include <time.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
268 #undef USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
269 #include <X11/Xos.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
270 #define USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
271 #define __TIMEVAL__ |
| 24995 | 272 #else /* not XOS_NEEDS_TIME_H */ |
| 2336 | 273 #include <X11/Xos.h> |
| 24995 | 274 #endif /* not XOS_NEEDS_TIME_H */ |
| 275 | |
| 9572 | 276 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 277 |
| 278 #include <ctype.h> | |
| 279 | |
| 34882 | 280 /* Number of pt per inch (from the TeXbook). */ |
| 281 | |
| 282 #define PT_PER_INCH 72.27 | |
| 283 | |
| 24995 | 284 /* Non-zero if face attribute ATTR is unspecified. */ |
| 285 | |
| 286 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) | |
| 287 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
288 /* 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
|
289 |
|
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
290 #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
|
291 |
| 24995 | 292 /* Value is the number of elements of VECTOR. */ |
| 293 | |
| 294 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) | |
| 295 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
296 /* Make a copy of string S on the stack using alloca. Value is a pointer |
| 24995 | 297 to the copy. */ |
| 298 | |
| 299 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S)) | |
| 300 | |
| 301 /* Make a copy of the contents of Lisp string S on the stack using | |
| 302 alloca. Value is a pointer to the copy. */ | |
| 303 | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
304 #define LSTRDUPA(S) STRDUPA (SDATA ((S))) |
| 24995 | 305 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
306 /* Size of hash table of realized faces in face caches (should be a |
| 24995 | 307 prime number). */ |
| 308 | |
| 309 #define FACE_CACHE_BUCKETS_SIZE 1001 | |
| 310 | |
| 311 /* Keyword symbols used for face attribute names. */ | |
| 312 | |
| 313 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; | |
| 314 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; | |
| 315 Lisp_Object QCwidth, QCfont, QCbold, QCitalic; | |
| 316 Lisp_Object QCreverse_video; | |
| 31178 | 317 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
318 Lisp_Object QCfontset; |
| 24995 | 319 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
320 /* Keywords symbols used for font properties. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
321 extern Lisp_Object QCfoundry, QCadstyle, QCregistry; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
322 extern Lisp_Object QCspacing, QCsize, QCavgwidth; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
323 extern Lisp_Object Qp; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
324 |
| 24995 | 325 /* Symbols used for attribute values. */ |
| 326 | |
| 327 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
| 328 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
| 329 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
| 330 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
| 331 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
| 332 Lisp_Object Qultra_expanded; | |
| 333 Lisp_Object Qreleased_button, Qpressed_button; | |
| 334 Lisp_Object QCstyle, QCcolor, QCline_width; | |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
335 Lisp_Object Qunspecified; |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
336 Lisp_Object Qignore_defface; |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
337 |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
338 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
| 24995 | 339 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
340 /* 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
|
341 has changed, frame_set_background_mode. */ |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
342 |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
343 Lisp_Object Qframe_set_background_mode; |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
344 |
| 24995 | 345 /* Names of basic faces. */ |
| 346 | |
|
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
347 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
|
348 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
|
349 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
|
350 extern Lisp_Object Qmode_line; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
351 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
352 /* 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
|
353 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
|
354 the aliased face. */ |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
355 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
356 Lisp_Object Qface_alias; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
357 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
358 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
|
359 |
| 24995 | 360 /* Default stipple pattern used on monochrome displays. This stipple |
| 361 pattern is used on monochrome displays instead of shades of gray | |
| 362 for a face background color. See `set-face-stipple' for possible | |
| 363 values for this variable. */ | |
| 364 | |
| 365 Lisp_Object Vface_default_stipple; | |
| 366 | |
| 367 /* Alist of alternative font families. Each element is of the form | |
| 368 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
| 369 try FAMILY1, then FAMILY2, ... */ | |
| 370 | |
| 371 Lisp_Object Vface_alternative_font_family_alist; | |
| 372 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
373 /* 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
|
374 (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
|
375 loaded, try REGISTRY1, then REGISTRY2, ... */ |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
376 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
377 Lisp_Object Vface_alternative_font_registry_alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
378 |
| 24995 | 379 /* Allowed scalable fonts. A value of nil means don't allow any |
| 380 scalable fonts. A value of t means allow the use of any scalable | |
| 381 font. Otherwise, value must be a list of regular expressions. A | |
| 382 font may be scaled if its name matches a regular expression in the | |
| 383 list. */ | |
| 384 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
385 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
| 24995 | 386 |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
387 /* 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
|
388 |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
389 Lisp_Object Vface_ignored_fonts; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
390 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
391 /* 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
|
392 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
393 Lisp_Object Vface_font_rescale_alist; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
394 |
| 25270 | 395 /* Maximum number of fonts to consider in font_list. If not an |
| 396 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
| 397 | |
| 398 Lisp_Object Vfont_list_limit; | |
| 399 #define DEFAULT_FONT_LIST_LIMIT 100 | |
| 400 | |
| 24995 | 401 /* The symbols `foreground-color' and `background-color' which can be |
| 402 used as part of a `face' property. This is for compatibility with | |
| 403 Emacs 20.2. */ | |
| 404 | |
| 405 Lisp_Object Qforeground_color, Qbackground_color; | |
| 406 | |
| 407 /* The symbols `face' and `mouse-face' used as text properties. */ | |
| 2342 | 408 |
|
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
409 Lisp_Object Qface; |
| 24995 | 410 extern Lisp_Object Qmouse_face; |
| 411 | |
| 57107 | 412 /* Property for basic faces which other faces cannot inherit. */ |
| 413 | |
| 414 Lisp_Object Qface_no_inherit; | |
| 415 | |
| 24995 | 416 /* Error symbol for wrong_type_argument in load_pixmap. */ |
| 417 | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
418 Lisp_Object Qbitmap_spec_p; |
| 2391 | 419 |
| 24995 | 420 /* Alist of global face definitions. Each element is of the form |
| 421 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
| 422 is a Lisp vector of face attributes. These faces are used | |
| 423 to initialize faces for new frames. */ | |
| 424 | |
| 425 Lisp_Object Vface_new_frame_defaults; | |
| 426 | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
427 /* 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
|
428 (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
|
429 REPLACEMENT... instead. REPLACEMENT... is interpreted the same way |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
430 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
|
431 (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
|
432 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
|
433 face attribute/value pairs. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
434 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
435 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
|
436 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
|
437 over those that are later. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
438 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
439 Face-name remapping cycles are suppressed; recursive references use |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
440 the underlying face instead of the remapped face. */ |
|
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 Lisp_Object Vface_remapping_alist; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
443 |
| 24995 | 444 /* The next ID to assign to Lisp faces. */ |
| 445 | |
| 446 static int next_lface_id; | |
| 447 | |
| 448 /* A vector mapping Lisp face Id's to face names. */ | |
| 449 | |
| 450 static Lisp_Object *lface_id_to_name; | |
| 451 static int lface_id_to_name_size; | |
| 452 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
453 /* 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
|
454 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
455 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
| 24995 | 456 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
457 /* 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
|
458 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
459 Lisp_Object Qtty_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
460 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
461 /* 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
|
462 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
463 Lisp_Object Vtty_defined_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
464 |
| 24995 | 465 /* Counter for calls to clear_face_cache. If this counter reaches |
| 466 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
| 467 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
| 468 | |
| 469 static int clear_font_table_count; | |
| 470 #define CLEAR_FONT_TABLE_COUNT 100 | |
| 471 #define CLEAR_FONT_TABLE_NFONTS 10 | |
| 472 | |
| 473 /* Non-zero means face attributes have been changed since the last | |
| 474 redisplay. Used in redisplay_internal. */ | |
| 475 | |
| 476 int face_change_count; | |
| 477 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
478 /* 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
|
479 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
|
480 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
|
481 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
|
482 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
483 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
|
484 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
485 /* 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
|
486 Finternal_set_lisp_face_attribute. */ |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
487 |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
488 static Lisp_Object Vparam_value_alist; |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
489 |
| 24995 | 490 /* The total number of colors currently allocated. */ |
| 491 | |
| 492 #if GLYPH_DEBUG | |
| 493 static int ncolors_allocated; | |
| 494 static int npixmaps_allocated; | |
| 495 static int ngcs; | |
| 496 #endif | |
| 497 | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
498 /* 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
|
499 been changed. */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
500 |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
501 int menu_face_changed_default; |
| 24995 | 502 |
| 2336 | 503 |
| 24995 | 504 /* Function prototypes. */ |
| 505 | |
| 506 struct font_name; | |
| 507 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
|
508 struct named_merge_point; |
| 24995 | 509 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
510 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
|
511 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
|
512 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
|
513 static int may_use_scalable_font_p P_ ((const char *)); |
| 24995 | 514 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
|
515 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
|
516 int, struct named_merge_point *)); |
| 24995 | 517 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); |
| 518 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); | |
| 519 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); | |
| 520 static void free_face_colors P_ ((struct frame *, struct face *)); | |
| 521 static int face_color_gray_p P_ ((struct frame *, char *)); | |
| 88907 | 522 static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, |
| 523 int)); | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
524 static struct face *realize_non_ascii_face P_ ((struct frame *, Lisp_Object, |
| 88907 | 525 struct face *)); |
| 526 static struct face *realize_x_face P_ ((struct face_cache *, Lisp_Object *)); | |
| 527 static struct face *realize_tty_face P_ ((struct face_cache *, Lisp_Object *)); | |
| 24995 | 528 static int realize_basic_faces P_ ((struct frame *)); |
| 529 static int realize_default_face P_ ((struct frame *)); | |
| 530 static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); | |
| 531 static int lface_fully_specified_p P_ ((Lisp_Object *)); | |
| 532 static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); | |
| 533 static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); | |
| 534 static unsigned lface_hash P_ ((Lisp_Object *)); | |
| 535 static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); | |
| 536 static struct face_cache *make_face_cache P_ ((struct frame *)); | |
| 537 static void clear_face_gcs P_ ((struct face_cache *)); | |
| 538 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
|
539 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
|
540 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
|
541 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
|
542 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
|
543 int, struct named_merge_point *)); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
544 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
|
545 int)); |
| 24995 | 546 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
|
547 static struct face *make_realized_face P_ ((Lisp_Object *)); |
| 24995 | 548 static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); |
| 549 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
|
550 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
551 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 552 |
| 553 static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); | |
| 554 static void x_free_gc P_ ((struct frame *, GC)); | |
| 555 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
556 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
557 extern Lisp_Object w32_list_fonts P_ ((struct frame *, Lisp_Object, int, int)); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
558 #endif /* WINDOWSNT */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
559 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
560 #ifdef USE_X_TOOLKIT |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
561 static void x_update_menu_appearance P_ ((struct frame *)); |
| 39675 | 562 |
| 563 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
|
564 #endif /* USE_X_TOOLKIT */ |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
565 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
566 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 567 |
| 568 | |
| 569 /*********************************************************************** | |
| 570 Utilities | |
| 571 ***********************************************************************/ | |
| 572 | |
| 573 #ifdef HAVE_X_WINDOWS | |
| 574 | |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
575 #ifdef DEBUG_X_COLORS |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
576 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
577 /* 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
|
578 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
|
579 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
|
580 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
|
581 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
|
582 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
|
583 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
|
584 single display/screen. --gerd. */ |
|
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 /* Reference counts for pixel colors. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
587 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
588 int color_count[256]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
589 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
590 /* Register color PIXEL as allocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
591 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
592 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
593 register_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
594 unsigned long pixel; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
597 ++color_count[pixel]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
598 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
599 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
600 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
601 /* Register color PIXEL as deallocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
602 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
603 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 unregister_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
605 unsigned long pixel; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
606 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
607 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
608 if (color_count[pixel] > 0) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
609 --color_count[pixel]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
610 else |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
611 abort (); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
614 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
615 /* Register N colors from PIXELS as deallocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
616 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
617 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
618 unregister_colors (pixels, n) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
619 unsigned long *pixels; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
620 int n; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
621 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
622 int i; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
623 for (i = 0; i < n; ++i) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
624 unregister_color (pixels[i]); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
625 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
626 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
627 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
628 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
|
629 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
|
630 () |
|
29599
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 int i, n; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
633 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
634 fputc ('\n', stderr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
635 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
636 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
|
637 if (color_count[i]) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
638 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
639 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
|
640 ++n; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
641 if (n % 5 == 0) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
642 fputc ('\n', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
643 else |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
644 fputc ('\t', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
645 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
646 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
647 if (n % 5 != 0) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
648 fputc ('\n', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
649 return Qnil; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
650 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
651 |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
652 #endif /* DEBUG_X_COLORS */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
653 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
654 |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
655 /* 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
|
656 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
|
657 is called. */ |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
658 |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
659 void |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
660 x_free_colors (f, pixels, npixels) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
661 struct frame *f; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
662 unsigned long *pixels; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
663 int npixels; |
|
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 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
666 |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
667 /* 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
|
668 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
|
669 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
670 { |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
671 #ifdef DEBUG_X_COLORS |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
672 unregister_colors (pixels, npixels); |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
673 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
674 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
|
675 pixels, npixels, 0); |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
676 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
677 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
678 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
679 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
680 /* 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
|
681 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
|
682 is called. */ |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
683 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
684 void |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
685 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
|
686 Display *dpy; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
687 Screen *screen; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
688 Colormap cmap; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
689 unsigned long *pixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
690 int npixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
691 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
692 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
|
693 int class = dpyinfo->visual->class; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
694 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
695 /* 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
|
696 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
|
697 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
698 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
699 #ifdef DEBUG_X_COLORS |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
700 unregister_colors (pixels, npixels); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
701 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
702 XFreeColors (dpy, cmap, pixels, npixels, 0); |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
703 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
704 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
705 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
706 |
| 24995 | 707 /* Create and return a GC for use on frame F. GC values and mask |
| 708 are given by XGCV and MASK. */ | |
| 709 | |
| 710 static INLINE GC | |
| 711 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
|
712 struct frame *f; |
| 24995 | 713 unsigned long mask; |
| 714 XGCValues *xgcv; | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
715 { |
| 2336 | 716 GC gc; |
| 24995 | 717 BLOCK_INPUT; |
| 718 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
| 719 UNBLOCK_INPUT; | |
| 720 IF_DEBUG (++ngcs); | |
| 721 return gc; | |
| 722 } | |
| 723 | |
| 724 | |
| 725 /* Free GC which was used on frame F. */ | |
| 726 | |
| 727 static INLINE void | |
| 728 x_free_gc (f, gc) | |
| 729 struct frame *f; | |
| 730 GC gc; | |
| 731 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
732 eassert (interrupt_input_blocked); |
|
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
733 IF_DEBUG (xassert (--ngcs >= 0)); |
| 24995 | 734 XFreeGC (FRAME_X_DISPLAY (f), gc); |
| 735 } | |
| 736 | |
| 737 #endif /* HAVE_X_WINDOWS */ | |
| 738 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
739 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
740 /* W32 emulation of GCs */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
741 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
742 static INLINE GC |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
743 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
|
744 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
745 unsigned long mask; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
746 XGCValues *xgcv; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
747 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
748 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
749 BLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
750 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
|
751 UNBLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
752 IF_DEBUG (++ngcs); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
753 return gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
754 } |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
755 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
756 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
757 /* 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
|
758 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
759 static INLINE void |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
760 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
|
761 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
762 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
763 { |
|
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
764 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
|
765 xfree (gc); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
766 } |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
767 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
768 #endif /* WINDOWSNT */ |
| 24995 | 769 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
770 #ifdef MAC_OS |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
771 /* Mac OS emulation of GCs */ |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
772 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
773 static INLINE GC |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
774 x_create_gc (f, mask, xgcv) |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
775 struct frame *f; |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
776 unsigned long mask; |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
777 XGCValues *xgcv; |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
778 { |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
779 GC gc; |
|
65912
da86e1af8629
(x_create_gc, x_free_gc) [MAC_OS]: Add BLOCK_INPUT. Add debug code.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65781
diff
changeset
|
780 BLOCK_INPUT; |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
781 gc = XCreateGC (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), mask, xgcv); |
|
65912
da86e1af8629
(x_create_gc, x_free_gc) [MAC_OS]: Add BLOCK_INPUT. Add debug code.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65781
diff
changeset
|
782 UNBLOCK_INPUT; |
|
da86e1af8629
(x_create_gc, x_free_gc) [MAC_OS]: Add BLOCK_INPUT. Add debug code.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65781
diff
changeset
|
783 IF_DEBUG (++ngcs); |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
784 return gc; |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
785 } |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
786 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
787 static INLINE void |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
788 x_free_gc (f, gc) |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
789 struct frame *f; |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
790 GC gc; |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
791 { |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
792 eassert (interrupt_input_blocked); |
|
65912
da86e1af8629
(x_create_gc, x_free_gc) [MAC_OS]: Add BLOCK_INPUT. Add debug code.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65781
diff
changeset
|
793 IF_DEBUG (xassert (--ngcs >= 0)); |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
794 XFreeGC (FRAME_MAC_DISPLAY (f), gc); |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
795 } |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
796 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
797 #endif /* MAC_OS */ |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
798 |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
799 /* 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
|
800 are in ISO8859-1. */ |
| 24995 | 801 |
| 802 int | |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
803 xstrcasecmp (s1, s2) |
|
46478
d6b51ec01987
(xstricmp): String pointer args now point to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
804 const unsigned char *s1, *s2; |
| 24995 | 805 { |
| 806 while (*s1 && *s2) | |
| 807 { | |
| 808 unsigned char c1 = tolower (*s1); | |
| 809 unsigned char c2 = tolower (*s2); | |
| 810 if (c1 != c2) | |
| 811 return c1 < c2 ? -1 : 1; | |
| 812 ++s1, ++s2; | |
| 813 } | |
| 814 | |
| 815 if (*s1 == 0) | |
| 816 return *s2 == 0 ? 0 : -1; | |
| 817 return 1; | |
| 818 } | |
| 819 | |
| 820 | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
821 /* 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
|
822 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
|
823 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
|
824 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
|
825 Lisp function definitions. */ |
| 24995 | 826 |
| 827 static INLINE struct frame * | |
| 828 frame_or_selected_frame (frame, nparam) | |
| 829 Lisp_Object frame; | |
| 830 int nparam; | |
| 831 { | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
832 if (NILP (frame)) |
|
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
833 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
834 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
835 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
836 return XFRAME (frame); |
| 24995 | 837 } |
| 838 | |
| 839 | |
| 840 /*********************************************************************** | |
| 841 Frames and faces | |
| 842 ***********************************************************************/ | |
| 843 | |
| 844 /* 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
|
845 |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
846 void |
| 24995 | 847 init_frame_faces (f) |
| 848 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
|
849 { |
| 24995 | 850 /* Make a face cache, if F doesn't have one. */ |
| 851 if (FRAME_FACE_CACHE (f) == NULL) | |
| 852 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
853 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
854 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 855 /* 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
|
856 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
|
857 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
858 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
|
859 /* Is that ever possible?? --Stef */ |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
860 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
|
861 ++FRAME_IMAGE_CACHE (f)->refcount; |
| 24995 | 862 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
863 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 864 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
865 /* Realize basic faces. Must have enough information in frame |
| 24995 | 866 parameters to realize basic faces at this point. */ |
| 867 #ifdef HAVE_X_WINDOWS | |
| 868 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
| 869 #endif | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
870 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
871 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
|
872 #endif |
| 45848 | 873 #ifdef MAC_OS |
| 874 if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) | |
| 875 #endif | |
| 24995 | 876 if (!realize_basic_faces (f)) |
| 877 abort (); | |
| 878 } | |
| 879 | |
| 880 | |
| 881 /* Free face cache of frame F. Called from Fdelete_frame. */ | |
| 882 | |
| 883 void | |
| 884 free_frame_faces (f) | |
| 885 struct frame *f; | |
| 886 { | |
| 887 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
|
888 |
| 24995 | 889 if (face_cache) |
| 890 { | |
| 891 free_face_cache (face_cache); | |
| 892 FRAME_FACE_CACHE (f) = NULL; | |
| 893 } | |
| 894 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
895 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
896 if (FRAME_WINDOW_P (f)) |
| 24995 | 897 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
898 struct image_cache *image_cache = FRAME_IMAGE_CACHE (f); |
| 24995 | 899 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
|
900 { |
| 24995 | 901 --image_cache->refcount; |
| 902 if (image_cache->refcount == 0) | |
| 903 free_image_cache (f); | |
| 904 } | |
| 905 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
906 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 907 } |
| 908 | |
| 909 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
910 /* 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
|
911 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
|
912 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
|
913 of named faces. */ |
| 24995 | 914 |
| 915 void | |
| 916 recompute_basic_faces (f) | |
| 917 struct frame *f; | |
| 918 { | |
| 919 if (FRAME_FACE_CACHE (f)) | |
| 920 { | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
921 clear_face_cache (0); |
|
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
922 if (!realize_basic_faces (f)) |
|
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
923 abort (); |
| 24995 | 924 } |
| 925 } | |
| 926 | |
| 927 | |
| 928 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
| 929 try to free unused fonts, too. */ | |
| 930 | |
| 931 void | |
| 932 clear_face_cache (clear_fonts_p) | |
| 933 int clear_fonts_p; | |
| 934 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
935 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 936 Lisp_Object tail, frame; |
| 937 struct frame *f; | |
| 938 | |
| 939 if (clear_fonts_p | |
| 940 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
| 941 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
942 #if 0 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
943 /* Not yet implemented. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
944 clear_font_cache (frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
945 #endif |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
946 |
| 24995 | 947 /* From time to time see if we can unload some fonts. This also |
| 948 frees all realized faces on all frames. Fonts needed by | |
| 949 faces will be loaded again when faces are realized again. */ | |
| 950 clear_font_table_count = 0; | |
| 951 | |
| 952 FOR_EACH_FRAME (tail, frame) | |
| 953 { | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
954 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
|
955 if (FRAME_WINDOW_P (f) |
| 24995 | 956 && 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
|
957 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
|
958 } |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
959 } |
| 24995 | 960 else |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
961 { |
| 24995 | 962 /* Clear GCs of realized faces. */ |
| 963 FOR_EACH_FRAME (tail, frame) | |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
964 { |
| 24995 | 965 f = XFRAME (frame); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
966 if (FRAME_WINDOW_P (f)) |
| 24995 | 967 clear_face_gcs (FRAME_FACE_CACHE (f)); |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
968 } |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
969 clear_image_caches (Qnil); |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
970 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
971 #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
|
972 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
973 |
| 24995 | 974 |
| 975 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
|
976 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
|
977 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
|
978 (thoroughly) |
|
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
979 Lisp_Object thoroughly; |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
980 { |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
981 clear_face_cache (!NILP (thoroughly)); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
982 ++face_change_count; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
983 ++windows_or_buffers_changed; |
| 24995 | 984 return Qnil; |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
985 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
986 |
| 24995 | 987 |
| 988 /*********************************************************************** | |
| 989 X Pixmaps | |
| 990 ***********************************************************************/ | |
| 991 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
992 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 993 |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
994 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
|
995 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
|
996 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
|
997 \(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
|
998 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
|
999 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
|
1000 \(WIDTH + 7)/8 bytes. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1001 (object) |
|
14090
24b93860d392
(Fpixmap_spec_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1002 Lisp_Object object; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1003 { |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1004 int pixmap_p = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1005 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1006 if (STRINGP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1007 /* 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
|
1008 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1009 else if (CONSP (object)) |
|
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 /* 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
|
1012 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
|
1013 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
|
1014 Lisp_Object width, height, data; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1015 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1016 height = width = data = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1017 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1018 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1019 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1020 width = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1021 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1022 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1023 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1024 height = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1025 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1026 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1027 data = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1028 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1029 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1030 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1031 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
|
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 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
|
1034 / 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
|
1035 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
|
1036 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1037 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1038 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1039 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1040 return pixmap_p ? Qt : Qnil; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1041 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1042 |
| 24995 | 1043 |
| 1044 /* Load a bitmap according to NAME (which is either a file name or a | |
| 1045 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
| 1046 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
| 1047 bitmap cannot be loaded, display a message saying so, and return | |
| 1048 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
| 1049 if these pointers are not null. */ | |
| 1050 | |
| 1051 static int | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1052 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
|
1053 FRAME_PTR f; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1054 Lisp_Object name; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1055 unsigned int *w_ptr, *h_ptr; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1056 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1057 int bitmap_id; |
|
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 if (NILP (name)) |
| 24995 | 1060 return 0; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1061 |
|
71845
085d9056841a
(load_pixmap): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71576
diff
changeset
|
1062 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
|
1063 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1064 BLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1065 if (CONSP (name)) |
|
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 /* Decode a bitmap spec into a bitmap. */ |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1068 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1069 int h, w; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1070 Lisp_Object bits; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1071 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1072 w = XINT (Fcar (name)); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1073 h = XINT (Fcar (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1074 bits = Fcar (Fcdr (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1075 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1076 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
|
1077 w, h); |
|
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 else |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1080 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1081 /* 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
|
1082 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
|
1083 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1084 UNBLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1085 |
|
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1086 if (bitmap_id < 0) |
| 24995 | 1087 { |
|
72446
44f03dd44abf
(load_pixmap): Add quotes in error message.
Richard M. Stallman <rms@gnu.org>
parents:
72170
diff
changeset
|
1088 add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil); |
| 24995 | 1089 bitmap_id = 0; |
| 1090 | |
| 1091 if (w_ptr) | |
| 1092 *w_ptr = 0; | |
| 1093 if (h_ptr) | |
| 1094 *h_ptr = 0; | |
| 1095 } | |
| 1096 else | |
| 1097 { | |
| 1098 #if GLYPH_DEBUG | |
| 1099 ++npixmaps_allocated; | |
| 1100 #endif | |
| 1101 if (w_ptr) | |
| 1102 *w_ptr = x_bitmap_width (f, bitmap_id); | |
| 1103 | |
| 1104 if (h_ptr) | |
| 1105 *h_ptr = x_bitmap_height (f, bitmap_id); | |
| 1106 } | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1107 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1108 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
|
1109 } |
| 9572 | 1110 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1111 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1112 |
| 9572 | 1113 |
| 2336 | 1114 |
| 24995 | 1115 /*********************************************************************** |
| 1116 X Colors | |
| 1117 ***********************************************************************/ | |
| 1118 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1119 /* 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
|
1120 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
|
1121 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
|
1122 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1123 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1124 parse_rgb_list (rgb_list, color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1125 Lisp_Object rgb_list; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1126 XColor *color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1127 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1128 #define PARSE_RGB_LIST_FIELD(field) \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1129 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
|
1130 { \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1131 color->field = XINT (XCAR (rgb_list)); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1132 rgb_list = XCDR (rgb_list); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1133 } \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1134 else \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1135 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1136 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1137 PARSE_RGB_LIST_FIELD (red); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1138 PARSE_RGB_LIST_FIELD (green); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1139 PARSE_RGB_LIST_FIELD (blue); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1140 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1141 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1142 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1143 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1144 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1145 /* 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
|
1146 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
|
1147 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
|
1148 returned in it. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1149 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1150 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1151 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
|
1152 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1153 Lisp_Object color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1154 XColor *tty_color, *std_color; |
|
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 Lisp_Object frame, color_desc; |
|
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 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
|
1159 return 0; |
|
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 XSETFRAME (frame, f); |
|
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 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
|
1164 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
|
1165 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1166 Lisp_Object rgb; |
|
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 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1169 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1170 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1171 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
|
1172 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1173 rgb = XCDR (XCDR (color_desc)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1174 if (! parse_rgb_list (rgb, tty_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1175 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1176 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1177 /* Should we fill in STD_COLOR too? */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1178 if (std_color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1179 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1180 /* 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
|
1181 *std_color = *tty_color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1182 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1183 /* 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
|
1184 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
|
1185 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
|
1186 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
|
1187 if ((!STRINGP (XCAR (color_desc)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1188 || 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
|
1189 && !NILP (Ffboundp (Qtty_color_standard_values))) |
|
45718
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 /* Look up STD_COLOR separately. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1192 rgb = call1 (Qtty_color_standard_values, color); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1193 if (! parse_rgb_list (rgb, std_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1194 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1195 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1196 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1197 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1198 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1199 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1200 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
|
1201 /* 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
|
1202 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
|
1203 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
|
1204 load color" messages in the *Messages* buffer. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1205 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1206 else |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1207 /* 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
|
1208 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1209 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1210 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1211 /* 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
|
1212 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1213 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1214 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
|
1215 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1216 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1217 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1218 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1219 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1220 int status = 1; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1221 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1222 /* Defaults. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1223 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
|
1224 color_def->red = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1225 color_def->blue = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1226 color_def->green = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1227 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1228 if (*color_name) |
|
89554
15da46f6f0ac
(face_numeric_value): Declare dim size_t.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1229 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
|
1230 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1231 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
|
1232 { |
|
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1233 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
|
1234 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
|
1235 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
|
1236 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
|
1237 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1238 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1239 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
|
1240 status = 1; |
|
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1241 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1242 return status; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1243 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1244 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1245 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1246 /* 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
|
1247 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
|
1248 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
|
1249 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1250 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
|
1251 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1252 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1253 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
|
1254 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1255 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1256 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1257 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1258 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1259 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
|
1260 return tty_defined_color (f, color_name, color_def, alloc); |
| 24995 | 1261 #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
|
1262 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
|
1263 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
|
1264 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1265 #ifdef WINDOWSNT |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1266 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
|
1267 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
|
1268 #endif |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
1269 #ifdef MAC_OS |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1270 else if (FRAME_MAC_P (f)) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1271 return mac_defined_color (f, color_name, color_def, alloc); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1272 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1273 else |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1274 abort (); |
|
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 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1277 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1278 /* 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
|
1279 Lisp string. */ |
|
26729
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 Lisp_Object |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1282 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
|
1283 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1284 int idx; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1285 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1286 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
|
1287 { |
|
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1288 Lisp_Object frame; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1289 Lisp_Object coldesc; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1290 |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1291 XSETFRAME (frame, f); |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1292 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
|
1293 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1294 if (!NILP (coldesc)) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1295 return XCAR (coldesc); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1296 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1297 #ifdef MSDOS |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1298 /* 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
|
1299 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
|
1300 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
|
1301 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
|
1302 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1303 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1304 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1305 return build_string (unspecified_fg); |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1306 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1307 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
|
1308 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1309 return Qunspecified; |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1310 } |
| 24995 | 1311 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1312 |
| 24995 | 1313 /* 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
|
1314 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
|
1315 |
|
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1316 The criterion implemented here is not a terribly sophisticated one. */ |
| 24995 | 1317 |
| 1318 static int | |
| 1319 face_color_gray_p (f, color_name) | |
| 1320 struct frame *f; | |
| 1321 char *color_name; | |
| 1322 { | |
| 1323 XColor color; | |
| 1324 int gray_p; | |
| 1325 | |
| 1326 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
|
1327 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
|
1328 (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
|
1329 || |
| 85262 | 1330 ((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
|
1331 < max (color.red, color.green) / 20) |
| 85262 | 1332 && (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
|
1333 < max (color.green, color.blue) / 20) |
| 85262 | 1334 && (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
|
1335 < max (color.blue, color.red) / 20))); |
| 24995 | 1336 else |
| 1337 gray_p = 0; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1338 |
| 24995 | 1339 return gray_p; |
| 1340 } | |
| 1341 | |
| 1342 | |
| 1343 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
| 1344 BACKGROUND_P non-zero means the color will be used as background | |
| 1345 color. */ | |
| 1346 | |
| 1347 static int | |
| 1348 face_color_supported_p (f, color_name, background_p) | |
| 1349 struct frame *f; | |
| 1350 char *color_name; | |
| 1351 int background_p; | |
| 1352 { | |
| 1353 Lisp_Object frame; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1354 XColor not_used; |
| 24995 | 1355 |
| 1356 XSETFRAME (frame, f); | |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1357 return |
|
59924
3590dd3050ba
(face_color_supported_p): Use HAVE_WINDOW_SYSTEM
Eli Zaretskii <eliz@gnu.org>
parents:
59905
diff
changeset
|
1358 #ifdef HAVE_WINDOW_SYSTEM |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1359 FRAME_WINDOW_P (f) |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1360 ? (!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
|
1361 || xstrcasecmp (color_name, "black") == 0 |
|
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
1362 || 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
|
1363 || (background_p |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1364 && 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
|
1365 || (!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
|
1366 && 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
|
1367 : |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1368 #endif |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1369 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
|
1370 } |
| 24995 | 1371 |
| 1372 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1373 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
|
1374 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
|
1375 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
|
1376 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
|
1377 (color, frame) |
| 24995 | 1378 Lisp_Object color, frame; |
| 1379 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1380 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1381 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1382 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1383 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1384 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1385 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1386 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1387 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
|
1388 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
| 24995 | 1389 } |
| 1390 | |
| 1391 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1392 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
|
1393 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
|
1394 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
|
1395 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
|
1396 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
|
1397 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
|
1398 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
|
1399 (color, frame, background_p) |
| 24995 | 1400 Lisp_Object frame, color, background_p; |
| 1401 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1402 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1403 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1404 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1405 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1406 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1407 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1408 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1409 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
|
1410 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
| 24995 | 1411 return Qt; |
| 1412 return Qnil; | |
| 1413 } | |
| 1414 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1415 |
| 24995 | 1416 /* Load color with name NAME for use by face FACE on frame F. |
| 1417 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
| 1418 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
| 1419 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
| 1420 pixel color. If color cannot be loaded, display a message, and | |
| 1421 return the foreground, background or underline color of F, but | |
| 1422 record that fact in flags of the face so that we don't try to free | |
| 1423 these colors. */ | |
| 1424 | |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1425 unsigned long |
| 24995 | 1426 load_color (f, face, name, target_index) |
| 1427 struct frame *f; | |
| 1428 struct face *face; | |
| 1429 Lisp_Object name; | |
| 1430 enum lface_attribute_index target_index; | |
| 1431 { | |
| 1432 XColor color; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1433 |
| 24995 | 1434 xassert (STRINGP (name)); |
| 1435 xassert (target_index == LFACE_FOREGROUND_INDEX | |
| 1436 || target_index == LFACE_BACKGROUND_INDEX | |
| 1437 || target_index == LFACE_UNDERLINE_INDEX | |
| 1438 || target_index == LFACE_OVERLINE_INDEX | |
| 1439 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
| 1440 || target_index == LFACE_BOX_INDEX); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1441 |
| 24995 | 1442 /* if the color map is full, defined_color will return a best match |
| 1443 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
|
1444 if (!defined_color (f, SDATA (name), &color, 1)) |
| 24995 | 1445 { |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1446 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
|
1447 |
| 24995 | 1448 switch (target_index) |
| 1449 { | |
| 1450 case LFACE_FOREGROUND_INDEX: | |
| 1451 face->foreground_defaulted_p = 1; | |
| 1452 color.pixel = FRAME_FOREGROUND_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_BACKGROUND_INDEX: |
| 1456 face->background_defaulted_p = 1; | |
| 1457 color.pixel = FRAME_BACKGROUND_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_UNDERLINE_INDEX: |
| 1461 face->underline_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_OVERLINE_INDEX: |
| 1466 face->overline_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_STRIKE_THROUGH_INDEX: |
| 1471 face->strike_through_color_defaulted_p = 1; | |
| 1472 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1473 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1474 |
| 24995 | 1475 case LFACE_BOX_INDEX: |
| 1476 face->box_color_defaulted_p = 1; | |
| 1477 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1478 break; | |
| 1479 | |
| 1480 default: | |
| 1481 abort (); | |
| 1482 } | |
| 1483 } | |
| 1484 #if GLYPH_DEBUG | |
| 1485 else | |
| 1486 ++ncolors_allocated; | |
| 1487 #endif | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1488 |
| 24995 | 1489 return color.pixel; |
| 1490 } | |
| 1491 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1492 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1493 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1494 |
| 1495 /* Load colors for face FACE which is used on frame F. Colors are | |
| 1496 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
| 1497 of ATTRS. If the background color specified is not supported on F, | |
| 1498 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
| 1499 | |
| 1500 static void | |
| 1501 load_face_colors (f, face, attrs) | |
| 1502 struct frame *f; | |
| 1503 struct face *face; | |
| 1504 Lisp_Object *attrs; | |
| 1505 { | |
| 1506 Lisp_Object fg, bg; | |
| 1507 | |
| 1508 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
| 1509 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
| 1510 | |
| 1511 /* Swap colors if face is inverse-video. */ | |
| 1512 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
| 1513 { | |
| 1514 Lisp_Object tmp; | |
| 1515 tmp = fg; | |
| 1516 fg = bg; | |
| 1517 bg = tmp; | |
| 1518 } | |
| 1519 | |
| 1520 /* Check for support for foreground, not for background because | |
| 1521 face_color_supported_p is smart enough to know that grays are | |
| 1522 "supported" as background because we are supposed to use stipple | |
| 1523 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
|
1524 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
|
1525 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
| 24995 | 1526 { |
| 1527 x_destroy_bitmap (f, face->stipple); | |
| 1528 face->stipple = load_pixmap (f, Vface_default_stipple, | |
| 1529 &face->pixmap_w, &face->pixmap_h); | |
| 1530 } | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1531 |
|
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1532 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
| 24995 | 1533 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
| 1534 } | |
| 1535 | |
| 1536 | |
| 1537 /* Free color PIXEL on frame F. */ | |
| 1538 | |
| 1539 void | |
| 1540 unload_color (f, pixel) | |
| 1541 struct frame *f; | |
| 1542 unsigned long pixel; | |
| 1543 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1544 #ifdef HAVE_X_WINDOWS |
|
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1545 if (pixel != -1) |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1546 { |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1547 BLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1548 x_free_colors (f, &pixel, 1); |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1549 UNBLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1550 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1551 #endif |
| 24995 | 1552 } |
| 1553 | |
| 1554 | |
| 1555 /* Free colors allocated for FACE. */ | |
| 1556 | |
| 1557 static void | |
| 1558 free_face_colors (f, face) | |
| 1559 struct frame *f; | |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1560 struct face *face; |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1561 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1562 #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
|
1563 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
|
1564 return; |
|
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1565 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1566 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1567 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1568 if (!face->foreground_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1569 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1570 x_free_colors (f, &face->foreground, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1571 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1572 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1573 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1574 if (!face->background_defaulted_p) |
|
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 x_free_colors (f, &face->background, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1577 IF_DEBUG (--ncolors_allocated); |
|
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 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1580 if (face->underline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1581 && !face->underline_defaulted_p) |
|
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 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
|
1584 IF_DEBUG (--ncolors_allocated); |
|
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 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1587 if (face->overline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1588 && !face->overline_color_defaulted_p) |
|
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 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
|
1591 IF_DEBUG (--ncolors_allocated); |
|
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 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1594 if (face->strike_through_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1595 && !face->strike_through_color_defaulted_p) |
|
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 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
|
1598 IF_DEBUG (--ncolors_allocated); |
|
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 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1601 if (face->box != FACE_NO_BOX |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1602 && !face->box_color_defaulted_p) |
|
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 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
|
1605 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1606 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1607 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1608 UNBLOCK_INPUT; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1609 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 1610 } |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1611 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1612 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1613 |
| 1614 | |
| 1615 | |
| 1616 /*********************************************************************** | |
| 1617 XLFD Font Names | |
| 1618 ***********************************************************************/ | |
| 1619 | |
| 1620 /* An enumerator for each field of an XLFD font name. */ | |
| 1621 | |
| 1622 enum xlfd_field | |
| 1623 { | |
| 1624 XLFD_FOUNDRY, | |
| 1625 XLFD_FAMILY, | |
| 1626 XLFD_WEIGHT, | |
| 1627 XLFD_SLANT, | |
| 1628 XLFD_SWIDTH, | |
| 1629 XLFD_ADSTYLE, | |
| 1630 XLFD_PIXEL_SIZE, | |
| 1631 XLFD_POINT_SIZE, | |
| 1632 XLFD_RESX, | |
| 1633 XLFD_RESY, | |
| 1634 XLFD_SPACING, | |
| 1635 XLFD_AVGWIDTH, | |
| 1636 XLFD_REGISTRY, | |
| 1637 XLFD_ENCODING, | |
| 1638 XLFD_LAST | |
| 1639 }; | |
| 1640 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1641 /* An enumerator for each possible slant value of a font. Taken from |
| 24995 | 1642 the XLFD specification. */ |
| 1643 | |
| 1644 enum xlfd_slant | |
| 1645 { | |
| 1646 XLFD_SLANT_UNKNOWN, | |
| 1647 XLFD_SLANT_ROMAN, | |
| 1648 XLFD_SLANT_ITALIC, | |
| 1649 XLFD_SLANT_OBLIQUE, | |
| 1650 XLFD_SLANT_REVERSE_ITALIC, | |
| 1651 XLFD_SLANT_REVERSE_OBLIQUE, | |
| 1652 XLFD_SLANT_OTHER | |
| 1653 }; | |
| 1654 | |
| 1655 /* Relative font weight according to XLFD documentation. */ | |
| 1656 | |
| 1657 enum xlfd_weight | |
| 1658 { | |
| 1659 XLFD_WEIGHT_UNKNOWN, | |
| 1660 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
| 1661 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
| 1662 XLFD_WEIGHT_LIGHT, /* 30 */ | |
| 1663 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
| 1664 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1665 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
| 1666 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
| 1667 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
| 1668 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
| 1669 }; | |
| 1670 | |
| 1671 /* Relative proportionate width. */ | |
| 1672 | |
| 1673 enum xlfd_swidth | |
| 1674 { | |
| 1675 XLFD_SWIDTH_UNKNOWN, | |
| 1676 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
| 1677 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
| 1678 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
| 1679 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
| 1680 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1681 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
| 1682 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
| 1683 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
| 1684 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
| 1685 }; | |
| 1686 | |
| 1687 /* Order by which font selection chooses fonts. The default values | |
| 1688 mean `first, find a best match for the font width, then for the | |
| 1689 font height, then for weight, then for slant.' This variable can be | |
| 1690 set via set-face-font-sort-order. */ | |
| 1691 | |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
1692 #ifdef MAC_OS |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1693 static int font_sort_order[4] = { |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1694 XLFD_SWIDTH, XLFD_POINT_SIZE, XLFD_WEIGHT, XLFD_SLANT |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1695 }; |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
1696 #else |
| 24995 | 1697 static int font_sort_order[4]; |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
1698 #endif |
| 24995 | 1699 |
| 1700 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1701 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1702 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1703 /* Return a rescaling ratio of a font of NAME. */ |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1704 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1705 static double |
|
51401
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
1706 font_rescale_ratio (name) |
|
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
1707 char *name; |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1708 { |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1709 Lisp_Object tail, elt; |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1710 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1711 for (tail = Vface_font_rescale_alist; CONSP (tail); tail = XCDR (tail)) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1712 { |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1713 elt = XCAR (tail); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1714 if (STRINGP (XCAR (elt)) && FLOATP (XCDR (elt)) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1715 && fast_c_string_match_ignore_case (XCAR (elt), name) >= 0) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1716 return XFLOAT_DATA (XCDR (elt)); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1717 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1718 return 1.0; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1719 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1720 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1721 static enum font_property_index font_props_for_sorting[FONT_SIZE_INDEX]; |
| 24995 | 1722 |
| 1723 static int | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1724 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
|
1725 const void *v1, *v2; |
| 24995 | 1726 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1727 Lisp_Object font1 = *(Lisp_Object *) v1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1728 Lisp_Object font2 = *(Lisp_Object *) v2; |
| 24995 | 1729 int i; |
|
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
1730 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1731 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
|
1732 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1733 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
|
1734 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
|
1735 int result; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1736 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1737 if (idx <= FONT_REGISTRY_INDEX) |
| 24995 | 1738 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1739 if (STRINGP (val1)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1740 result = STRINGP (val2) ? strcmp (SDATA (val1), SDATA (val2)) : -1; |
| 24995 | 1741 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1742 result = STRINGP (val2) ? 1 : 0; |
| 24995 | 1743 } |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
1744 else |
| 24995 | 1745 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1746 if (INTEGERP (val1)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1747 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
|
1748 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1749 result = INTEGERP (val2) ? 1 : 0; |
|
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
1750 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1751 if (result) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1752 return result; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1753 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1754 return 0; |
| 24995 | 1755 } |
| 1756 | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
1757 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
|
1758 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
|
1759 If FAMILY is omitted or nil, list all families. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1760 Otherwise, FAMILY must be a string, possibly containing wildcards |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1761 `?' and `*'. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1762 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
|
1763 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
|
1764 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1765 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
|
1766 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
|
1767 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
|
1768 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
|
1769 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
|
1770 giving the registry and encoding of the font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1771 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
|
1772 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
|
1773 (family, frame) |
| 24995 | 1774 Lisp_Object family, frame; |
| 1775 { | |
|
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1776 Lisp_Object font_spec, vec; |
| 24995 | 1777 int i, nfonts; |
| 1778 Lisp_Object result; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1779 |
|
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1780 if (NILP (frame)) |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1781 frame = selected_frame; |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1782 CHECK_LIVE_FRAME (frame); |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1783 |
|
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1784 font_spec = Ffont_spec (0, NULL); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1785 if (!NILP (family)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1786 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1787 CHECK_STRING (family); |
|
95574
fa7d768bdd0b
(Fx_family_fonts): Use font_parse_family_registry instead of
Kenichi Handa <handa@m17n.org>
parents:
95567
diff
changeset
|
1788 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
|
1789 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1790 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
|
1791 nfonts = ASIZE (vec); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1792 if (nfonts == 0) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1793 return Qnil; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1794 if (nfonts > 1) |
|
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 for (i = 0; i < 4; i++) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1797 switch (font_sort_order[i]) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1798 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1799 case XLFD_SWIDTH: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1800 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
|
1801 case XLFD_POINT_SIZE: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1802 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
|
1803 case XLFD_WEIGHT: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1804 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
|
1805 default: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1806 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
|
1807 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1808 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
|
1809 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
|
1810 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
|
1811 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
|
1812 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1813 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
|
1814 compare_fonts_by_sort_order); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1815 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1816 |
| 24995 | 1817 result = Qnil; |
| 1818 for (i = nfonts - 1; i >= 0; --i) | |
| 1819 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1820 Lisp_Object font = AREF (vec, i); |
| 25270 | 1821 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
|
1822 int point; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1823 Lisp_Object spacing; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1824 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1825 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
|
1826 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
|
1827 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
|
1828 XFRAME (frame)->resy); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1829 ASET (v, 2, make_number (point)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1830 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
|
1831 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
|
1832 spacing = Ffont_get (font, QCspacing); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1833 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
|
1834 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
|
1835 ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1836 |
| 24995 | 1837 result = Fcons (v, result); |
| 1838 } | |
| 1839 | |
| 1840 return result; | |
| 1841 } | |
| 1842 | |
| 1843 | |
| 1844 DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list, | |
| 1845 0, 1, 0, | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1846 doc: /* Return a list of available font families on FRAME. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1847 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
|
1848 Value is a list of conses (FAMILY . FIXED-P) where FAMILY |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1849 is a font family, and FIXED-P is non-nil if fonts of that family |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1850 are fixed-pitch. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1851 (frame) |
| 24995 | 1852 Lisp_Object frame; |
| 1853 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1854 return Ffont_family_list (frame); |
| 24995 | 1855 } |
| 1856 | |
| 1857 | |
| 1858 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
|
1859 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
|
1860 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
|
1861 the same size as FACE on FRAME. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1862 PATTERN is a string, perhaps with wildcard characters; |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1863 the * character matches any substring, and |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1864 the ? character matches any single character. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1865 PATTERN is case-insensitive. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1866 FACE is a face name--a symbol. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1867 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1868 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
|
1869 `set-face-font'. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1870 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1871 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
|
1872 even if they match PATTERN and FACE. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1873 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
|
1874 fonts to match. The first MAXIMUM fonts are reported. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1875 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
|
1876 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
|
1877 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
|
1878 (pattern, face, frame, maximum, width) |
| 24995 | 1879 Lisp_Object pattern, face, frame, maximum, width; |
| 1880 { | |
| 1881 struct frame *f; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1882 int size, avgwidth; |
| 24995 | 1883 |
| 1884 check_x (); | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1885 CHECK_STRING (pattern); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1886 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1887 if (! NILP (maximum)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1888 CHECK_NATNUM (maximum); |
| 24995 | 1889 |
| 1890 if (!NILP (width)) | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1891 CHECK_NUMBER (width); |
| 24995 | 1892 |
| 1893 /* We can't simply call check_x_frame because this function may be | |
| 1894 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
|
1895 if (NILP (frame)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1896 frame = selected_frame; |
| 24995 | 1897 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
|
1898 if (! FRAME_WINDOW_P (f)) |
| 24995 | 1899 { |
| 1900 /* Perhaps we have not yet created any frame. */ | |
| 1901 f = NULL; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1902 frame = Qnil; |
| 24995 | 1903 face = Qnil; |
| 1904 } | |
| 1905 | |
| 1906 /* Determine the width standard for comparison with the fonts we find. */ | |
| 1907 | |
| 1908 if (NILP (face)) | |
| 1909 size = 0; | |
| 1910 else | |
| 1911 { | |
| 1912 /* This is of limited utility since it works with character | |
| 1913 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
|
1914 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
|
1915 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
|
1916 ? NULL |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1917 : 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
|
1918 |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1919 if (face && face->font) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1920 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1921 size = face->font->pixel_size; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1922 avgwidth = face->font->average_width; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1923 } |
| 24995 | 1924 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1925 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1926 size = FRAME_FONT (f)->pixel_size; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1927 avgwidth = FRAME_FONT (f)->average_width; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1928 } |
| 24995 | 1929 if (!NILP (width)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1930 avgwidth *= XINT (width); |
| 24995 | 1931 } |
| 1932 | |
| 1933 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1934 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
|
1935 Lisp_Object args[2], tail; |
| 24995 | 1936 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1937 font_spec = font_spec_from_name (pattern); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1938 if (size) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1939 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1940 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
|
1941 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
|
1942 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1943 args[0] = Flist_fonts (font_spec, frame, maximum, Qnil); |
|
95373
4ab9c6d31251
(Fx_list_fonts): Make it return a list of font names.
Kenichi Handa <handa@m17n.org>
parents:
95294
diff
changeset
|
1944 for (tail = args[0]; CONSP (tail); tail = XCDR (tail)) |
|
4ab9c6d31251
(Fx_list_fonts): Make it return a list of font names.
Kenichi Handa <handa@m17n.org>
parents:
95294
diff
changeset
|
1945 XSETCAR (tail, Ffont_xlfd_name (XCAR (tail), Qnil)); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1946 if (NILP (frame)) |
| 24995 | 1947 /* We don't have to check fontsets. */ |
| 1948 return args[0]; | |
| 1949 args[1] = list_fontsets (f, pattern, size); | |
| 1950 return Fnconc (2, args); | |
| 1951 } | |
| 1952 } | |
| 1953 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1954 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1955 |
| 1956 | |
| 1957 | |
| 1958 /*********************************************************************** | |
| 1959 Lisp Faces | |
| 1960 ***********************************************************************/ | |
| 1961 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1962 /* 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
|
1963 |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1964 #define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1965 #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
|
1966 #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
|
1967 #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
|
1968 #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
|
1969 #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
|
1970 #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
|
1971 #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
|
1972 #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
|
1973 #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
|
1974 #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
|
1975 #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
|
1976 #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
|
1977 #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
|
1978 #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
|
1979 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
1980 #define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) |
| 24995 | 1981 |
| 1982 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
| 1983 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
| 1984 | |
| 1985 #define LFACEP(LFACE) \ | |
| 1986 (VECTORP (LFACE) \ | |
| 1987 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1988 && EQ (AREF (LFACE, 0), Qface)) |
| 24995 | 1989 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1990 |
| 24995 | 1991 #if GLYPH_DEBUG |
| 1992 | |
| 1993 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
| 1994 | |
| 1995 static void | |
| 1996 check_lface_attrs (attrs) | |
| 1997 Lisp_Object *attrs; | |
| 1998 { | |
| 1999 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2000 || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX]) |
| 24995 | 2001 || STRINGP (attrs[LFACE_FAMILY_INDEX])); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2002 xassert (UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX]) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2003 || IGNORE_DEFFACE_P (attrs[LFACE_FOUNDRY_INDEX]) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2004 || STRINGP (attrs[LFACE_FOUNDRY_INDEX])); |
| 24995 | 2005 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2006 || IGNORE_DEFFACE_P (attrs[LFACE_SWIDTH_INDEX]) |
| 24995 | 2007 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); |
| 2008 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2009 || IGNORE_DEFFACE_P (attrs[LFACE_HEIGHT_INDEX]) |
| 31178 | 2010 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
| 2011 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
| 2012 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
| 24995 | 2013 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2014 || IGNORE_DEFFACE_P (attrs[LFACE_WEIGHT_INDEX]) |
| 24995 | 2015 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); |
| 2016 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2017 || IGNORE_DEFFACE_P (attrs[LFACE_SLANT_INDEX]) |
| 24995 | 2018 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); |
| 2019 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2020 || IGNORE_DEFFACE_P (attrs[LFACE_UNDERLINE_INDEX]) |
| 24995 | 2021 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) |
| 2022 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
| 2023 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2024 || IGNORE_DEFFACE_P (attrs[LFACE_OVERLINE_INDEX]) |
| 24995 | 2025 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) |
| 2026 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
| 2027 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2028 || IGNORE_DEFFACE_P (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
| 24995 | 2029 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
| 2030 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
| 2031 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2032 || IGNORE_DEFFACE_P (attrs[LFACE_BOX_INDEX]) |
| 24995 | 2033 || SYMBOLP (attrs[LFACE_BOX_INDEX]) |
| 2034 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
| 2035 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
| 2036 || CONSP (attrs[LFACE_BOX_INDEX])); | |
| 2037 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2038 || IGNORE_DEFFACE_P (attrs[LFACE_INVERSE_INDEX]) |
| 24995 | 2039 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); |
| 2040 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2041 || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX]) |
| 24995 | 2042 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); |
| 2043 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2044 || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX]) |
| 24995 | 2045 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); |
| 31178 | 2046 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2047 || IGNORE_DEFFACE_P (attrs[LFACE_INHERIT_INDEX]) |
| 31178 | 2048 || NILP (attrs[LFACE_INHERIT_INDEX]) |
| 2049 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
| 2050 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
| 24995 | 2051 #ifdef HAVE_WINDOW_SYSTEM |
| 2052 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2053 || IGNORE_DEFFACE_P (attrs[LFACE_STIPPLE_INDEX]) |
| 24995 | 2054 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
2055 || !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
|
2056 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2057 || 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
|
2058 || FONTP (attrs[LFACE_FONT_INDEX])); |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2059 xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2060 || STRINGP (attrs[LFACE_FONTSET_INDEX])); |
| 24995 | 2061 #endif |
| 2062 } | |
| 2063 | |
| 2064 | |
| 2065 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
| 2066 | |
| 2067 static void | |
| 2068 check_lface (lface) | |
| 2069 Lisp_Object lface; | |
| 2070 { | |
| 2071 if (!NILP (lface)) | |
| 2072 { | |
| 2073 xassert (LFACEP (lface)); | |
| 2074 check_lface_attrs (XVECTOR (lface)->contents); | |
| 2075 } | |
| 2076 } | |
| 2077 | |
| 2078 #else /* GLYPH_DEBUG == 0 */ | |
| 2079 | |
| 2080 #define check_lface_attrs(attrs) (void) 0 | |
| 2081 #define check_lface(lface) (void) 0 | |
| 2082 | |
| 2083 #endif /* GLYPH_DEBUG == 0 */ | |
| 2084 | |
| 2085 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2086 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2087 /* 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
|
2088 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2089 enum named_merge_point_kind |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2090 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2091 NAMED_MERGE_POINT_NORMAL, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2092 NAMED_MERGE_POINT_REMAP |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2093 }; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2094 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2095 /* 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
|
2096 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
|
2097 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
|
2098 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
|
2099 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
|
2100 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
|
2101 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
|
2102 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2103 Lisp_Object face_name; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2104 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
|
2105 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
|
2106 }; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2107 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2108 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2109 /* 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
|
2110 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
|
2111 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
|
2112 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
|
2113 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2114 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
|
2115 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
|
2116 Lisp_Object face_name, |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2117 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
|
2118 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
|
2119 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2120 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
|
2121 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2122 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
|
2123 if (EQ (face_name, prev->face_name)) |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2124 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2125 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
|
2126 /* A cycle, so fail. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2127 return 0; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2128 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
|
2129 /* A remap `hides ' any previous normal merge points |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2130 (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
|
2131 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
|
2132 can just assume it's OK. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2133 break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2134 } |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2135 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2136 new_named_merge_point->face_name = face_name; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2137 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
|
2138 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
|
2139 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2140 *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
|
2141 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2142 return 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2143 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2144 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2145 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2146 |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2147 #if 0 /* Seems to be unused. */ |
|
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2148 static Lisp_Object |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2149 internal_resolve_face_name (nargs, args) |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2150 int nargs; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2151 Lisp_Object *args; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2152 { |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2153 return Fget (args[0], args[1]); |
|
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2154 } |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2155 |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2156 static Lisp_Object |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2157 resolve_face_name_error (ignore) |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2158 Lisp_Object ignore; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2159 { |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2160 return Qnil; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2161 } |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2162 #endif |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2163 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2164 /* 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
|
2165 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
|
2166 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
|
2167 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2168 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
|
2169 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2170 static Lisp_Object |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2171 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
|
2172 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
|
2173 int signal_p; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2174 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2175 Lisp_Object orig_face; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2176 Lisp_Object tortoise, hare; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2177 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2178 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
|
2179 face_name = intern (SDATA (face_name)); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2180 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2181 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
|
2182 return face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2183 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2184 orig_face = face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2185 tortoise = hare = face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2186 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2187 while (1) |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2188 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2189 face_name = hare; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2190 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
|
2191 if (NILP (hare) || !SYMBOLP (hare)) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2192 break; |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2193 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2194 face_name = hare; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2195 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
|
2196 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
|
2197 break; |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2198 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2199 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
|
2200 if (EQ (hare, tortoise)) |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2201 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2202 if (signal_p) |
|
71992
760807463226
* xfaces.c (signal_error): Move to eval.c.
Kim F. Storm <storm@cua.dk>
parents:
71845
diff
changeset
|
2203 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
|
2204 return Qdefault; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2205 } |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2206 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2207 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2208 return face_name; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2209 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2210 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2211 |
| 24995 | 2212 /* 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
|
2213 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
|
2214 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
|
2215 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
|
2216 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
|
2217 is zero, value is nil if FACE_NAME is not a valid face name. */ |
| 24995 | 2218 static INLINE Lisp_Object |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2219 lface_from_face_name_no_resolve (f, face_name, signal_p) |
| 24995 | 2220 struct frame *f; |
| 2221 Lisp_Object face_name; | |
| 2222 int signal_p; | |
| 2223 { | |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2224 Lisp_Object lface; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2225 |
| 24995 | 2226 if (f) |
| 2227 lface = assq_no_quit (face_name, f->face_alist); | |
| 2228 else | |
| 2229 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
| 2230 | |
| 2231 if (CONSP (lface)) | |
| 2232 lface = XCDR (lface); | |
| 2233 else if (signal_p) | |
| 2234 signal_error ("Invalid face", face_name); | |
| 2235 | |
| 2236 check_lface (lface); | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2237 |
| 24995 | 2238 return lface; |
| 2239 } | |
| 2240 | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2241 /* 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
|
2242 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
|
2243 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
|
2244 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
|
2245 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
|
2246 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
|
2247 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
|
2248 name. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2249 static INLINE Lisp_Object |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2250 lface_from_face_name (f, face_name, signal_p) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2251 struct frame *f; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2252 Lisp_Object face_name; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2253 int signal_p; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2254 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2255 face_name = resolve_face_name (face_name, signal_p); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2256 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
|
2257 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2258 |
| 24995 | 2259 |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2260 /* 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
|
2261 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
|
2262 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
|
2263 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
|
2264 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
|
2265 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2266 static INLINE int |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2267 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
|
2268 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
|
2269 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
|
2270 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
|
2271 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
|
2272 { |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2273 Lisp_Object lface; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2274 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2275 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
|
2276 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2277 if (! NILP (lface)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2278 bcopy (XVECTOR (lface)->contents, attrs, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2279 LFACE_VECTOR_SIZE * sizeof *attrs); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2280 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2281 return !NILP (lface); |
|
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 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2284 /* 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
|
2285 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
|
2286 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
|
2287 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
|
2288 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
|
2289 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
|
2290 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2291 static INLINE int |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2292 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
|
2293 struct frame *f; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2294 Lisp_Object face_name; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2295 Lisp_Object *attrs; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2296 int signal_p; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2297 struct named_merge_point *named_merge_points; |
|
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 Lisp_Object face_remapping; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2300 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2301 face_name = resolve_face_name (face_name, signal_p); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2302 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2303 /* 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
|
2304 is done buffer-locally). */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2305 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
|
2306 if (CONSP (face_remapping)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2307 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2308 struct named_merge_point named_merge_point; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2309 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2310 if (push_named_merge_point (&named_merge_point, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2311 face_name, NAMED_MERGE_POINT_REMAP, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2312 &named_merge_points)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2313 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2314 int i; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2315 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2316 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2317 attrs[i] = Qunspecified; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2318 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2319 return merge_face_ref (f, XCDR (face_remapping), attrs, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2320 signal_p, named_merge_points); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2321 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2322 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2323 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2324 /* Default case, no remapping. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2325 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
|
2326 } |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2327 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2328 |
| 24995 | 2329 /* Non-zero if all attributes in face attribute vector ATTRS are |
| 2330 specified, i.e. are non-nil. */ | |
| 2331 | |
| 2332 static int | |
| 2333 lface_fully_specified_p (attrs) | |
| 2334 Lisp_Object *attrs; | |
| 2335 { | |
| 2336 int i; | |
| 2337 | |
| 2338 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
|
2339 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2340 if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i])) |
|
53274
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
2341 #ifdef MAC_OS |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
2342 /* MAC_TODO: No stipple support on Mac OS yet, this index is |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
2343 always unspecified. */ |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
2344 && i != LFACE_STIPPLE_INDEX |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
2345 #endif |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
2346 ) |
|
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
2347 break; |
| 24995 | 2348 |
| 2349 return i == LFACE_VECTOR_SIZE; | |
| 2350 } | |
| 2351 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2352 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 2353 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2354 /* 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
|
2355 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
|
2356 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
|
2357 of FORCE_P. */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2358 |
| 24995 | 2359 static int |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2360 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
|
2361 struct frame *f; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2362 Lisp_Object lface, font_object; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2363 int force_p; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2364 { |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2365 Lisp_Object val; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2366 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
|
2367 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2368 /* 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
|
2369 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
|
2370 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
|
2371 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2372 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
|
2373 { |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2374 Lisp_Object family = AREF (font_object, FONT_FAMILY_INDEX); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2375 |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2376 LFACE_FAMILY (lface) = SYMBOL_NAME (family); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2377 } |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2378 |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2379 if (force_p || UNSPECIFIEDP (LFACE_FOUNDRY (lface))) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2380 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2381 Lisp_Object foundry = AREF (font_object, FONT_FOUNDRY_INDEX); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2382 |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2383 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
|
2384 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2385 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2386 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
|
2387 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2388 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
|
2389 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2390 xassert (pt > 0); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2391 LFACE_HEIGHT (lface) = make_number (pt); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2392 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2393 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2394 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
|
2395 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2396 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
|
2397 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
|
2398 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2399 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
|
2400 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2401 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
|
2402 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
|
2403 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2404 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
|
2405 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2406 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
|
2407 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
|
2408 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2409 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2410 LFACE_FONT (lface) = font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2411 return 1; |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2412 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2413 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2414 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 2415 |
| 2416 | |
| 31178 | 2417 /* Merges the face height FROM with the face height TO, and returns the |
| 2418 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
|
2419 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
|
2420 `relative' heights; the returned value is always an absolute height |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2421 unless both FROM and TO are relative. GCPRO is a lisp value that |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2422 will be protected from garbage-collection if this function makes a |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2423 call into lisp. */ |
| 31178 | 2424 |
| 2425 Lisp_Object | |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2426 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
|
2427 Lisp_Object from, to, invalid; |
| 31178 | 2428 { |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2429 Lisp_Object result = invalid; |
| 31178 | 2430 |
| 2431 if (INTEGERP (from)) | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2432 /* 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
|
2433 result = from; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2434 else if (FLOATP (from)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2435 /* 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
|
2436 { |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2437 if (INTEGERP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2438 /* relative X absolute => absolute */ |
|
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
2439 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
|
2440 else if (FLOATP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2441 /* relative X relative => relative */ |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2442 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
|
2443 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
|
2444 result = from; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2445 } |
| 31178 | 2446 else if (FUNCTIONP (from)) |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2447 /* FROM is a function, which use to adjust TO. */ |
| 31178 | 2448 { |
| 2449 /* Call function with current height as argument. | |
| 2450 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
|
2451 Lisp_Object args[2]; |
| 31178 | 2452 |
| 2453 args[0] = from; | |
| 2454 args[1] = to; | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2455 result = safe_call (2, args); |
| 31178 | 2456 |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2457 /* 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
|
2458 if (INTEGERP (to) && !INTEGERP (result)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2459 result = invalid; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2460 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2461 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2462 return result; |
| 31178 | 2463 } |
| 2464 | |
| 2465 | |
| 2466 /* 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
|
2467 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
|
2468 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
|
2469 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
|
2470 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
|
2471 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
|
2472 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
|
2473 other places. */ |
| 24995 | 2474 |
| 2475 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
|
2476 merge_face_vectors (f, from, to, named_merge_points) |
| 31178 | 2477 struct frame *f; |
| 24995 | 2478 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
|
2479 struct named_merge_point *named_merge_points; |
| 24995 | 2480 { |
| 2481 int i; | |
| 31178 | 2482 |
| 2483 /* If FROM inherits from some other faces, merge their attributes into | |
| 2484 TO before merging FROM's direct attributes. Note that an :inherit | |
| 2485 attribute of `unspecified' is the same as one of nil; we never | |
| 2486 merge :inherit attributes, so nil is more correct, but lots of | |
| 2487 other code uses `unspecified' as a generic value for face attributes. */ | |
| 2488 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
| 2489 && !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
|
2490 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
| 31178 | 2491 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2492 i = LFACE_FONT_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2493 if (!UNSPECIFIEDP (from[i])) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2494 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2495 if (!UNSPECIFIEDP (to[i])) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2496 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
|
2497 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2498 to[i] = Fcopy_font_spec (from[i]); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2499 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
|
2500 } |
| 31221 | 2501 |
| 24995 | 2502 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
| 2503 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
|
2504 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2505 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
|
2506 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2507 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
|
2508 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
|
2509 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2510 else if (i != LFACE_FONT_INDEX) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2511 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2512 to[i] = from[i]; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2513 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
|
2514 font_clear_prop (to, |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2515 (i == LFACE_FAMILY_INDEX ? FONT_FAMILY_INDEX |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2516 : 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
|
2517 : 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
|
2518 : 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
|
2519 : 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
|
2520 : FONT_SLANT_INDEX)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2521 } |
|
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2522 } |
| 31178 | 2523 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2524 /* If `font' attribute is specified, reflect the font properties in |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2525 it to the other attributes. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2526 if (0 && !UNSPECIFIEDP (to[LFACE_FONT_INDEX])) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2527 font_update_lface (f, to); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2528 |
| 31178 | 2529 /* TO is always an absolute face, which should inherit from nothing. |
| 2530 We blindly copy the :inherit attribute above and fix it up here. */ | |
| 2531 to[LFACE_INHERIT_INDEX] = Qnil; | |
| 2532 } | |
| 2533 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2534 /* 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
|
2535 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
|
2536 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
|
2537 merging succeeded. */ |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2538 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2539 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2540 merge_named_face (f, face_name, to, named_merge_points) |
| 31178 | 2541 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
|
2542 Lisp_Object face_name; |
| 31178 | 2543 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
|
2544 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
|
2545 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2546 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
|
2547 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2548 if (push_named_merge_point (&named_merge_point, |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2549 face_name, NAMED_MERGE_POINT_NORMAL, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2550 &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
|
2551 { |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2552 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
|
2553 Lisp_Object from[LFACE_VECTOR_SIZE]; |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2554 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
|
2555 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2556 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
|
2557 { |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2558 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
|
2559 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
|
2560 UNGCPRO; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2561 } |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2562 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2563 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
|
2564 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2565 else |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2566 return 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2567 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2568 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2569 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2570 /* 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
|
2571 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
|
2572 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
|
2573 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
|
2574 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
|
2575 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
|
2576 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2577 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
|
2578 specifications. Each face specification can be: |
| 24995 | 2579 |
| 2580 1. A symbol or string naming a Lisp face. | |
| 2581 | |
| 2582 2. A property list of the form (KEYWORD VALUE ...) where each | |
| 2583 KEYWORD is a face attribute name, and value is an appropriate value | |
| 2584 for that attribute. | |
| 2585 | |
| 2586 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
| 2587 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
| 2588 for compatibility with 20.2. | |
| 2589 | |
| 2590 Face specifications earlier in lists take precedence over later | |
| 2591 specifications. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2592 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2593 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2594 merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) |
| 24995 | 2595 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
|
2596 Lisp_Object face_ref; |
| 24995 | 2597 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
|
2598 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
|
2599 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
|
2600 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2601 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
|
2602 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2603 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
|
2604 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2605 Lisp_Object first = XCAR (face_ref); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2606 |
| 24995 | 2607 if (EQ (first, Qforeground_color) |
| 2608 || EQ (first, Qbackground_color)) | |
| 2609 { | |
| 2610 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
| 2611 . 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
|
2612 Lisp_Object color_name = XCDR (face_ref); |
| 24995 | 2613 Lisp_Object color = first; |
| 2614 | |
| 2615 if (STRINGP (color_name)) | |
| 2616 { | |
| 2617 if (EQ (color, Qforeground_color)) | |
| 2618 to[LFACE_FOREGROUND_INDEX] = color_name; | |
| 2619 else | |
| 2620 to[LFACE_BACKGROUND_INDEX] = color_name; | |
| 2621 } | |
| 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 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2624 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
|
2625 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
|
2626 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2627 } |
| 24995 | 2628 } |
| 2629 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
|
2630 && *SDATA (SYMBOL_NAME (first)) == ':') |
| 24995 | 2631 { |
| 2632 /* 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
|
2633 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
| 24995 | 2634 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2635 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
|
2636 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
|
2637 int err = 0; |
| 24995 | 2638 |
|
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2639 /* 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
|
2640 if (EQ (value, Qunspecified)) |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2641 ; |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2642 else if (EQ (keyword, QCfamily)) |
| 24995 | 2643 { |
| 2644 if (STRINGP (value)) | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2645 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2646 to[LFACE_FAMILY_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2647 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
|
2648 } |
| 24995 | 2649 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2650 err = 1; |
| 24995 | 2651 } |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2652 else if (EQ (keyword, QCfoundry)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2653 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2654 if (STRINGP (value)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2655 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2656 to[LFACE_FOUNDRY_INDEX] = value; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2657 font_clear_prop (to, FONT_FOUNDRY_INDEX); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2658 } |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2659 else |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2660 err = 1; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2661 } |
| 24995 | 2662 else if (EQ (keyword, QCheight)) |
| 2663 { | |
| 31178 | 2664 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
|
2665 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
| 31178 | 2666 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2667 if (! NILP (new_height)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2668 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2669 to[LFACE_HEIGHT_INDEX] = new_height; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2670 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
|
2671 } |
| 24995 | 2672 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2673 err = 1; |
| 24995 | 2674 } |
| 2675 else if (EQ (keyword, QCweight)) | |
| 2676 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2677 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
|
2678 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2679 to[LFACE_WEIGHT_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2680 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
|
2681 } |
| 24995 | 2682 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2683 err = 1; |
| 24995 | 2684 } |
| 2685 else if (EQ (keyword, QCslant)) | |
| 2686 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2687 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
|
2688 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2689 to[LFACE_SLANT_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2690 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
|
2691 } |
| 24995 | 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, QCunderline)) | |
| 2696 { | |
| 2697 if (EQ (value, Qt) | |
| 2698 || NILP (value) | |
| 2699 || STRINGP (value)) | |
| 2700 to[LFACE_UNDERLINE_INDEX] = value; | |
| 2701 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2702 err = 1; |
| 24995 | 2703 } |
| 2704 else if (EQ (keyword, QCoverline)) | |
| 2705 { | |
| 2706 if (EQ (value, Qt) | |
| 2707 || NILP (value) | |
| 2708 || STRINGP (value)) | |
| 2709 to[LFACE_OVERLINE_INDEX] = value; | |
| 2710 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2711 err = 1; |
| 24995 | 2712 } |
| 2713 else if (EQ (keyword, QCstrike_through)) | |
| 2714 { | |
| 2715 if (EQ (value, Qt) | |
| 2716 || NILP (value) | |
| 2717 || STRINGP (value)) | |
| 2718 to[LFACE_STRIKE_THROUGH_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, QCbox)) | |
| 2723 { | |
| 2724 if (EQ (value, Qt)) | |
| 2725 value = make_number (1); | |
| 2726 if (INTEGERP (value) | |
| 2727 || STRINGP (value) | |
| 2728 || CONSP (value) | |
| 2729 || NILP (value)) | |
| 2730 to[LFACE_BOX_INDEX] = value; | |
| 2731 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2732 err = 1; |
| 24995 | 2733 } |
| 2734 else if (EQ (keyword, QCinverse_video) | |
| 2735 || EQ (keyword, QCreverse_video)) | |
| 2736 { | |
| 2737 if (EQ (value, Qt) || NILP (value)) | |
| 2738 to[LFACE_INVERSE_INDEX] = value; | |
| 2739 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2740 err = 1; |
| 24995 | 2741 } |
| 2742 else if (EQ (keyword, QCforeground)) | |
| 2743 { | |
| 2744 if (STRINGP (value)) | |
| 2745 to[LFACE_FOREGROUND_INDEX] = value; | |
| 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 } |
| 2749 else if (EQ (keyword, QCbackground)) | |
| 2750 { | |
| 2751 if (STRINGP (value)) | |
| 2752 to[LFACE_BACKGROUND_INDEX] = value; | |
| 2753 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2754 err = 1; |
| 24995 | 2755 } |
| 2756 else if (EQ (keyword, QCstipple)) | |
| 2757 { | |
| 2758 #ifdef HAVE_X_WINDOWS | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
2759 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
| 24995 | 2760 if (!NILP (pixmap_p)) |
| 2761 to[LFACE_STIPPLE_INDEX] = value; | |
| 2762 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2763 err = 1; |
| 24995 | 2764 #endif |
| 2765 } | |
| 2766 else if (EQ (keyword, QCwidth)) | |
| 2767 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2768 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
|
2769 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2770 to[LFACE_SWIDTH_INDEX] = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2771 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
|
2772 } |
| 24995 | 2773 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2774 err = 1; |
| 24995 | 2775 } |
| 31178 | 2776 else if (EQ (keyword, QCinherit)) |
| 2777 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2778 /* This is 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
|
2779 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
|
2780 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
|
2781 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
|
2782 err = 1; |
| 31178 | 2783 } |
| 24995 | 2784 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2785 err = 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2786 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2787 if (err) |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2788 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2789 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
|
2790 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2791 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2792 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2793 face_ref = XCDR (XCDR (face_ref)); |
| 24995 | 2794 } |
| 2795 } | |
| 2796 else | |
| 2797 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2798 /* 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
|
2799 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
|
2800 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
|
2801 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
|
2802 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2803 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
|
2804 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
|
2805 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2806 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
|
2807 ok = 0; |
| 24995 | 2808 } |
| 2809 } | |
| 2810 else | |
| 2811 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2812 /* 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
|
2813 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
|
2814 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
|
2815 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
|
2816 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2817 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2818 return ok; |
| 24995 | 2819 } |
| 2820 | |
| 2821 | |
| 2822 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
| 2823 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
|
2824 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
|
2825 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
|
2826 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
|
2827 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
|
2828 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
|
2829 (face, frame) |
| 24995 | 2830 Lisp_Object face, frame; |
| 2831 { | |
| 2832 Lisp_Object global_lface, lface; | |
| 2833 struct frame *f; | |
| 2834 int i; | |
| 2835 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2836 CHECK_SYMBOL (face); |
| 24995 | 2837 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
|
2838 |
| 24995 | 2839 if (!NILP (frame)) |
| 2840 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2841 CHECK_LIVE_FRAME (frame); |
| 24995 | 2842 f = XFRAME (frame); |
| 2843 lface = lface_from_face_name (f, face, 0); | |
| 2844 } | |
| 2845 else | |
| 2846 f = NULL, lface = Qnil; | |
| 2847 | |
| 2848 /* Add a global definition if there is none. */ | |
| 2849 if (NILP (global_lface)) | |
| 2850 { | |
| 2851 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 2852 Qunspecified); | |
|
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2853 ASET (global_lface, 0, Qface); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2854 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
| 24995 | 2855 Vface_new_frame_defaults); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2856 |
| 24995 | 2857 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
| 2858 face id to Lisp face is given by the vector lface_id_to_name. | |
| 2859 The mapping from Lisp face to Lisp face id is given by the | |
| 2860 property `face' of the Lisp face name. */ | |
| 2861 if (next_lface_id == lface_id_to_name_size) | |
| 2862 { | |
| 2863 int new_size = max (50, 2 * lface_id_to_name_size); | |
| 2864 int sz = new_size * sizeof *lface_id_to_name; | |
| 2865 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
| 2866 lface_id_to_name_size = new_size; | |
| 2867 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2868 |
| 24995 | 2869 lface_id_to_name[next_lface_id] = face; |
| 2870 Fput (face, Qface, make_number (next_lface_id)); | |
| 2871 ++next_lface_id; | |
| 2872 } | |
| 2873 else if (f == NULL) | |
| 2874 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
|
2875 ASET (global_lface, i, Qunspecified); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2876 |
| 24995 | 2877 /* Add a frame-local definition. */ |
| 2878 if (f) | |
| 2879 { | |
| 2880 if (NILP (lface)) | |
| 2881 { | |
| 2882 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 2883 Qunspecified); | |
|
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2884 ASET (lface, 0, Qface); |
| 24995 | 2885 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
| 2886 } | |
| 2887 else | |
| 2888 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
|
2889 ASET (lface, i, Qunspecified); |
| 24995 | 2890 } |
| 2891 else | |
| 2892 lface = global_lface; | |
| 2893 | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2894 /* 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
|
2895 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
|
2896 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
|
2897 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
|
2898 init_iterator will then free realized faces. */ |
| 57107 | 2899 if (NILP (Fget (face, Qface_no_inherit))) |
| 2900 { | |
| 2901 ++face_change_count; | |
| 2902 ++windows_or_buffers_changed; | |
| 2903 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2904 |
| 24995 | 2905 xassert (LFACEP (lface)); |
| 2906 check_lface (lface); | |
| 2907 return lface; | |
| 2908 } | |
| 2909 | |
| 2910 | |
| 2911 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
| 2912 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
|
2913 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
|
2914 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
|
2915 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
|
2916 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
|
2917 (face, frame) |
| 24995 | 2918 Lisp_Object face, frame; |
| 2919 { | |
| 2920 Lisp_Object lface; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2921 |
|
81146
8f50479e40d1
(Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents:
77903
diff
changeset
|
2922 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
|
2923 |
| 24995 | 2924 if (!NILP (frame)) |
| 2925 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2926 CHECK_LIVE_FRAME (frame); |
| 24995 | 2927 lface = lface_from_face_name (XFRAME (frame), face, 0); |
| 2928 } | |
| 2929 else | |
| 2930 lface = lface_from_face_name (NULL, face, 0); | |
| 2931 | |
| 2932 return lface; | |
| 2933 } | |
| 2934 | |
| 2935 | |
| 2936 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
| 2937 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
|
2938 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
|
2939 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
|
2940 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
|
2941 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
|
2942 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
|
2943 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
|
2944 |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2945 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
|
2946 (from, to, frame, new_frame) |
| 24995 | 2947 Lisp_Object from, to, frame, new_frame; |
| 2948 { | |
| 2949 Lisp_Object lface, copy; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2950 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2951 CHECK_SYMBOL (from); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2952 CHECK_SYMBOL (to); |
| 24995 | 2953 |
| 2954 if (EQ (frame, Qt)) | |
| 2955 { | |
| 2956 /* Copy global definition of FROM. We don't make copies of | |
| 2957 strings etc. because 20.2 didn't do it either. */ | |
| 2958 lface = lface_from_face_name (NULL, from, 1); | |
| 2959 copy = Finternal_make_lisp_face (to, Qnil); | |
| 2960 } | |
| 2961 else | |
| 2962 { | |
| 2963 /* 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
|
2964 if (NILP (new_frame)) |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2965 new_frame = frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2966 CHECK_LIVE_FRAME (frame); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2967 CHECK_LIVE_FRAME (new_frame); |
| 24995 | 2968 lface = lface_from_face_name (XFRAME (frame), from, 1); |
| 2969 copy = Finternal_make_lisp_face (to, new_frame); | |
| 2970 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2971 |
| 24995 | 2972 bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents, |
| 2973 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2974 |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2975 /* 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
|
2976 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
|
2977 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
|
2978 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
|
2979 init_iterator will then free realized faces. */ |
| 57107 | 2980 if (NILP (Fget (to, Qface_no_inherit))) |
| 2981 { | |
| 2982 ++face_change_count; | |
| 2983 ++windows_or_buffers_changed; | |
| 2984 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2985 |
| 24995 | 2986 return to; |
| 2987 } | |
| 2988 | |
| 2989 | |
| 2990 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
| 2991 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
|
2992 doc: /* Set attribute ATTR of FACE to VALUE. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2993 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
|
2994 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
|
2995 FRAME t means change the default for new frames. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2996 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
|
2997 for new frames. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2998 (face, attr, value, frame) |
| 24995 | 2999 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
|
3000 { |
| 24995 | 3001 Lisp_Object lface; |
| 3002 Lisp_Object old_value = Qnil; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3003 /* 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
|
3004 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
|
3005 enum font_property_index prop_index = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3006 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3007 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3008 CHECK_SYMBOL (attr); |
| 24995 | 3009 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
3010 face = resolve_face_name (face, 1); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3011 |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3012 /* 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
|
3013 default for new frames. */ |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3014 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
|
3015 { |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3016 Lisp_Object tail; |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3017 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
|
3018 FOR_EACH_FRAME (tail, frame) |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3019 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
|
3020 return face; |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3021 } |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3022 |
| 24995 | 3023 /* Set lface to the Lisp attribute vector of FACE. */ |
| 3024 if (EQ (frame, Qt)) | |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3025 { |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3026 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
|
3027 |
|
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3028 /* 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
|
3029 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
|
3030 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
|
3031 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
|
3032 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
|
3033 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
|
3034 if (UNSPECIFIEDP (value)) |
|
67056
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3035 value = Qignore_defface; |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3036 } |
| 24995 | 3037 else |
| 3038 { | |
| 3039 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3040 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3041 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3042 CHECK_LIVE_FRAME (frame); |
| 24995 | 3043 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
|
3044 |
| 24995 | 3045 /* If a frame-local face doesn't exist yet, create one. */ |
| 3046 if (NILP (lface)) | |
| 3047 lface = Finternal_make_lisp_face (face, frame); | |
| 3048 } | |
| 3049 | |
| 3050 if (EQ (attr, QCfamily)) | |
| 3051 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3052 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3053 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3054 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
|
3055 if (SCHARS (value) == 0) |
| 24995 | 3056 signal_error ("Invalid face family", value); |
| 3057 } | |
| 3058 old_value = LFACE_FAMILY (lface); | |
| 3059 LFACE_FAMILY (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3060 prop_index = FONT_FAMILY_INDEX; |
| 24995 | 3061 } |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3062 else if (EQ (attr, QCfoundry)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3063 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3064 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3065 { |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3066 CHECK_STRING (value); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3067 if (SCHARS (value) == 0) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3068 signal_error ("Invalid face foundry", value); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3069 } |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3070 old_value = LFACE_FOUNDRY (lface); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3071 LFACE_FOUNDRY (lface) = value; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3072 prop_index = FONT_FOUNDRY_INDEX; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3073 } |
| 24995 | 3074 else if (EQ (attr, QCheight)) |
| 3075 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3076 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3077 { |
|
40023
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3078 Lisp_Object test; |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3079 |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3080 test = (EQ (face, Qdefault) |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3081 ? value |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3082 /* The default face must have an absolute size, |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3083 otherwise, we do a test merge with a random |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3084 height to see if VALUE's ok. */ |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3085 : merge_face_heights (value, make_number (10), Qnil)); |
|
40023
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3086 |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3087 if (!INTEGERP (test) || XINT (test) <= 0) |
| 24995 | 3088 signal_error ("Invalid face height", value); |
| 3089 } | |
| 31178 | 3090 |
| 24995 | 3091 old_value = LFACE_HEIGHT (lface); |
| 3092 LFACE_HEIGHT (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3093 prop_index = FONT_SIZE_INDEX; |
| 24995 | 3094 } |
| 3095 else if (EQ (attr, QCweight)) | |
| 3096 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3097 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3098 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3099 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3100 if (FONT_WEIGHT_NAME_NUMERIC (value) < 0) |
| 24995 | 3101 signal_error ("Invalid face weight", value); |
| 3102 } | |
| 3103 old_value = LFACE_WEIGHT (lface); | |
| 3104 LFACE_WEIGHT (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3105 prop_index = FONT_WEIGHT_INDEX; |
| 24995 | 3106 } |
| 3107 else if (EQ (attr, QCslant)) | |
| 3108 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3109 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3110 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3111 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3112 if (FONT_SLANT_NAME_NUMERIC (value) < 0) |
| 24995 | 3113 signal_error ("Invalid face slant", value); |
| 3114 } | |
| 3115 old_value = LFACE_SLANT (lface); | |
| 3116 LFACE_SLANT (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3117 prop_index = FONT_SLANT_INDEX; |
| 24995 | 3118 } |
| 3119 else if (EQ (attr, QCunderline)) | |
| 3120 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3121 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3122 if ((SYMBOLP (value) |
| 3123 && !EQ (value, Qt) | |
| 3124 && !EQ (value, Qnil)) | |
| 3125 /* Underline color. */ | |
| 3126 || (STRINGP (value) | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3127 && SCHARS (value) == 0)) |
| 24995 | 3128 signal_error ("Invalid face underline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3129 |
| 24995 | 3130 old_value = LFACE_UNDERLINE (lface); |
| 3131 LFACE_UNDERLINE (lface) = value; | |
| 3132 } | |
| 3133 else if (EQ (attr, QCoverline)) | |
| 3134 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3135 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3136 if ((SYMBOLP (value) |
| 3137 && !EQ (value, Qt) | |
| 3138 && !EQ (value, Qnil)) | |
| 3139 /* Overline color. */ | |
| 3140 || (STRINGP (value) | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3141 && SCHARS (value) == 0)) |
| 24995 | 3142 signal_error ("Invalid face overline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3143 |
| 24995 | 3144 old_value = LFACE_OVERLINE (lface); |
| 3145 LFACE_OVERLINE (lface) = value; | |
| 3146 } | |
| 3147 else if (EQ (attr, QCstrike_through)) | |
| 3148 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3149 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3150 if ((SYMBOLP (value) |
| 3151 && !EQ (value, Qt) | |
| 3152 && !EQ (value, Qnil)) | |
| 3153 /* Strike-through color. */ | |
| 3154 || (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 && SCHARS (value) == 0)) |
| 24995 | 3156 signal_error ("Invalid face strike-through", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3157 |
| 24995 | 3158 old_value = LFACE_STRIKE_THROUGH (lface); |
| 3159 LFACE_STRIKE_THROUGH (lface) = value; | |
| 3160 } | |
| 3161 else if (EQ (attr, QCbox)) | |
| 3162 { | |
| 3163 int valid_p; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3164 |
| 24995 | 3165 /* Allow t meaning a simple box of width 1 in foreground color |
| 3166 of the face. */ | |
| 3167 if (EQ (value, Qt)) | |
| 3168 value = make_number (1); | |
| 3169 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3170 if (UNSPECIFIEDP (value) || IGNORE_DEFFACE_P (value)) |
| 24995 | 3171 valid_p = 1; |
| 3172 else if (NILP (value)) | |
| 3173 valid_p = 1; | |
| 3174 else if (INTEGERP (value)) | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3175 valid_p = XINT (value) != 0; |
| 24995 | 3176 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
|
3177 valid_p = SCHARS (value) > 0; |
| 24995 | 3178 else if (CONSP (value)) |
| 3179 { | |
| 3180 Lisp_Object tem; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3181 |
| 24995 | 3182 tem = value; |
| 3183 while (CONSP (tem)) | |
| 3184 { | |
| 3185 Lisp_Object k, v; | |
| 3186 | |
| 3187 k = XCAR (tem); | |
| 3188 tem = XCDR (tem); | |
| 3189 if (!CONSP (tem)) | |
| 3190 break; | |
| 3191 v = XCAR (tem); | |
| 3192 tem = XCDR (tem); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3193 |
| 24995 | 3194 if (EQ (k, QCline_width)) |
| 3195 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3196 if (!INTEGERP (v) || XINT (v) == 0) |
| 24995 | 3197 break; |
| 3198 } | |
| 3199 else if (EQ (k, QCcolor)) | |
| 3200 { | |
|
60150
ffb5cb773521
(Finternal_set_lisp_face_attribute): Allow :color property
Kim F. Storm <storm@cua.dk>
parents:
59924
diff
changeset
|
3201 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0)) |
| 24995 | 3202 break; |
| 3203 } | |
| 3204 else if (EQ (k, QCstyle)) | |
| 3205 { | |
| 3206 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
| 3207 break; | |
| 3208 } | |
| 3209 else | |
| 3210 break; | |
| 3211 } | |
| 3212 | |
| 3213 valid_p = NILP (tem); | |
| 3214 } | |
| 3215 else | |
| 3216 valid_p = 0; | |
| 3217 | |
| 3218 if (!valid_p) | |
| 3219 signal_error ("Invalid face box", value); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3220 |
| 24995 | 3221 old_value = LFACE_BOX (lface); |
| 3222 LFACE_BOX (lface) = value; | |
| 3223 } | |
| 3224 else if (EQ (attr, QCinverse_video) | |
| 3225 || EQ (attr, QCreverse_video)) | |
| 3226 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3227 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3228 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3229 CHECK_SYMBOL (value); |
| 24995 | 3230 if (!EQ (value, Qt) && !NILP (value)) |
| 3231 signal_error ("Invalid inverse-video face attribute value", value); | |
| 3232 } | |
| 3233 old_value = LFACE_INVERSE (lface); | |
| 3234 LFACE_INVERSE (lface) = value; | |
| 3235 } | |
| 3236 else if (EQ (attr, QCforeground)) | |
| 3237 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3238 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3239 { |
| 3240 /* Don't check for valid color names here because it depends | |
| 3241 on the frame (display) whether the color will be valid | |
| 3242 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
|
3243 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
|
3244 if (SCHARS (value) == 0) |
| 24995 | 3245 signal_error ("Empty foreground color value", value); |
| 3246 } | |
| 3247 old_value = LFACE_FOREGROUND (lface); | |
| 3248 LFACE_FOREGROUND (lface) = value; | |
| 3249 } | |
| 3250 else if (EQ (attr, QCbackground)) | |
| 3251 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3252 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3253 { |
| 3254 /* Don't check for valid color names here because it depends | |
| 3255 on the frame (display) whether the color will be valid | |
| 3256 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
|
3257 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
|
3258 if (SCHARS (value) == 0) |
| 24995 | 3259 signal_error ("Empty background color value", value); |
| 3260 } | |
| 3261 old_value = LFACE_BACKGROUND (lface); | |
| 3262 LFACE_BACKGROUND (lface) = value; | |
| 3263 } | |
| 3264 else if (EQ (attr, QCstipple)) | |
| 3265 { | |
| 3266 #ifdef HAVE_X_WINDOWS | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3267 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
| 24995 | 3268 && !NILP (value) |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3269 && NILP (Fbitmap_spec_p (value))) |
| 24995 | 3270 signal_error ("Invalid stipple attribute", value); |
| 3271 old_value = LFACE_STIPPLE (lface); | |
| 3272 LFACE_STIPPLE (lface) = value; | |
| 3273 #endif /* HAVE_X_WINDOWS */ | |
| 3274 } | |
| 3275 else if (EQ (attr, QCwidth)) | |
| 3276 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3277 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3278 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3279 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3280 if (FONT_WIDTH_NAME_NUMERIC (value) < 0) |
| 24995 | 3281 signal_error ("Invalid face width", value); |
| 3282 } | |
| 3283 old_value = LFACE_SWIDTH (lface); | |
| 3284 LFACE_SWIDTH (lface) = value; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3285 prop_index = FONT_WIDTH_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3286 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3287 else if (EQ (attr, QCfont)) |
| 24995 | 3288 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3289 #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
|
3290 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
|
3291 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3292 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
|
3293 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3294 FRAME_PTR f; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3295 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3296 old_value = LFACE_FONT (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3297 if (! FONTP (value)) |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3298 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3299 if (STRINGP (value)) |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3300 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3301 int fontset = fs_query_fontset (value, 0); |
|
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 if (fontset >= 0) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3304 value = fontset_ascii (fontset); |
|
94983
fa401b47e382
(Finternal_set_lisp_face_attribute): Be sure to make a
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
3305 value = font_spec_from_name (value); |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3306 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3307 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3308 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
|
3309 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3310 if (EQ (frame, Qt)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3311 f = XFRAME (selected_frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3312 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3313 f = XFRAME (frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3314 if (! FONT_OBJECT_P (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 Lisp_Object *attrs = XVECTOR (lface)->contents; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3317 Lisp_Object font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3318 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3319 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
|
3320 if (NILP (font_object)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3321 signal_error ("Font not available", value); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3322 value = font_object; |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3323 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3324 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
|
3325 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3326 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3327 LFACE_FONT (lface) = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3328 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3329 #endif /* HAVE_WINDOW_SYSTEM */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3330 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3331 else if (EQ (attr, QCfontset)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3332 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3333 #ifdef HAVE_WINDOW_SYSTEM |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3334 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
|
3335 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3336 Lisp_Object tmp; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3337 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3338 old_value = LFACE_FONTSET (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3339 tmp = Fquery_fontset (value, Qnil); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3340 if (NILP (tmp)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3341 signal_error ("Invalid fontset name", value); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3342 LFACE_FONTSET (lface) = value = tmp; |
|
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
3343 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3344 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3345 } |
| 31178 | 3346 else if (EQ (attr, QCinherit)) |
| 3347 { | |
| 3348 Lisp_Object tail; | |
| 3349 if (SYMBOLP (value)) | |
| 3350 tail = Qnil; | |
| 3351 else | |
| 3352 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
| 3353 if (!SYMBOLP (XCAR (tail))) | |
| 3354 break; | |
| 3355 if (NILP (tail)) | |
| 3356 LFACE_INHERIT (lface) = value; | |
| 3357 else | |
|
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3358 signal_error ("Invalid face inheritance", value); |
| 31178 | 3359 } |
| 24995 | 3360 else if (EQ (attr, QCbold)) |
| 3361 { | |
| 3362 old_value = LFACE_WEIGHT (lface); | |
| 3363 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
|
3364 prop_index = FONT_WEIGHT_INDEX; |
| 24995 | 3365 } |
| 3366 else if (EQ (attr, QCitalic)) | |
| 3367 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3368 attr = QCslant; |
| 24995 | 3369 old_value = LFACE_SLANT (lface); |
| 3370 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
|
3371 prop_index = FONT_SLANT_INDEX; |
| 24995 | 3372 } |
| 3373 else | |
| 3374 signal_error ("Invalid face attribute name", attr); | |
| 3375 | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3376 if (prop_index) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3377 /* If a font-related attribute other than QCfont and QCfontset is |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3378 specified, and if the original QCfont attribute has a font |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3379 (font-spec or font-object), set the corresponding property in |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3380 the font to nil so that the font selector doesn't think that |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3381 the attribute is mandatory. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3382 font_clear_prop (XVECTOR (lface)->contents, prop_index); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3383 |
| 24995 | 3384 /* Changing a named face means that all realized faces depending on |
| 3385 that face are invalid. Since we cannot tell which realized faces | |
| 3386 depend on the face, make sure they are all removed. This is done | |
| 3387 by incrementing face_change_count. The next call to | |
| 3388 init_iterator will then free realized faces. */ | |
| 3389 if (!EQ (frame, Qt) | |
| 57107 | 3390 && 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
|
3391 && NILP (Fequal (old_value, value))) |
| 24995 | 3392 { |
| 3393 ++face_change_count; | |
| 3394 ++windows_or_buffers_changed; | |
| 3395 } | |
| 3396 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3397 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
| 24995 | 3398 && NILP (Fequal (old_value, value))) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3399 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3400 Lisp_Object param; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3401 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3402 param = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3403 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3404 if (EQ (face, Qdefault)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3405 { |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3406 #ifdef HAVE_WINDOW_SYSTEM |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3407 /* 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
|
3408 reflected in changed `font' frame parameters. */ |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3409 if (FRAMEP (frame) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3410 && (prop_index || EQ (attr, QCfont)) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3411 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3412 set_font_frame_param (frame, lface); |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3413 else |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3414 #endif /* HAVE_WINDOW_SYSTEM */ |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3415 |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3416 if (EQ (attr, QCforeground)) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3417 param = Qforeground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3418 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3419 param = Qbackground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3420 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3421 #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
|
3422 #ifndef WINDOWSNT |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3423 else if (EQ (face, Qscroll_bar)) |
|
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 the colors of `scroll-bar' sets frame parameters |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3426 `scroll-bar-foreground' and `scroll-bar-background'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3427 if (EQ (attr, QCforeground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3428 param = Qscroll_bar_foreground; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3429 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3430 param = Qscroll_bar_background; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3431 } |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3432 #endif /* not WINDOWSNT */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3433 else if (EQ (face, Qborder)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3434 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3435 /* Changing background color of `border' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3436 `border-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3437 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3438 param = Qborder_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3439 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3440 else if (EQ (face, Qcursor)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3441 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3442 /* Changing background color of `cursor' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3443 `cursor-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3444 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3445 param = Qcursor_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3446 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3447 else if (EQ (face, Qmouse)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3448 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3449 /* Changing background color of `mouse' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3450 `mouse-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3451 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3452 param = Qmouse_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3453 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3454 #endif /* HAVE_WINDOW_SYSTEM */ |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
3455 else if (EQ (face, Qmenu)) |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3456 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3457 /* 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
|
3458 realizing faces on FRAME. FRAME t change the |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3459 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
|
3460 setting the flag in new face caches */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3461 if (FRAMEP (frame)) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3462 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3463 struct frame *f = XFRAME (frame); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3464 if (FRAME_FACE_CACHE (f) == NULL) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3465 FRAME_FACE_CACHE (f) = make_face_cache (f); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3466 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
|
3467 } |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3468 else |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3469 menu_face_changed_default = 1; |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3470 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3471 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3472 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
|
3473 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3474 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
|
3475 /* 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
|
3476 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3477 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
|
3478 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3479 else |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3480 /* 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
|
3481 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3482 Lisp_Object cons; |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3483 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
|
3484 XSETCAR (cons, param); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3485 XSETCDR (cons, value); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3486 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
|
3487 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3488 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3489 } |
| 24995 | 3490 |
| 3491 return face; | |
| 3492 } | |
| 3493 | |
| 3494 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3495 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 3496 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3497 /* 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
|
3498 font-object set in `default' face attributes LFACE. */ |
| 24995 | 3499 |
| 3500 static void | |
| 3501 set_font_frame_param (frame, lface) | |
| 3502 Lisp_Object frame, lface; | |
| 3503 { | |
| 3504 struct frame *f = XFRAME (frame); | |
|
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
3505 |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
3506 if (FRAME_WINDOW_P (f)) |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
3507 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3508 Lisp_Object font = LFACE_FONT (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3509 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3510 if (FONT_SPEC_P (font)) |
| 90414 | 3511 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3512 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
|
3513 if (NILP (font)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3514 return; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3515 LFACE_FONT (lface) = font; |
| 90414 | 3516 } |
|
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
3517 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
|
3518 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
|
3519 } |
| 24995 | 3520 } |
| 3521 | |
| 3522 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3523 /* 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
|
3524 has been assigned the value NEW_VALUE. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3525 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3526 void |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3527 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
|
3528 struct frame *f; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3529 Lisp_Object param, new_value; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3530 { |
| 57107 | 3531 Lisp_Object face = Qnil; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3532 Lisp_Object lface; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3533 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3534 /* 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
|
3535 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
|
3536 face-set-after-frame-defaults. */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3537 if (NILP (f->face_alist)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3538 return; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3539 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3540 if (EQ (param, Qforeground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3541 { |
| 57107 | 3542 face = Qdefault; |
| 3543 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
|
3544 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3545 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3546 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3547 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3548 else if (EQ (param, Qbackground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3549 { |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3550 Lisp_Object frame; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3551 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3552 /* 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
|
3553 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
|
3554 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
|
3555 XSETFRAME (frame, f); |
|
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
3556 call1 (Qframe_set_background_mode, frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3557 |
| 57107 | 3558 face = Qdefault; |
| 3559 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
|
3560 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3561 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3562 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3563 } |
| 57107 | 3564 else if (EQ (param, Qborder_color)) |
| 3565 { | |
| 3566 face = Qborder; | |
| 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, Qcursor_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3572 { |
| 57107 | 3573 face = Qcursor; |
| 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 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3578 else if (EQ (param, Qmouse_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3579 { |
| 57107 | 3580 face = Qmouse; |
| 3581 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
|
3582 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3583 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3584 } |
| 57107 | 3585 |
| 3586 /* Changing a named face means that all realized faces depending on | |
| 3587 that face are invalid. Since we cannot tell which realized faces | |
| 3588 depend on the face, make sure they are all removed. This is done | |
| 3589 by incrementing face_change_count. The next call to | |
| 3590 init_iterator will then free realized faces. */ | |
| 3591 if (!NILP (face) | |
| 3592 && NILP (Fget (face, Qface_no_inherit))) | |
| 3593 { | |
| 3594 ++face_change_count; | |
| 3595 ++windows_or_buffers_changed; | |
| 3596 } | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3597 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3598 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3599 |
| 24995 | 3600 /* Get the value of X resource RESOURCE, class CLASS for the display |
| 3601 of frame FRAME. This is here because ordinary `x-get-resource' | |
| 3602 doesn't take a frame argument. */ | |
| 3603 | |
| 3604 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
|
3605 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
|
3606 (resource, class, frame) |
| 24995 | 3607 Lisp_Object resource, class, frame; |
| 3608 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3609 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
|
3610 CHECK_STRING (resource); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3611 CHECK_STRING (class); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3612 CHECK_LIVE_FRAME (frame); |
| 24995 | 3613 BLOCK_INPUT; |
| 3614 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
| 3615 resource, class, Qnil, Qnil); | |
| 3616 UNBLOCK_INPUT; | |
| 3617 return value; | |
| 3618 } | |
| 3619 | |
| 3620 | |
| 3621 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
| 3622 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
| 3623 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
| 3624 error; if SIGNAL_P is zero, return 0. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3625 |
| 24995 | 3626 static Lisp_Object |
| 3627 face_boolean_x_resource_value (value, signal_p) | |
| 3628 Lisp_Object value; | |
| 3629 int signal_p; | |
| 3630 { | |
| 3631 Lisp_Object result = make_number (0); | |
| 3632 | |
| 3633 xassert (STRINGP (value)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3634 |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3635 if (xstrcasecmp (SDATA (value), "on") == 0 |
|
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3636 || xstrcasecmp (SDATA (value), "true") == 0) |
| 24995 | 3637 result = Qt; |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3638 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
|
3639 || xstrcasecmp (SDATA (value), "false") == 0) |
| 24995 | 3640 result = Qnil; |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3641 else if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
| 24995 | 3642 result = Qunspecified; |
| 3643 else if (signal_p) | |
| 3644 signal_error ("Invalid face attribute value from X resource", value); | |
| 3645 | |
| 3646 return result; | |
| 3647 } | |
| 3648 | |
| 3649 | |
| 3650 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
| 3651 Finternal_set_lisp_face_attribute_from_resource, | |
| 3652 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
|
3653 3, 4, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3654 (face, attr, value, frame) |
| 24995 | 3655 Lisp_Object face, attr, value, frame; |
| 3656 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3657 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3658 CHECK_SYMBOL (attr); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3659 CHECK_STRING (value); |
| 24995 | 3660 |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3661 if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
| 24995 | 3662 value = Qunspecified; |
| 3663 else if (EQ (attr, QCheight)) | |
| 3664 { | |
| 3665 value = Fstring_to_number (value, make_number (10)); | |
| 3666 if (XINT (value) <= 0) | |
| 3667 signal_error ("Invalid face height from X resource", value); | |
| 3668 } | |
| 3669 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
| 3670 value = face_boolean_x_resource_value (value, 1); | |
| 3671 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
|
3672 value = intern (SDATA (value)); |
| 24995 | 3673 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
| 3674 value = face_boolean_x_resource_value (value, 1); | |
| 3675 else if (EQ (attr, QCunderline) | |
| 3676 || EQ (attr, QCoverline) | |
|
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
3677 || EQ (attr, QCstrike_through)) |
| 24995 | 3678 { |
| 3679 Lisp_Object boolean_value; | |
| 3680 | |
| 3681 /* If the result of face_boolean_x_resource_value is t or nil, | |
| 3682 VALUE does NOT specify a color. */ | |
| 3683 boolean_value = face_boolean_x_resource_value (value, 0); | |
| 3684 if (SYMBOLP (boolean_value)) | |
| 3685 value = boolean_value; | |
| 3686 } | |
|
67130
c5ff1098b0b8
(Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
Eli Zaretskii <eliz@gnu.org>
parents:
67056
diff
changeset
|
3687 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
|
3688 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
| 24995 | 3689 |
| 3690 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
|
3691 } |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
3692 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3693 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3694 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3695 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3696 /*********************************************************************** |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3697 Menu face |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3698 ***********************************************************************/ |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3699 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3700 #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
|
3701 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3702 /* 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
|
3703 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3704 static void |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3705 x_update_menu_appearance (f) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3706 struct frame *f; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3707 { |
|
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3708 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
|
3709 XrmDatabase rdb; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3710 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3711 if (dpyinfo |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3712 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3713 rdb != NULL)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3714 { |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3715 char line[512]; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3716 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
|
3717 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
|
3718 const char *myname = SDATA (Vx_resource_name); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3719 int changed_p = 0; |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3720 #ifdef USE_MOTIF |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3721 const char *popup_path = "popup_menu"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3722 #else |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3723 const char *popup_path = "menu.popup"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3724 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3725 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3726 if (STRINGP (LFACE_FOREGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3727 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3728 sprintf (line, "%s.%s*foreground: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3729 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
|
3730 SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3731 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3732 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
|
3733 myname, SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3734 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3735 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3736 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3737 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3738 if (STRINGP (LFACE_BACKGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3739 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3740 sprintf (line, "%s.%s*background: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3741 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
|
3742 SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3743 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3744 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
|
3745 myname, SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3746 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3747 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3748 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3749 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3750 if (face->font |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3751 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3752 || !UNSPECIFIEDP (LFACE_FOUNDRY (lface)) |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3753 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3754 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3755 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3756 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3757 { |
|
95189
70380eb2fa9d
(x_update_menu_appearance): Call Ffont_xlfd_name with
Kenichi Handa <handa@m17n.org>
parents:
95178
diff
changeset
|
3758 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
|
3759 #ifdef USE_MOTIF |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3760 const char *suffix = "List"; |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3761 Bool motif = True; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3762 #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
|
3763 #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
|
3764 |
|
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3765 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
|
3766 #else |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3767 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
|
3768 #endif |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3769 Bool motif = False; |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3770 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3771 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3772 if (! NILP (xlfd)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3773 { |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3774 #if defined HAVE_X_I18N |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3775 extern char *xic_create_fontsetname |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3776 P_ ((char *base_fontname, Bool motif)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3777 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
|
3778 #else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3779 char *fontsetname = (char *) SDATA (xlfd); |
|
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
3780 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3781 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
|
3782 myname, 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 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
|
3785 myname, popup_path, suffix, fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3786 XrmPutLineResource (&rdb, line); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3787 changed_p = 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3788 if (fontsetname != (char *) SDATA (xlfd)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3789 xfree (fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3790 } |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3791 } |
|
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 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
|
3794 free_frame_menubar (f); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3795 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3796 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3797 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3798 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
| 24995 | 3799 |
| 3800 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3801 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
|
3802 Sface_attribute_relative_p, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3803 2, 2, 0, |
|
71576
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3804 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
|
3805 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
|
3806 with the value VALUE is relative. |
|
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3807 |
|
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3808 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
|
3809 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
|
3810 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
|
3811 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
|
3812 (attribute, value) |
|
40532
221868112227
(Fface_attribute_relative_p): Declare args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40441
diff
changeset
|
3813 Lisp_Object attribute, value; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3814 { |
|
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3815 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
|
3816 return Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3817 else if (EQ (attribute, QCheight)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3818 return INTEGERP (value) ? Qnil : Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3819 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3820 return Qnil; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3821 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3822 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3823 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
|
3824 3, 3, 0, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3825 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
|
3826 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
|
3827 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
|
3828 (attribute, value1, value2) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3829 Lisp_Object attribute, value1, value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3830 { |
|
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3831 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
|
3832 return value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3833 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
|
3834 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
|
3835 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3836 return value1; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3837 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3838 |
| 24995 | 3839 |
| 3840 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
| 3841 Sinternal_get_lisp_face_attribute, | |
| 3842 2, 3, 0, | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3843 doc: /* Return face attribute KEYWORD of face SYMBOL. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3844 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
|
3845 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
|
3846 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
|
3847 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
|
3848 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
|
3849 (symbol, keyword, frame) |
| 24995 | 3850 Lisp_Object symbol, keyword, frame; |
| 3851 { | |
| 3852 Lisp_Object lface, value = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3853 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3854 CHECK_SYMBOL (symbol); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3855 CHECK_SYMBOL (keyword); |
| 24995 | 3856 |
| 3857 if (EQ (frame, Qt)) | |
| 3858 lface = lface_from_face_name (NULL, symbol, 1); | |
| 3859 else | |
| 3860 { | |
| 3861 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3862 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3863 CHECK_LIVE_FRAME (frame); |
| 24995 | 3864 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
| 3865 } | |
| 3866 | |
| 3867 if (EQ (keyword, QCfamily)) | |
| 3868 value = LFACE_FAMILY (lface); | |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3869 else if (EQ (keyword, QCfoundry)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3870 value = LFACE_FOUNDRY (lface); |
| 24995 | 3871 else if (EQ (keyword, QCheight)) |
| 3872 value = LFACE_HEIGHT (lface); | |
| 3873 else if (EQ (keyword, QCweight)) | |
| 3874 value = LFACE_WEIGHT (lface); | |
| 3875 else if (EQ (keyword, QCslant)) | |
| 3876 value = LFACE_SLANT (lface); | |
| 3877 else if (EQ (keyword, QCunderline)) | |
| 3878 value = LFACE_UNDERLINE (lface); | |
| 3879 else if (EQ (keyword, QCoverline)) | |
| 3880 value = LFACE_OVERLINE (lface); | |
| 3881 else if (EQ (keyword, QCstrike_through)) | |
| 3882 value = LFACE_STRIKE_THROUGH (lface); | |
| 3883 else if (EQ (keyword, QCbox)) | |
| 3884 value = LFACE_BOX (lface); | |
| 3885 else if (EQ (keyword, QCinverse_video) | |
| 3886 || EQ (keyword, QCreverse_video)) | |
| 3887 value = LFACE_INVERSE (lface); | |
| 3888 else if (EQ (keyword, QCforeground)) | |
| 3889 value = LFACE_FOREGROUND (lface); | |
| 3890 else if (EQ (keyword, QCbackground)) | |
| 3891 value = LFACE_BACKGROUND (lface); | |
| 3892 else if (EQ (keyword, QCstipple)) | |
| 3893 value = LFACE_STIPPLE (lface); | |
| 3894 else if (EQ (keyword, QCwidth)) | |
| 3895 value = LFACE_SWIDTH (lface); | |
| 31178 | 3896 else if (EQ (keyword, QCinherit)) |
| 3897 value = LFACE_INHERIT (lface); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3898 else if (EQ (keyword, QCfont)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3899 value = LFACE_FONT (lface); |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3900 else if (EQ (keyword, QCfontset)) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3901 value = LFACE_FONTSET (lface); |
| 24995 | 3902 else |
| 3903 signal_error ("Invalid face attribute name", keyword); | |
| 3904 | |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3905 if (IGNORE_DEFFACE_P (value)) |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3906 return Qunspecified; |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3907 |
| 24995 | 3908 return value; |
| 3909 } | |
| 3910 | |
| 3911 | |
| 3912 DEFUN ("internal-lisp-face-attribute-values", | |
| 3913 Finternal_lisp_face_attribute_values, | |
| 3914 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
|
3915 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
|
3916 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
|
3917 (attr) |
| 24995 | 3918 Lisp_Object attr; |
| 3919 { | |
| 3920 Lisp_Object result = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3921 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3922 CHECK_SYMBOL (attr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3923 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3924 if (EQ (attr, QCunderline)) |
| 24995 | 3925 result = Fcons (Qt, Fcons (Qnil, Qnil)); |
| 3926 else if (EQ (attr, QCoverline)) | |
| 3927 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3928 else if (EQ (attr, QCstrike_through)) | |
| 3929 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3930 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
| 3931 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3932 | |
| 3933 return result; | |
| 3934 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3935 |
| 24995 | 3936 |
| 3937 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
|
3938 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
|
3939 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
|
3940 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
|
3941 (face, frame) |
| 24995 | 3942 Lisp_Object face, frame; |
| 3943 { | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3944 int i; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3945 Lisp_Object global_lface, local_lface, *gvec, *lvec; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3946 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3947 CHECK_LIVE_FRAME (frame); |
| 24995 | 3948 global_lface = lface_from_face_name (NULL, face, 1); |
| 3949 local_lface = lface_from_face_name (XFRAME (frame), face, 0); | |
| 3950 if (NILP (local_lface)) | |
| 3951 local_lface = Finternal_make_lisp_face (face, frame); | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3952 |
|
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
3953 /* 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
|
3954 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
|
3955 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
|
3956 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
|
3957 "global before local" priority. */ |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3958 lvec = XVECTOR (local_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3959 gvec = XVECTOR (global_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3960 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3961 if (! UNSPECIFIEDP (gvec[i])) |
|
69968
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3962 { |
|
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3963 if (IGNORE_DEFFACE_P (gvec[i])) |
|
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3964 lvec[i] = Qunspecified; |
|
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3965 else |
|
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3966 lvec[i] = gvec[i]; |
|
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3967 } |
|
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
3968 |
|
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
3969 return Qnil; |
| 24995 | 3970 } |
| 3971 | |
| 3972 | |
| 3973 /* The following function is implemented for compatibility with 20.2. | |
| 3974 The function is used in x-resolve-fonts when it is asked to | |
| 3975 return fonts with the same size as the font of a face. This is | |
| 3976 done in fontset.el. */ | |
| 3977 | |
|
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3978 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
|
3979 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
|
3980 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
|
3981 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
|
3982 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
|
3983 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
|
3984 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
|
3985 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
|
3986 if the optional third argument CHARACTER is given, |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3987 return the font name used for CHARACTER. */) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3988 (face, frame, character) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3989 Lisp_Object face, frame, character; |
| 24995 | 3990 { |
| 3991 if (EQ (frame, Qt)) | |
| 3992 { | |
| 3993 Lisp_Object result = Qnil; | |
| 3994 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
| 3995 | |
| 3996 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
| 3997 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
| 3998 result = Fcons (Qbold, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3999 |
|
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
4000 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
| 24995 | 4001 && !EQ (LFACE_SLANT (lface), Qnormal)) |
| 4002 result = Fcons (Qitalic, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4003 |
| 24995 | 4004 return result; |
| 4005 } | |
| 4006 else | |
| 4007 { | |
| 4008 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
|
4009 int face_id = lookup_named_face (f, face, 1); |
| 24995 | 4010 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
|
4011 |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4012 if (! face) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4013 return Qnil; |
|
89947
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4014 #ifdef HAVE_WINDOW_SYSTEM |
|
89948
e94e49dc760e
(Fface_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89947
diff
changeset
|
4015 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
|
4016 { |
|
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4017 CHECK_CHARACTER (character); |
|
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4018 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
|
4019 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
|
4020 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4021 return (face->font |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4022 ? face->font->props[FONT_NAME_INDEX] |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4023 : Qnil); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4024 #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
|
4025 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
|
4026 ? "ms-dos" |
|
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4027 : 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
|
4028 :"tty"); |
|
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4029 #endif |
| 24995 | 4030 } |
| 4031 } | |
| 4032 | |
| 4033 | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4034 /* 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
|
4035 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
|
4036 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
|
4037 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4038 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
|
4039 face_attr_equal_p (v1, v2) |
|
56063
109c0a603543
(face_attr_equal_p): Declare parameters.
Andreas Schwab <schwab@suse.de>
parents:
55982
diff
changeset
|
4040 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
|
4041 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4042 /* 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
|
4043 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
|
4044 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
|
4045 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4046 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4047 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
|
4048 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4049 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4050 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
|
4051 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4052 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
|
4053 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
|
4054 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4055 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4056 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
|
4057 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4058 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
|
4059 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
|
4060 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4061 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4062 default: |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4063 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
|
4064 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4065 } |
|
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 |
| 24995 | 4068 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
| 4069 all attributes are `equal'. Tries to be fast because this function | |
| 4070 is called quite often. */ | |
| 4071 | |
| 4072 static INLINE int | |
| 4073 lface_equal_p (v1, v2) | |
| 4074 Lisp_Object *v1, *v2; | |
| 4075 { | |
| 4076 int i, equal_p = 1; | |
| 4077 | |
| 4078 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
|
4079 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
|
4080 |
| 24995 | 4081 return equal_p; |
| 4082 } | |
| 4083 | |
| 4084 | |
| 4085 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
| 4086 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
|
4087 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
|
4088 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
|
4089 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
|
4090 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
|
4091 (face1, face2, frame) |
| 24995 | 4092 Lisp_Object face1, face2, frame; |
| 4093 { | |
| 4094 int equal_p; | |
| 4095 struct frame *f; | |
| 4096 Lisp_Object lface1, lface2; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4097 |
| 24995 | 4098 if (EQ (frame, Qt)) |
| 4099 f = NULL; | |
| 4100 else | |
| 4101 /* Don't use check_x_frame here because this function is called | |
| 4102 before X frames exist. At that time, if FRAME is nil, | |
| 4103 selected_frame will be used which is the frame dumped with | |
| 4104 Emacs. That frame is not an X frame. */ | |
| 4105 f = frame_or_selected_frame (frame, 2); | |
| 4106 | |
|
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
|
4107 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
|
4108 lface2 = lface_from_face_name (f, face2, 1); |
| 24995 | 4109 equal_p = lface_equal_p (XVECTOR (lface1)->contents, |
| 4110 XVECTOR (lface2)->contents); | |
| 4111 return equal_p ? Qt : Qnil; | |
| 4112 } | |
| 4113 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4114 |
| 24995 | 4115 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
| 4116 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
|
4117 doc: /* True if FACE has no attribute specified. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4118 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
|
4119 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
|
4120 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
|
4121 (face, frame) |
| 24995 | 4122 Lisp_Object face, frame; |
| 4123 { | |
| 4124 struct frame *f; | |
| 4125 Lisp_Object lface; | |
| 4126 int i; | |
| 4127 | |
| 4128 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4129 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4130 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4131 f = XFRAME (frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4132 |
| 24995 | 4133 if (EQ (frame, Qt)) |
| 4134 lface = lface_from_face_name (NULL, face, 1); | |
| 4135 else | |
| 4136 lface = lface_from_face_name (f, face, 1); | |
| 4137 | |
| 4138 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
|
4139 if (!UNSPECIFIEDP (AREF (lface, i))) |
| 24995 | 4140 break; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4141 |
| 24995 | 4142 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
| 4143 } | |
| 4144 | |
| 4145 | |
| 4146 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
|
4147 0, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4148 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
|
4149 For internal use only. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4150 (frame) |
| 24995 | 4151 Lisp_Object frame; |
| 4152 { | |
| 4153 struct frame *f = frame_or_selected_frame (frame, 0); | |
| 4154 return f->face_alist; | |
| 4155 } | |
| 4156 | |
| 4157 | |
| 4158 /* Return a hash code for Lisp string STRING with case ignored. Used | |
| 4159 below in computing a hash value for a Lisp face. */ | |
| 4160 | |
| 4161 static INLINE unsigned | |
| 4162 hash_string_case_insensitive (string) | |
| 4163 Lisp_Object string; | |
| 4164 { | |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
4165 const unsigned char *s; |
| 24995 | 4166 unsigned hash = 0; |
| 4167 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
|
4168 for (s = SDATA (string); *s; ++s) |
| 24995 | 4169 hash = (hash << 1) ^ tolower (*s); |
| 4170 return hash; | |
| 4171 } | |
| 4172 | |
| 4173 | |
| 4174 /* Return a hash code for face attribute vector V. */ | |
| 4175 | |
| 4176 static INLINE unsigned | |
| 4177 lface_hash (v) | |
| 4178 Lisp_Object *v; | |
| 4179 { | |
| 4180 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4181 ^ hash_string_case_insensitive (v[LFACE_FOUNDRY_INDEX]) |
| 24995 | 4182 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) |
| 4183 ^ 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
|
4184 ^ XHASH (v[LFACE_WEIGHT_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4185 ^ XHASH (v[LFACE_SLANT_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4186 ^ XHASH (v[LFACE_SWIDTH_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4187 ^ XHASH (v[LFACE_HEIGHT_INDEX])); |
| 24995 | 4188 } |
| 4189 | |
| 4190 | |
| 4191 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
| 4192 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
|
4193 family, point size, weight, width, slant, and font. Both |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4194 LFACE1 and LFACE2 must be fully-specified. */ |
| 24995 | 4195 |
| 4196 static INLINE int | |
| 4197 lface_same_font_attributes_p (lface1, lface2) | |
| 4198 Lisp_Object *lface1, *lface2; | |
| 4199 { | |
| 4200 xassert (lface_fully_specified_p (lface1) | |
| 4201 && lface_fully_specified_p (lface2)); | |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4202 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
|
4203 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4204 && xstrcasecmp (SDATA (lface1[LFACE_FOUNDRY_INDEX]), |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4205 SDATA (lface2[LFACE_FOUNDRY_INDEX])) == 0 |
| 31178 | 4206 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
| 24995 | 4207 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX]) |
| 4208 && 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
|
4209 && 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
|
4210 && EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX]) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4211 && (EQ (lface1[LFACE_FONTSET_INDEX], lface2[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4212 || (STRINGP (lface1[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4213 && STRINGP (lface2[LFACE_FONTSET_INDEX]) |
|
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4214 && ! xstrcasecmp (SDATA (lface1[LFACE_FONTSET_INDEX]), |
|
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4215 SDATA (lface2[LFACE_FONTSET_INDEX])))) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4216 ); |
| 24995 | 4217 } |
| 4218 | |
| 4219 | |
| 4220 | |
| 4221 /*********************************************************************** | |
| 4222 Realized Faces | |
| 4223 ***********************************************************************/ | |
| 4224 | |
| 4225 /* 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
|
4226 vector ATTR. */ |
| 24995 | 4227 |
| 4228 static struct face * | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4229 make_realized_face (attr) |
| 24995 | 4230 Lisp_Object *attr; |
| 4231 { | |
| 4232 struct face *face = (struct face *) xmalloc (sizeof *face); | |
| 4233 bzero (face, sizeof *face); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4234 face->ascii_face = face; |
| 24995 | 4235 bcopy (attr, face->lface, sizeof face->lface); |
| 4236 return face; | |
| 4237 } | |
| 4238 | |
| 4239 | |
| 4240 /* Free realized face FACE, including its X resources. FACE may | |
| 4241 be null. */ | |
| 4242 | |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4243 void |
| 24995 | 4244 free_realized_face (f, face) |
| 4245 struct frame *f; | |
| 4246 struct face *face; | |
| 4247 { | |
| 4248 if (face) | |
| 4249 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4250 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4251 if (FRAME_WINDOW_P (f)) |
| 24995 | 4252 { |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4253 /* 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
|
4254 if (face->fontset >= 0 && face == face->ascii_face) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4255 free_face_fontset (f, face); |
| 24995 | 4256 if (face->gc) |
| 4257 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4258 BLOCK_INPUT; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4259 if (face->font) |
| 90414 | 4260 font_done_for_face (f, face); |
| 24995 | 4261 x_free_gc (f, face->gc); |
| 4262 face->gc = 0; | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4263 UNBLOCK_INPUT; |
| 24995 | 4264 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4265 |
| 24995 | 4266 free_face_colors (f, face); |
| 4267 x_destroy_bitmap (f, face->stipple); | |
| 4268 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4269 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4270 |
| 4271 xfree (face); | |
| 4272 } | |
| 4273 } | |
| 4274 | |
| 4275 | |
| 4276 /* Prepare face FACE for subsequent display on frame F. This | |
| 4277 allocated GCs if they haven't been allocated yet or have been freed | |
| 4278 by clearing the face cache. */ | |
| 4279 | |
| 4280 void | |
| 4281 prepare_face_for_display (f, face) | |
| 4282 struct frame *f; | |
| 4283 struct face *face; | |
| 4284 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4285 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4286 xassert (FRAME_WINDOW_P (f)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4287 |
| 24995 | 4288 if (face->gc == 0) |
| 4289 { | |
| 4290 XGCValues xgcv; | |
| 4291 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
| 4292 | |
| 4293 xgcv.foreground = face->foreground; | |
| 4294 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
|
4295 #ifdef HAVE_X_WINDOWS |
| 24995 | 4296 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
|
4297 #endif |
| 24995 | 4298 |
| 4299 BLOCK_INPUT; | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4300 #ifdef HAVE_X_WINDOWS |
| 24995 | 4301 if (face->stipple) |
| 4302 { | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
4303 xgcv.fill_style = FillOpaqueStippled; |
| 24995 | 4304 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
| 4305 mask |= GCFillStyle | GCStipple; | |
| 4306 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4307 #endif |
| 24995 | 4308 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
|
4309 if (face->font) |
| 90414 | 4310 font_prepare_for_face (f, face); |
| 24995 | 4311 UNBLOCK_INPUT; |
| 4312 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4313 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4314 } |
| 4315 | |
| 4316 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4317 /* 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
|
4318 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4319 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4320 color_distance (x, y) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4321 XColor *x, *y; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4322 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4323 /* 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
|
4324 Quoting from that paper: |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4325 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4326 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
|
4327 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
|
4328 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
|
4329 gives far from optimal results. |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4330 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4331 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
|
4332 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4333 long r = (x->red - y->red) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4334 long g = (x->green - y->green) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4335 long b = (x->blue - y->blue) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4336 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
|
4337 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4338 return |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4339 (((512 + r_mean) * r * r) >> 8) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4340 + 4 * g * g |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4341 + (((767 - r_mean) * b * b) >> 8); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4342 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4343 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4344 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4345 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
|
4346 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
|
4347 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
|
4348 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
|
4349 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
|
4350 (color1, color2, frame) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4351 Lisp_Object color1, color2, frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4352 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4353 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4354 XColor cdef1, cdef2; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4355 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4356 if (NILP (frame)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4357 frame = selected_frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4358 CHECK_LIVE_FRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4359 f = XFRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4360 |
|
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
|
4361 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
|
4362 && !(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
|
4363 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
|
4364 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
|
4365 && !(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
|
4366 signal_error ("Invalid color", color2); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4367 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4368 return make_number (color_distance (&cdef1, &cdef2)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4369 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4370 |
|
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 /*********************************************************************** |
| 24995 | 4373 Face Cache |
| 4374 ***********************************************************************/ | |
| 4375 | |
| 4376 /* Return a new face cache for frame F. */ | |
| 4377 | |
| 4378 static struct face_cache * | |
| 4379 make_face_cache (f) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4380 struct frame *f; |
| 24995 | 4381 { |
| 4382 struct face_cache *c; | |
| 4383 int size; | |
| 4384 | |
| 4385 c = (struct face_cache *) xmalloc (sizeof *c); | |
| 4386 bzero (c, sizeof *c); | |
| 4387 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 4388 c->buckets = (struct face **) xmalloc (size); | |
| 4389 bzero (c->buckets, size); | |
| 4390 c->size = 50; | |
| 4391 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
| 4392 c->f = f; | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4393 c->menu_face_changed_p = menu_face_changed_default; |
| 24995 | 4394 return c; |
| 4395 } | |
| 4396 | |
| 4397 | |
| 4398 /* Clear out all graphics contexts for all realized faces, except for | |
| 4399 the basic faces. This should be done from time to time just to avoid | |
| 4400 keeping too many graphics contexts that are no longer needed. */ | |
| 4401 | |
| 4402 static void | |
| 4403 clear_face_gcs (c) | |
| 4404 struct face_cache *c; | |
| 4405 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4406 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
|
4407 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4408 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4409 int i; |
| 4410 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
| 4411 { | |
| 4412 struct face *face = c->faces_by_id[i]; | |
| 4413 if (face && face->gc) | |
| 4414 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4415 BLOCK_INPUT; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4416 if (face->font) |
| 90414 | 4417 font_done_for_face (c->f, face); |
| 24995 | 4418 x_free_gc (c->f, face->gc); |
| 4419 face->gc = 0; | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4420 UNBLOCK_INPUT; |
| 24995 | 4421 } |
| 4422 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4423 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4424 } |
| 4425 } | |
| 4426 | |
| 4427 | |
|
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4428 /* 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
|
4429 C may be null. If faces are freed, make sure the frame's current |
| 24995 | 4430 matrix is marked invalid, so that a display caused by an expose |
| 4431 event doesn't try to use faces we destroyed. */ | |
| 4432 | |
| 4433 static void | |
| 4434 free_realized_faces (c) | |
| 4435 struct face_cache *c; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4436 { |
| 24995 | 4437 if (c && c->used) |
| 4438 { | |
| 4439 int i, size; | |
| 4440 struct frame *f = c->f; | |
| 4441 | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4442 /* 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
|
4443 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
|
4444 current matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4445 BLOCK_INPUT; |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4446 |
| 24995 | 4447 for (i = 0; i < c->used; ++i) |
| 4448 { | |
| 4449 free_realized_face (f, c->faces_by_id[i]); | |
| 4450 c->faces_by_id[i] = NULL; | |
| 4451 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4452 |
| 24995 | 4453 c->used = 0; |
| 4454 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 4455 bzero (c->buckets, size); | |
| 4456 | |
| 4457 /* Must do a thorough redisplay the next time. Mark current | |
| 4458 matrices as invalid because they will reference faces freed | |
| 4459 above. This function is also called when a frame is | |
| 4460 destroyed. In this case, the root window of F is nil. */ | |
| 4461 if (WINDOWP (f->root_window)) | |
| 4462 { | |
| 4463 clear_current_matrices (f); | |
| 4464 ++windows_or_buffers_changed; | |
| 4465 } | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4466 |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4467 UNBLOCK_INPUT; |
| 24995 | 4468 } |
| 4469 } | |
| 4470 | |
| 4471 | |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4472 /* 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
|
4473 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4474 void |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4475 free_realized_faces_for_fontset (f, fontset) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4476 struct frame *f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4477 int fontset; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4478 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4479 struct face_cache *cache = FRAME_FACE_CACHE (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4480 struct face *face; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4481 int i; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4482 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4483 /* 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
|
4484 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
|
4485 matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4486 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4487 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4488 for (i = 0; i < cache->used; i++) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4489 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4490 face = cache->faces_by_id[i]; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4491 if (face |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4492 && face->fontset == fontset) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4493 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4494 uncache_face (cache, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4495 free_realized_face (f, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4496 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4497 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4498 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4499 /* 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
|
4500 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
|
4501 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
|
4502 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
|
4503 if (WINDOWP (f->root_window)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4504 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4505 clear_current_matrices (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4506 ++windows_or_buffers_changed; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4507 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4508 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4509 UNBLOCK_INPUT; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4510 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4511 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4512 |
| 24995 | 4513 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
| 4514 This is done after attributes of a named face have been changed, | |
| 4515 because we can't tell which realized faces depend on that face. */ | |
| 4516 | |
| 4517 void | |
| 4518 free_all_realized_faces (frame) | |
| 4519 Lisp_Object frame; | |
| 4520 { | |
| 4521 if (NILP (frame)) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4522 { |
| 24995 | 4523 Lisp_Object rest; |
| 4524 FOR_EACH_FRAME (rest, frame) | |
| 4525 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 4526 } | |
| 4527 else | |
| 4528 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 4529 } | |
| 4530 | |
| 4531 | |
| 4532 /* Free face cache C and faces in it, including their X resources. */ | |
| 4533 | |
| 4534 static void | |
| 4535 free_face_cache (c) | |
| 4536 struct face_cache *c; | |
| 4537 { | |
| 4538 if (c) | |
| 4539 { | |
| 4540 free_realized_faces (c); | |
| 4541 xfree (c->buckets); | |
| 4542 xfree (c->faces_by_id); | |
| 4543 xfree (c); | |
| 4544 } | |
| 4545 } | |
| 4546 | |
| 4547 | |
| 4548 /* Cache realized face FACE in face cache C. HASH is the hash value | |
| 88907 | 4549 of FACE. If FACE is for ASCII characters (i.e. FACE->ascii_face == |
| 4550 FACE), insert the new face to the beginning of the collision list | |
| 4551 of the face hash table of C. Otherwise, add the new face to the | |
| 4552 end of the collision list. This way, lookup_face can quickly find | |
| 4553 that a requested face is not cached. */ | |
| 24995 | 4554 |
| 4555 static void | |
| 4556 cache_face (c, face, hash) | |
| 4557 struct face_cache *c; | |
| 4558 struct face *face; | |
| 4559 unsigned hash; | |
| 4560 { | |
| 4561 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
| 4562 | |
| 4563 face->hash = hash; | |
| 4564 | |
| 88907 | 4565 if (face->ascii_face != face) |
| 24995 | 4566 { |
| 4567 struct face *last = c->buckets[i]; | |
| 4568 if (last) | |
| 4569 { | |
| 4570 while (last->next) | |
| 4571 last = last->next; | |
| 4572 last->next = face; | |
| 4573 face->prev = last; | |
| 4574 face->next = NULL; | |
| 4575 } | |
| 4576 else | |
| 4577 { | |
| 4578 c->buckets[i] = face; | |
| 4579 face->prev = face->next = NULL; | |
| 4580 } | |
| 4581 } | |
| 4582 else | |
| 4583 { | |
| 4584 face->prev = NULL; | |
| 4585 face->next = c->buckets[i]; | |
| 4586 if (face->next) | |
| 4587 face->next->prev = face; | |
| 4588 c->buckets[i] = face; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4589 } |
|
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4590 |
| 24995 | 4591 /* Find a free slot in C->faces_by_id and use the index of the free |
| 4592 slot as FACE->id. */ | |
| 4593 for (i = 0; i < c->used; ++i) | |
| 4594 if (c->faces_by_id[i] == NULL) | |
| 4595 break; | |
| 4596 face->id = i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4597 |
| 24995 | 4598 /* 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
|
4599 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
|
4600 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4601 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
|
4602 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4603 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
|
4604 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
|
4605 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
|
4606 abort (); /* Alternatives? ++kfs */ |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4607 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
|
4608 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
|
4609 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
|
4610 } |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4611 c->used++; |
| 24995 | 4612 } |
| 4613 | |
| 4614 #if GLYPH_DEBUG | |
| 4615 /* Check that FACE got a unique id. */ | |
| 4616 { | |
| 4617 int j, n; | |
| 4618 struct face *face; | |
| 4619 | |
| 4620 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
| 4621 for (face = c->buckets[j]; face; face = face->next) | |
| 4622 if (face->id == i) | |
| 4623 ++n; | |
| 4624 | |
| 4625 xassert (n == 1); | |
| 4626 } | |
| 4627 #endif /* GLYPH_DEBUG */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4628 |
| 24995 | 4629 c->faces_by_id[i] = face; |
| 4630 } | |
| 4631 | |
| 4632 | |
| 4633 /* Remove face FACE from cache C. */ | |
| 4634 | |
| 4635 static void | |
| 4636 uncache_face (c, face) | |
| 4637 struct face_cache *c; | |
| 4638 struct face *face; | |
| 4639 { | |
| 4640 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4641 |
| 24995 | 4642 if (face->prev) |
| 4643 face->prev->next = face->next; | |
| 4644 else | |
| 4645 c->buckets[i] = face->next; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4646 |
| 24995 | 4647 if (face->next) |
| 4648 face->next->prev = face->prev; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4649 |
| 24995 | 4650 c->faces_by_id[face->id] = NULL; |
| 4651 if (face->id == c->used) | |
| 4652 --c->used; | |
| 4653 } | |
| 4654 | |
| 4655 | |
| 4656 /* Look up a realized face with face attributes ATTR in the face cache | |
| 88907 | 4657 of frame F. The face will be used to display ASCII characters. |
| 4658 Value is the ID of the face found. If no suitable face is found, | |
| 4659 realize a new one. */ | |
| 24995 | 4660 |
| 4661 INLINE int | |
| 88907 | 4662 lookup_face (f, attr) |
| 24995 | 4663 struct frame *f; |
| 4664 Lisp_Object *attr; | |
| 4665 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4666 struct face_cache *cache = FRAME_FACE_CACHE (f); |
| 24995 | 4667 unsigned hash; |
| 4668 int i; | |
| 4669 struct face *face; | |
| 4670 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4671 xassert (cache != NULL); |
| 24995 | 4672 check_lface_attrs (attr); |
| 4673 | |
| 4674 /* Look up ATTR in the face cache. */ | |
| 4675 hash = lface_hash (attr); | |
| 4676 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4677 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4678 for (face = cache->buckets[i]; face; face = face->next) |
| 88907 | 4679 { |
| 4680 if (face->ascii_face != face) | |
| 4681 { | |
| 4682 /* There's no more ASCII face. */ | |
| 4683 face = NULL; | |
| 4684 break; | |
| 4685 } | |
| 4686 if (face->hash == hash | |
| 4687 && lface_equal_p (face->lface, attr)) | |
| 4688 break; | |
| 4689 } | |
| 24995 | 4690 |
| 4691 /* If not found, realize a new face. */ | |
| 4692 if (face == NULL) | |
| 88907 | 4693 face = realize_face (cache, attr, -1); |
| 24995 | 4694 |
| 4695 #if GLYPH_DEBUG | |
| 4696 xassert (face == FACE_FROM_ID (f, face->id)); | |
| 4697 #endif /* GLYPH_DEBUG */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4698 |
| 24995 | 4699 return face->id; |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4700 } |
| 24995 | 4701 |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4702 #ifdef HAVE_WINDOW_SYSTEM |
| 88907 | 4703 /* 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
|
4704 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
|
4705 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
|
4706 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
|
4707 suitable face is found, realize a new one. */ |
| 24995 | 4708 |
| 4709 int | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4710 face_for_font (f, font_object, base_face) |
| 88907 | 4711 struct frame *f; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4712 Lisp_Object font_object; |
| 88907 | 4713 struct face *base_face; |
| 4714 { | |
| 4715 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
| 4716 unsigned hash; | |
| 4717 int i; | |
| 4718 struct face *face; | |
| 4719 | |
| 4720 xassert (cache != NULL); | |
| 4721 base_face = base_face->ascii_face; | |
| 4722 hash = lface_hash (base_face->lface); | |
| 4723 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
| 4724 | |
| 4725 for (face = cache->buckets[i]; face; face = face->next) | |
| 4726 { | |
| 4727 if (face->ascii_face == face) | |
| 4728 continue; | |
| 4729 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
|
4730 && face->font == (NILP (font_object) ? NULL |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4731 : XFONT_OBJECT (font_object)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4732 && lface_equal_p (face->lface, base_face->lface)) |
| 90414 | 4733 return face->id; |
| 4734 } | |
| 4735 | |
| 4736 /* 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
|
4737 face = realize_non_ascii_face (f, font_object, base_face); |
| 90414 | 4738 return face->id; |
| 4739 } | |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4740 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4741 |
| 4742 /* Return the face id of the realized face for named face SYMBOL on | |
| 88907 | 4743 frame F suitable for displaying ASCII characters. Value is -1 if |
| 4744 the face couldn't be determined, which might happen if the default | |
| 4745 face isn't realized and cannot be realized. */ | |
| 24995 | 4746 |
| 4747 int | |
|
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
4748 lookup_named_face (f, symbol, signal_p) |
| 24995 | 4749 struct frame *f; |
| 4750 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
|
4751 int signal_p; |
| 24995 | 4752 { |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4753 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
|
4754 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; |
| 24995 | 4755 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
| 4756 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4757 if (default_face == NULL) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4758 { |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4759 if (!realize_basic_faces (f)) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4760 return -1; |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4761 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
|
4762 if (default_face == NULL) |
|
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
4763 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
|
4764 } |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4765 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4766 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
|
4767 return -1; |
|
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4768 |
| 24995 | 4769 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
|
4770 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
|
4771 |
| 88907 | 4772 return lookup_face (f, attrs); |
| 24995 | 4773 } |
| 4774 | |
| 4775 | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4776 /* 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
|
4777 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
|
4778 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
|
4779 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
|
4780 rather than signal an error. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4781 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4782 int |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4783 lookup_basic_face (f, face_id) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4784 struct frame *f; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4785 int face_id; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4786 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4787 Lisp_Object name, mapping; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4788 int remapped_face_id; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4789 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4790 if (NILP (Vface_remapping_alist)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4791 return face_id; /* Nothing to do. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4792 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4793 switch (face_id) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4794 { |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4795 case DEFAULT_FACE_ID: name = Qdefault; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4796 case MODE_LINE_FACE_ID: name = Qmode_line; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4797 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
|
4798 case HEADER_LINE_FACE_ID: name = Qheader_line; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4799 case TOOL_BAR_FACE_ID: name = Qtool_bar; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4800 case FRINGE_FACE_ID: name = Qfringe; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4801 case SCROLL_BAR_FACE_ID: name = Qscroll_bar; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4802 case BORDER_FACE_ID: name = Qborder; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4803 case CURSOR_FACE_ID: name = Qcursor; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4804 case MOUSE_FACE_ID: name = Qmouse; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4805 case MENU_FACE_ID: name = Qmenu; break; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4806 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4807 default: |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4808 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
|
4809 } |
|
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 /* 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
|
4812 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
|
4813 for the very common no-remapping case. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4814 mapping = assq_no_quit (name, Vface_remapping_alist); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4815 if (NILP (mapping)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4816 return face_id; /* Give up. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4817 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4818 /* 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
|
4819 handle the remapping too. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4820 remapped_face_id = lookup_named_face (f, name, 0); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4821 if (remapped_face_id < 0) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4822 return face_id; /* Give up. */ |
|
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 return remapped_face_id; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4825 } |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4826 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4827 |
| 24995 | 4828 /* Return the ID of the realized ASCII face of Lisp face with ID |
| 4829 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
| 4830 | |
| 4831 int | |
| 4832 ascii_face_of_lisp_face (f, lface_id) | |
| 4833 struct frame *f; | |
| 4834 int lface_id; | |
| 4835 { | |
| 4836 int face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4837 |
| 24995 | 4838 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
| 4839 { | |
| 4840 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
|
4841 face_id = lookup_named_face (f, face_name, 1); |
| 24995 | 4842 } |
| 4843 else | |
| 4844 face_id = -1; | |
| 4845 | |
| 4846 return face_id; | |
| 4847 } | |
| 4848 | |
| 4849 | |
| 4850 /* Return a face for charset ASCII that is like the face with id | |
| 4851 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
| 4852 STEPS < 0 means larger. Value is the id of the face. */ | |
| 4853 | |
| 4854 int | |
| 4855 smaller_face (f, face_id, steps) | |
| 4856 struct frame *f; | |
| 4857 int face_id, steps; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4858 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4859 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4860 struct face *face; |
| 4861 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 4862 int pt, last_pt, last_height; | |
| 4863 int delta; | |
| 4864 int new_face_id; | |
| 4865 struct face *new_face; | |
| 4866 | |
| 4867 /* If not called for an X frame, just return the original face. */ | |
| 4868 if (FRAME_TERMCAP_P (f)) | |
| 4869 return face_id; | |
| 4870 | |
| 4871 /* Try in increments of 1/2 pt. */ | |
| 4872 delta = steps < 0 ? 5 : -5; | |
| 85262 | 4873 steps = eabs (steps); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4874 |
| 24995 | 4875 face = FACE_FROM_ID (f, face_id); |
| 4876 bcopy (face->lface, attrs, sizeof attrs); | |
| 4877 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
| 4878 new_face_id = face_id; | |
| 4879 last_height = FONT_HEIGHT (face->font); | |
| 4880 | |
| 4881 while (steps | |
| 4882 && pt + delta > 0 | |
| 4883 /* Give up if we cannot find a font within 10pt. */ | |
| 85262 | 4884 && eabs (last_pt - pt) < 100) |
| 24995 | 4885 { |
| 4886 /* Look up a face for a slightly smaller/larger font. */ | |
| 4887 pt += delta; | |
| 4888 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
| 88907 | 4889 new_face_id = lookup_face (f, attrs); |
| 24995 | 4890 new_face = FACE_FROM_ID (f, new_face_id); |
| 4891 | |
| 4892 /* 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
|
4893 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
|
4894 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
| 24995 | 4895 { |
| 4896 --steps; | |
| 4897 last_height = FONT_HEIGHT (new_face->font); | |
| 4898 last_pt = pt; | |
| 4899 } | |
| 4900 } | |
| 4901 | |
| 4902 return new_face_id; | |
| 4903 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4904 #else /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 4905 |
| 4906 return face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4907 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4908 #endif /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 4909 } |
| 4910 | |
| 4911 | |
| 4912 /* Return a face for charset ASCII that is like the face with id | |
| 4913 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
|
4914 |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
4915 int |
| 24995 | 4916 face_with_height (f, face_id, height) |
| 4917 struct frame *f; | |
| 4918 int face_id; | |
| 4919 int height; | |
| 4920 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4921 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4922 struct face *face; |
| 4923 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 4924 | |
| 4925 if (FRAME_TERMCAP_P (f) | |
| 4926 || height <= 0) | |
| 4927 return face_id; | |
| 4928 | |
| 4929 face = FACE_FROM_ID (f, face_id); | |
| 4930 bcopy (face->lface, attrs, sizeof attrs); | |
| 4931 attrs[LFACE_HEIGHT_INDEX] = make_number (height); | |
| 88907 | 4932 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
|
4933 #endif /* HAVE_WINDOW_SYSTEM */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4934 |
| 24995 | 4935 return face_id; |
| 4936 } | |
| 4937 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4938 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4939 /* Return the face id of the realized face for named face SYMBOL on |
| 88907 | 4940 frame F suitable for displaying ASCII characters, and use |
| 4941 attributes of the face FACE_ID for attributes that aren't | |
| 4942 completely specified by SYMBOL. This is like lookup_named_face, | |
| 4943 except that the default attributes come from FACE_ID, not from the | |
| 4944 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
|
4945 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4946 int |
|
90128
13796b0653c7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-29
Miles Bader <miles@gnu.org>
diff
changeset
|
4947 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
|
4948 struct frame *f; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4949 Lisp_Object symbol; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4950 int face_id; |
|
65713
ad24f42046b1
* xlwmenu.c (find_next_selectable):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
65347
diff
changeset
|
4951 int signal_p; |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4952 { |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4953 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
|
4954 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
|
4955 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
|
4956 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4957 if (!default_face) |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4958 abort (); |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4959 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4960 get_lface_attributes (f, symbol, symbol_attrs, signal_p, 0); |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4961 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
|
4962 merge_face_vectors (f, symbol_attrs, attrs, 0); |
| 88907 | 4963 return lookup_face (f, attrs); |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4964 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4965 |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4966 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
|
4967 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
|
4968 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
|
4969 (plist) |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4970 Lisp_Object plist; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4971 { |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4972 Lisp_Object lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4973 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
|
4974 Qunspecified); |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
4975 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
|
4976 1, 0); |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4977 return lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4978 } |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4979 |
| 24995 | 4980 |
| 4981 | |
| 4982 /*********************************************************************** | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4983 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
|
4984 ***********************************************************************/ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4985 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4986 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4987 /* 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
|
4988 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
|
4989 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
|
4990 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4991 #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
|
4992 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
4993 #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
|
4994 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4995 /* 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
|
4996 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
|
4997 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4998 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
|
4999 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
|
5000 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
|
5001 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5002 \(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
|
5003 \(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
|
5004 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5005 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
|
5006 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
|
5007 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
|
5008 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
|
5009 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
|
5010 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5011 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
|
5012 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5013 /* 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
|
5014 face. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5015 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
|
5016 && 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
|
5017 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
|
5018 || (!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
|
5019 && 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
|
5020 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
|
5021 || (!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
|
5022 && 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
|
5023 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
|
5024 || (!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
|
5025 && 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
|
5026 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
|
5027 || (!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
|
5028 && 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
|
5029 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
|
5030 || (!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
|
5031 && 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
|
5032 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
|
5033 || (!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
|
5034 && 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
|
5035 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
|
5036 || (!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
|
5037 && 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
|
5038 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
|
5039 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5040 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5041 /* 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
|
5042 "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
|
5043 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5044 || !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
|
5045 || !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
|
5046 || !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
|
5047 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5048 || !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
|
5049 { |
|
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5050 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
|
5051 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
|
5052 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
|
5053 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
|
5054 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5055 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
|
5056 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5057 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
|
5058 |
|
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5059 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
|
5060 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
|
5061 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5062 if (! face) |
|
63705
9e649a045c18
(x_supports_face_attributes_p): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
5063 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
|
5064 |
|
95471
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5065 /* 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
|
5066 supported. */ |
|
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5067 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
|
5068 || ! 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
|
5069 return 0; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5070 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
|
5071 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
|
5072 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5073 Lisp_Object s1, s2; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5074 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5075 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
|
5076 || face->font->driver->case_sensitive) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5077 return 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5078 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
|
5079 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
|
5080 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
|
5081 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
|
5082 return 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5083 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5084 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
|
5085 } |
|
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 /* 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
|
5088 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5089 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5090 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5091 #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
|
5092 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5093 /* 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
|
5094 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
|
5095 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5096 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
|
5097 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
|
5098 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
|
5099 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5100 \(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
|
5101 \(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
|
5102 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5103 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
|
5104 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
|
5105 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
|
5106 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
|
5107 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
|
5108 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5109 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
|
5110 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
|
5111 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
|
5112 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
|
5113 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
|
5114 { |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5115 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
|
5116 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
|
5117 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
|
5118 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
|
5119 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
|
5120 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
|
5121 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5122 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5123 /* 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
|
5124 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
|
5125 (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
|
5126 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
|
5127 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
|
5128 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
|
5129 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
|
5130 specifies. */ |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5131 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5132 || !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
|
5133 || !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
|
5134 || !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
|
5135 || !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
|
5136 || !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
|
5137 || !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
|
5138 || !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
|
5139 || !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
|
5140 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5141 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5142 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5143 /* 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
|
5144 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5145 /* font weight (bold/dim) */ |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5146 weight = FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]); |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5147 if (weight >= 0) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5148 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5149 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
|
5150 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5151 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
|
5152 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5153 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
|
5154 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
|
5155 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
|
5156 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5157 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
|
5158 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5159 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
|
5160 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
|
5161 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
|
5162 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5163 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
|
5164 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
|
5165 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5166 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5167 /* underlining */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5168 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
|
5169 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
|
5170 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5171 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
|
5172 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
|
5173 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
|
5174 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
|
5175 else |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5176 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
|
5177 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5178 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5179 /* inverse video */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5180 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
|
5181 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
|
5182 { |
|
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5183 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
|
5184 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
|
5185 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5186 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
|
5187 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5188 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5189 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5190 /* Color testing. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5191 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5192 /* 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
|
5193 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
|
5194 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
|
5195 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
|
5196 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
|
5197 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5198 /* 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
|
5199 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
|
5200 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
|
5201 { |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5202 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
|
5203 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5204 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
|
5205 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
|
5206 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
|
5207 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
|
5208 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
|
5209 > 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
|
5210 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
|
5211 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5212 /* 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
|
5213 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5214 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
|
5215 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
|
5216 && (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
|
5217 <= 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
|
5218 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5219 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5220 } |
|
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 /* 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
|
5223 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
|
5224 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
|
5225 { |
|
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5226 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
|
5227 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5228 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
|
5229 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
|
5230 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
|
5231 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
|
5232 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
|
5233 > 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
|
5234 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
|
5235 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5236 /* 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
|
5237 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5238 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
|
5239 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
|
5240 && (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
|
5241 <= 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
|
5242 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5243 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5244 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5245 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5246 /* 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
|
5247 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
|
5248 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
|
5249 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
|
5250 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
|
5251 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5252 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
|
5253 = (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
|
5254 - 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
|
5255 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
|
5256 || 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
|
5257 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5258 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5259 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5260 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5261 /* 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
|
5262 given colors. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5263 if (test_caps != 0 && |
| 83145 | 5264 ! 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
|
5265 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5266 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5267 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5268 /* 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
|
5269 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5270 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5271 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5272 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5273 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
|
5274 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
|
5275 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
|
5276 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
|
5277 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
|
5278 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
|
5279 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5280 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
|
5281 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
|
5282 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
|
5283 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5284 \(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
|
5285 \(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
|
5286 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5287 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
|
5288 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
|
5289 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
|
5290 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
|
5291 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
|
5292 (attributes, display) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5293 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
|
5294 { |
|
74071
ea7f3c26d52b
(Fdisplay_supports_face_attributes_p): Initialize
Andreas Schwab <schwab@suse.de>
parents:
73509
diff
changeset
|
5295 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
|
5296 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
|
5297 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
|
5298 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
|
5299 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
|
5300 |
|
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5301 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
|
5302 /* 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
|
5303 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
|
5304 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
|
5305 return Qnil; |
|
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5306 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5307 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
|
5308 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
|
5309 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
|
5310 frame = display; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5311 else |
|
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 /* 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
|
5314 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
|
5315 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5316 frame = Qnil; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5317 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
|
5318 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5319 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
|
5320 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
|
5321 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
|
5322 display))) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5323 break; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5324 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5325 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5326 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5327 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
|
5328 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
|
5329 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5330 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
|
5331 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
|
5332 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
|
5333 |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5334 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
|
5335 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
|
5336 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5337 if (! realize_basic_faces (f)) |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5338 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
|
5339 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
|
5340 if (def_face == NULL) |
|
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
5341 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
|
5342 } |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5343 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5344 /* 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
|
5345 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
|
5346 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
|
5347 #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
|
5348 else |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5349 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
|
5350 #endif |
|
55901
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 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
|
5353 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5354 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5355 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5356 /*********************************************************************** |
| 24995 | 5357 Font selection |
| 5358 ***********************************************************************/ | |
| 5359 | |
| 89483 | 5360 DEFUN ("internal-set-font-selection-order", |
| 24995 | 5361 Finternal_set_font_selection_order, |
| 5362 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
|
5363 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
|
5364 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
|
5365 `:height', `:weight', and `:slant'. Face attributes appearing |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5366 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
|
5367 `: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
|
5368 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
|
5369 Value is ORDER. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5370 (order) |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5371 Lisp_Object order; |
| 24995 | 5372 { |
| 5373 Lisp_Object list; | |
| 5374 int i; | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5375 int indices[DIM (font_sort_order)]; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5376 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5377 CHECK_LIST (order); |
| 24995 | 5378 bzero (indices, sizeof indices); |
| 5379 i = 0; | |
| 5380 | |
| 5381 for (list = order; | |
| 5382 CONSP (list) && i < DIM (indices); | |
| 5383 list = XCDR (list), ++i) | |
| 5384 { | |
| 5385 Lisp_Object attr = XCAR (list); | |
| 5386 int xlfd; | |
| 5387 | |
| 5388 if (EQ (attr, QCwidth)) | |
| 5389 xlfd = XLFD_SWIDTH; | |
| 5390 else if (EQ (attr, QCheight)) | |
| 5391 xlfd = XLFD_POINT_SIZE; | |
| 5392 else if (EQ (attr, QCweight)) | |
| 5393 xlfd = XLFD_WEIGHT; | |
| 5394 else if (EQ (attr, QCslant)) | |
| 5395 xlfd = XLFD_SLANT; | |
| 5396 else | |
| 5397 break; | |
| 5398 | |
| 5399 if (indices[i] != 0) | |
| 5400 break; | |
| 5401 indices[i] = xlfd; | |
| 5402 } | |
| 5403 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5404 if (!NILP (list) || i != DIM (indices)) |
| 24995 | 5405 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
|
5406 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
|
5407 if (indices[i] == 0) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5408 signal_error ("Invalid font sort order", order); |
| 24995 | 5409 |
| 5410 if (bcmp (indices, font_sort_order, sizeof indices) != 0) | |
| 5411 { | |
| 5412 bcopy (indices, font_sort_order, sizeof font_sort_order); | |
| 5413 free_all_realized_faces (Qnil); | |
| 5414 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5415 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5416 font_update_sort_order (font_sort_order); |
| 90414 | 5417 |
| 24995 | 5418 return Qnil; |
| 5419 } | |
| 5420 | |
| 5421 | |
| 5422 DEFUN ("internal-set-alternative-font-family-alist", | |
| 5423 Finternal_set_alternative_font_family_alist, | |
| 5424 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
|
5425 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
|
5426 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5427 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
|
5428 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
|
5429 (alist) |
| 24995 | 5430 Lisp_Object alist; |
| 5431 { | |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5432 Lisp_Object tail, tail2; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5433 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5434 CHECK_LIST (alist); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5435 alist = Fcopy_sequence (alist); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5436 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5437 for (tail2 = XCAR (tail); CONSP (tail2); tail2 = XCDR (tail2)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5438 XSETCAR (tail2, Fintern (XCAR (tail2), Qnil)); |
| 24995 | 5439 Vface_alternative_font_family_alist = alist; |
| 5440 free_all_realized_faces (Qnil); | |
| 5441 return alist; | |
| 5442 } | |
| 5443 | |
| 5444 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5445 DEFUN ("internal-set-alternative-font-registry-alist", |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5446 Finternal_set_alternative_font_registry_alist, |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5447 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
|
5448 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
|
5449 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5450 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
|
5451 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
|
5452 (alist) |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5453 Lisp_Object alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5454 { |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5455 Lisp_Object tail, tail2; |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5456 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5457 CHECK_LIST (alist); |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5458 alist = Fcopy_sequence (alist); |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5459 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5460 for (tail2 = XCAR (tail); CONSP (tail2); tail2 = XCDR (tail2)) |
|
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5461 XSETCAR (tail2, Fdowncase (XCAR (tail2))); |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5462 Vface_alternative_font_registry_alist = alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5463 free_all_realized_faces (Qnil); |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5464 return alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5465 } |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5466 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5467 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5468 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 5469 |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5470 /* 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
|
5471 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5472 #define FONT_POINT_SIZE_QUANTUM 5 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5473 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5474 /* 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
|
5475 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
|
5476 attribute of ATTRS doesn't name a fontset. */ |
| 24995 | 5477 |
| 5478 static int | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5479 face_fontset (attrs) |
| 24995 | 5480 Lisp_Object *attrs; |
| 5481 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5482 Lisp_Object name; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5483 |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
5484 name = attrs[LFACE_FONTSET_INDEX]; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5485 if (!STRINGP (name)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5486 return -1; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5487 return fs_query_fontset (name, 0); |
| 24995 | 5488 } |
| 5489 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5490 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5491 |
| 5492 | |
| 5493 | |
| 5494 /*********************************************************************** | |
| 5495 Face Realization | |
| 5496 ***********************************************************************/ | |
| 5497 | |
| 5498 /* Realize basic faces on frame F. Value is zero if frame parameters | |
| 5499 of F don't contain enough information needed to realize the default | |
| 5500 face. */ | |
| 5501 | |
| 5502 static int | |
| 5503 realize_basic_faces (f) | |
| 2342 | 5504 struct frame *f; |
| 24995 | 5505 { |
| 5506 int success_p = 0; | |
|
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
5507 int count = SPECPDL_INDEX (); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5508 |
|
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
5509 /* 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
|
5510 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
|
5511 BLOCK_INPUT; |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5512 specbind (Qscalable_fonts_allowed, Qt); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5513 |
| 24995 | 5514 if (realize_default_face (f)) |
| 5515 { | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
5516 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
|
5517 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
|
5518 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
| 41129 | 5519 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
| 25546 | 5520 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
|
5521 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
|
5522 realize_named_face (f, Qborder, BORDER_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5523 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5524 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
|
5525 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
|
5526 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
|
5527 |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5528 /* 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
|
5529 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
|
5530 { |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5531 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
|
5532 #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
|
5533 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
|
5534 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
|
5535 #endif |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
5536 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5537 |
| 24995 | 5538 success_p = 1; |
| 5539 } | |
| 5540 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5541 unbind_to (count, Qnil); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5542 UNBLOCK_INPUT; |
| 24995 | 5543 return success_p; |
| 5544 } | |
| 5545 | |
| 5546 | |
| 5547 /* Realize the default face on frame F. If the face is not fully | |
| 5548 specified, make it fully-specified. Attributes of the default face | |
| 5549 that are not explicitly specified are taken from frame parameters. */ | |
| 5550 | |
| 5551 static int | |
| 5552 realize_default_face (f) | |
| 5553 struct frame *f; | |
| 5554 { | |
| 5555 struct face_cache *c = FRAME_FACE_CACHE (f); | |
| 5556 Lisp_Object lface; | |
| 5557 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 5558 struct face *face; | |
| 5559 | |
| 5560 /* If the `default' face is not yet known, create it. */ | |
| 5561 lface = lface_from_face_name (f, Qdefault, 0); | |
| 5562 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
|
5563 { |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5564 Lisp_Object frame; |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5565 XSETFRAME (frame, f); |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5566 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
|
5567 } |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5568 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5569 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5570 if (FRAME_WINDOW_P (f)) |
| 24995 | 5571 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5572 Lisp_Object font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5573 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5574 XSETFONT (font_object, FRAME_FONT (f)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5575 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
|
5576 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
|
5577 f->default_face_done_p = 1; |
| 24995 | 5578 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5579 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5580 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5581 if (!FRAME_WINDOW_P (f)) |
| 24995 | 5582 { |
| 5583 LFACE_FAMILY (lface) = build_string ("default"); | |
|
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5584 LFACE_FOUNDRY (lface) = LFACE_FAMILY (lface); |
| 24995 | 5585 LFACE_SWIDTH (lface) = Qnormal; |
| 5586 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
|
5587 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
|
5588 LFACE_WEIGHT (lface) = Qnormal; |
|
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
5589 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
|
5590 LFACE_SLANT (lface) = Qnormal; |
| 24995 | 5591 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5592 |
| 24995 | 5593 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
| 5594 LFACE_UNDERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5595 |
| 24995 | 5596 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
| 5597 LFACE_OVERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5598 |
| 24995 | 5599 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
| 5600 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5601 |
| 24995 | 5602 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
| 5603 LFACE_BOX (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5604 |
| 24995 | 5605 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
| 5606 LFACE_INVERSE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5607 |
| 24995 | 5608 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
| 5609 { | |
| 5610 /* This function is called so early that colors are not yet | |
| 5611 set in the frame parameter list. */ | |
| 5612 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
|
5613 |
| 24995 | 5614 if (CONSP (color) && STRINGP (XCDR (color))) |
| 5615 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
|
5616 else if (FRAME_WINDOW_P (f)) |
| 24995 | 5617 return 0; |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5618 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
|
5619 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
|
5620 else |
| 24995 | 5621 abort (); |
| 5622 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5623 |
| 24995 | 5624 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
| 5625 { | |
| 5626 /* This function is called so early that colors are not yet | |
| 5627 set in the frame parameter list. */ | |
| 5628 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
| 5629 if (CONSP (color) && STRINGP (XCDR (color))) | |
| 5630 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
|
5631 else if (FRAME_WINDOW_P (f)) |
| 24995 | 5632 return 0; |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5633 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
|
5634 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
|
5635 else |
| 24995 | 5636 abort (); |
| 5637 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5638 |
| 24995 | 5639 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
| 5640 LFACE_STIPPLE (lface) = Qnil; | |
| 5641 | |
| 5642 /* Realize the face; it must be fully-specified now. */ | |
| 5643 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
| 5644 check_lface (lface); | |
| 5645 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | |
| 88907 | 5646 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
|
5647 |
|
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5648 #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
|
5649 #ifdef HAVE_X_WINDOWS |
|
83519
717426715b03
Fix stupid crash during startup.
Karoly Lorentey <lorentey@elte.hu>
parents:
83518
diff
changeset
|
5650 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
|
5651 { |
|
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5652 /* 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
|
5653 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
|
5654 if (!face->font) |
|
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5655 return 0; |
|
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
5656 |
|
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5657 /* 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
|
5658 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
|
5659 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
|
5660 font. */ |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5661 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
|
5662 } |
|
70566
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5663 #endif /* HAVE_X_WINDOWS */ |
|
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5664 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5665 return 1; |
| 5666 } | |
| 5667 | |
| 5668 | |
| 5669 /* Realize basic faces other than the default face in face cache C. | |
| 5670 SYMBOL is the face name, ID is the face id the realized face must | |
| 5671 have. The default face must have been realized already. */ | |
| 5672 | |
| 5673 static void | |
| 5674 realize_named_face (f, symbol, id) | |
| 5675 struct frame *f; | |
| 5676 Lisp_Object symbol; | |
| 5677 int id; | |
| 5678 { | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5679 struct face_cache *c = FRAME_FACE_CACHE (f); |
| 24995 | 5680 Lisp_Object lface = lface_from_face_name (f, symbol, 0); |
| 5681 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
|
5682 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
|
5683 struct face *new_face; |
| 24995 | 5684 |
| 5685 /* 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
|
5686 get_lface_attributes_no_remap (f, Qdefault, attrs, 1); |
| 24995 | 5687 check_lface_attrs (attrs); |
| 5688 xassert (lface_fully_specified_p (attrs)); | |
| 5689 | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5690 /* If SYMBOL isn't know as a face, create it. */ |
| 24995 | 5691 if (NILP (lface)) |
| 5692 { | |
| 5693 Lisp_Object frame; | |
| 5694 XSETFRAME (frame, f); | |
| 5695 lface = Finternal_make_lisp_face (symbol, frame); | |
| 5696 } | |
| 5697 | |
| 5698 /* Merge SYMBOL's face with the default face. */ | |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
5699 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
|
5700 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
|
5701 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5702 /* 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
|
5703 new_face = realize_face (c, attrs, id); |
| 24995 | 5704 } |
| 5705 | |
| 5706 | |
| 5707 /* Realize the fully-specified face with attributes ATTRS in face | |
| 88907 | 5708 cache CACHE for ASCII characters. If FORMER_FACE_ID is |
| 5709 non-negative, it is an ID of face to remove before caching the new | |
| 5710 face. Value is a pointer to the newly created realized face. */ | |
| 24995 | 5711 |
| 5712 static struct face * | |
| 88907 | 5713 realize_face (cache, attrs, former_face_id) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5714 struct face_cache *cache; |
| 24995 | 5715 Lisp_Object *attrs; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5716 int former_face_id; |
| 24995 | 5717 { |
| 5718 struct face *face; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5719 |
| 24995 | 5720 /* LFACE must be fully specified. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5721 xassert (cache != NULL); |
| 24995 | 5722 check_lface_attrs (attrs); |
| 5723 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5724 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
|
5725 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5726 /* Remove the former face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5727 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
|
5728 uncache_face (cache, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5729 free_realized_face (cache->f, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5730 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5731 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5732 if (FRAME_WINDOW_P (cache->f)) |
| 88907 | 5733 face = realize_x_face (cache, attrs); |
| 35443 | 5734 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) |
| 88907 | 5735 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
|
5736 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
|
5737 { |
|
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5738 /* Create a dummy face. */ |
|
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5739 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
|
5740 } |
| 24995 | 5741 else |
| 5742 abort (); | |
| 5743 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5744 /* Insert the new face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5745 cache_face (cache, face, lface_hash (attrs)); |
| 88907 | 5746 return face; |
| 5747 } | |
| 5748 | |
| 5749 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5750 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5751 /* 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
|
5752 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
|
5753 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
|
5754 no-font. */ |
| 88907 | 5755 |
| 5756 static struct face * | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5757 realize_non_ascii_face (f, font_object, base_face) |
| 88907 | 5758 struct frame *f; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5759 Lisp_Object font_object; |
| 88907 | 5760 struct face *base_face; |
| 5761 { | |
| 5762 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
| 89483 | 5763 struct face *face; |
| 88907 | 5764 |
| 5765 face = (struct face *) xmalloc (sizeof *face); | |
| 5766 *face = *base_face; | |
| 5767 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
|
5768 face->extra = NULL; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5769 face->overstrike |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5770 = (! NILP (font_object) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5771 && 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
|
5772 && FONT_WEIGHT_NUMERIC (font_object) <= 100); |
| 88907 | 5773 |
| 5774 /* Don't try to free the colors copied bitwise from BASE_FACE. */ | |
| 5775 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
|
5776 face->font = NILP (font_object) ? NULL : XFONT_OBJECT (font_object); |
| 88907 | 5777 face->gc = 0; |
| 5778 | |
| 5779 cache_face (cache, face, face->hash); | |
| 5780 | |
| 24995 | 5781 return face; |
| 5782 } | |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
5783 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5784 |
| 5785 | |
| 5786 /* Realize the fully-specified face with attributes ATTRS in face | |
| 88907 | 5787 cache CACHE for ASCII characters. Do it for X frame CACHE->f. If |
| 5788 the new face doesn't share font with the default face, a fontname | |
| 5789 is allocated from the heap and set in `font_name' of the new face, | |
| 5790 but it is not yet loaded here. Value is a pointer to the newly | |
| 5791 created realized face. */ | |
| 24995 | 5792 |
| 5793 static struct face * | |
| 88907 | 5794 realize_x_face (cache, attrs) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5795 struct face_cache *cache; |
| 24995 | 5796 Lisp_Object *attrs; |
| 5797 { | |
|
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5798 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
|
5799 #ifdef HAVE_WINDOW_SYSTEM |
|
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5800 struct face *default_face; |
|
26875
d6aa11f2a4af
(choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents:
26759
diff
changeset
|
5801 struct frame *f; |
| 24995 | 5802 Lisp_Object stipple, overline, strike_through, box; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5803 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5804 xassert (FRAME_WINDOW_P (cache->f)); |
| 24995 | 5805 |
| 5806 /* Allocate a new realized face. */ | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5807 face = make_realized_face (attrs); |
| 88907 | 5808 face->ascii_face = face; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5809 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5810 f = cache->f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5811 |
| 24995 | 5812 /* Determine the font to use. Most of the time, the font will be |
| 5813 the same as the font of the default face, so try that first. */ | |
| 5814 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 5815 if (default_face | |
| 5816 && lface_same_font_attributes_p (default_face->lface, attrs)) | |
| 5817 { | |
| 5818 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
|
5819 face->fontset |
|
4170d7f0d918
(realize_x_face): If the font-related face attributes
Kenichi Handa <handa@m17n.org>
parents:
95471
diff
changeset
|
5820 = make_fontset_for_ascii_face (f, default_face->fontset, face); |
| 24995 | 5821 } |
| 5822 else | |
| 5823 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5824 /* 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
|
5825 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
|
5826 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
|
5827 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
|
5828 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
|
5829 are constructed from ATTRS. */ |
|
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
5830 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
|
5831 |
| 88907 | 5832 /* If we are realizing the default face, ATTRS should specify a |
| 5833 fontset. In other words, if FONTSET is -1, we are not | |
| 5834 realizing the default face, thus the default face should have | |
| 5835 already been realized. */ | |
| 5836 if (fontset == -1) | |
|
30211
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
5837 fontset = default_face->fontset; |
| 88907 | 5838 if (fontset == -1) |
| 5839 abort (); | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5840 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
|
5841 attrs[LFACE_FONT_INDEX] |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5842 = 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
|
5843 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
|
5844 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5845 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
|
5846 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
|
5847 } |
| 90414 | 5848 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5849 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5850 face->font = NULL; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5851 face->fontset = -1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5852 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5853 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5854 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5855 if (face->font |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5856 && 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
|
5857 && 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
|
5858 face->overstrike = 1; |
| 24995 | 5859 |
| 5860 /* Load colors, and set remaining attributes. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5861 |
| 24995 | 5862 load_face_colors (f, face, attrs); |
| 5863 | |
| 5864 /* Set up box. */ | |
| 5865 box = attrs[LFACE_BOX_INDEX]; | |
| 5866 if (STRINGP (box)) | |
| 5867 { | |
| 5868 /* A simple box of line width 1 drawn in color given by | |
| 5869 the string. */ | |
| 5870 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX], | |
| 5871 LFACE_BOX_INDEX); | |
| 5872 face->box = FACE_SIMPLE_BOX; | |
| 5873 face->box_line_width = 1; | |
| 5874 } | |
| 5875 else if (INTEGERP (box)) | |
| 5876 { | |
| 5877 /* Simple box of specified line width in foreground color of the | |
| 5878 face. */ | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5879 xassert (XINT (box) != 0); |
| 24995 | 5880 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
|
5881 face->box_line_width = XINT (box); |
| 24995 | 5882 face->box_color = face->foreground; |
| 5883 face->box_color_defaulted_p = 1; | |
| 5884 } | |
| 5885 else if (CONSP (box)) | |
| 5886 { | |
| 5887 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW | |
| 5888 being one of `raised' or `sunken'. */ | |
| 5889 face->box = FACE_SIMPLE_BOX; | |
| 5890 face->box_color = face->foreground; | |
| 5891 face->box_color_defaulted_p = 1; | |
| 5892 face->box_line_width = 1; | |
| 5893 | |
| 5894 while (CONSP (box)) | |
| 5895 { | |
| 5896 Lisp_Object keyword, value; | |
| 5897 | |
| 5898 keyword = XCAR (box); | |
| 5899 box = XCDR (box); | |
| 5900 | |
| 5901 if (!CONSP (box)) | |
| 5902 break; | |
| 5903 value = XCAR (box); | |
| 5904 box = XCDR (box); | |
| 5905 | |
| 5906 if (EQ (keyword, QCline_width)) | |
| 5907 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5908 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
|
5909 face->box_line_width = XINT (value); |
| 24995 | 5910 } |
| 5911 else if (EQ (keyword, QCcolor)) | |
| 5912 { | |
| 5913 if (STRINGP (value)) | |
| 5914 { | |
| 5915 face->box_color = load_color (f, face, value, | |
| 5916 LFACE_BOX_INDEX); | |
| 5917 face->use_box_color_for_shadows_p = 1; | |
| 5918 } | |
| 5919 } | |
| 5920 else if (EQ (keyword, QCstyle)) | |
| 5921 { | |
| 5922 if (EQ (value, Qreleased_button)) | |
| 5923 face->box = FACE_RAISED_BOX; | |
| 5924 else if (EQ (value, Qpressed_button)) | |
| 5925 face->box = FACE_SUNKEN_BOX; | |
| 5926 } | |
| 5927 } | |
| 5928 } | |
| 5929 | |
| 5930 /* Text underline, overline, strike-through. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5931 |
| 24995 | 5932 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt)) |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5933 { |
| 24995 | 5934 /* Use default color (same as foreground color). */ |
| 5935 face->underline_p = 1; | |
| 5936 face->underline_defaulted_p = 1; | |
| 5937 face->underline_color = 0; | |
| 5938 } | |
| 5939 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 5940 { | |
| 5941 /* Use specified color. */ | |
| 5942 face->underline_p = 1; | |
| 5943 face->underline_defaulted_p = 0; | |
| 5944 face->underline_color | |
| 5945 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX], | |
| 5946 LFACE_UNDERLINE_INDEX); | |
| 5947 } | |
| 5948 else if (NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 5949 { | |
| 5950 face->underline_p = 0; | |
| 5951 face->underline_defaulted_p = 0; | |
| 5952 face->underline_color = 0; | |
| 5953 } | |
| 5954 | |
| 5955 overline = attrs[LFACE_OVERLINE_INDEX]; | |
| 5956 if (STRINGP (overline)) | |
| 5957 { | |
| 5958 face->overline_color | |
| 5959 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX], | |
| 5960 LFACE_OVERLINE_INDEX); | |
| 5961 face->overline_p = 1; | |
| 5962 } | |
| 5963 else if (EQ (overline, Qt)) | |
| 5964 { | |
| 5965 face->overline_color = face->foreground; | |
| 5966 face->overline_color_defaulted_p = 1; | |
| 5967 face->overline_p = 1; | |
| 5968 } | |
| 5969 | |
| 5970 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX]; | |
| 5971 if (STRINGP (strike_through)) | |
| 5972 { | |
| 5973 face->strike_through_color | |
| 5974 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX], | |
| 5975 LFACE_STRIKE_THROUGH_INDEX); | |
| 5976 face->strike_through_p = 1; | |
| 5977 } | |
| 5978 else if (EQ (strike_through, Qt)) | |
| 5979 { | |
| 5980 face->strike_through_color = face->foreground; | |
| 5981 face->strike_through_color_defaulted_p = 1; | |
| 5982 face->strike_through_p = 1; | |
| 5983 } | |
| 5984 | |
| 5985 stipple = attrs[LFACE_STIPPLE_INDEX]; | |
| 5986 if (!NILP (stipple)) | |
| 5987 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
|
5988 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5989 |
| 5990 return face; | |
| 5991 } | |
| 5992 | |
| 5993 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5994 /* 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
|
5995 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
|
5996 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
|
5997 default foreground/background colors. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5998 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5999 static void |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6000 map_tty_color (f, face, idx, defaulted) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6001 struct frame *f; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6002 struct face *face; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6003 enum lface_attribute_index idx; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6004 int *defaulted; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6005 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6006 Lisp_Object frame, color, def; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6007 int foreground_p = idx == LFACE_FOREGROUND_INDEX; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6008 unsigned long default_pixel, default_other_pixel, pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6009 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6010 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
|
6011 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6012 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6013 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6014 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6015 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6016 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6017 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6018 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6019 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6020 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6021 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6022 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6023 XSETFRAME (frame, f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6024 color = face->lface[idx]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6025 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6026 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
|
6027 && SCHARS (color) |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6028 && CONSP (Vtty_defined_color_alist) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6029 && (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
|
6030 CONSP (def))) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6031 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6032 /* 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
|
6033 (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
|
6034 pixel = XINT (XCAR (XCDR (def))); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6035 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6036 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6037 if (pixel == default_pixel && STRINGP (color)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6038 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6039 pixel = load_color (f, face, color, idx); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6040 |
|
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6041 #ifdef MSDOS |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6042 /* 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
|
6043 use the foreground color defined by the frame. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6044 if (FRAME_MSDOS_P (f)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6045 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6046 if (pixel == default_pixel |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6047 || pixel == FACE_TTY_DEFAULT_COLOR) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6048 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6049 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6050 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6051 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6052 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6053 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6054 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6055 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6056 else if (pixel == default_other_pixel) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6057 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6058 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6059 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6060 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6061 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6062 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6063 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6064 } |
|
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6065 } |
|
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6066 #endif /* MSDOS */ |
|
30973
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 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6069 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6070 face->foreground = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6071 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6072 face->background = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6073 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6074 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6075 |
| 24995 | 6076 /* Realize the fully-specified face with attributes ATTRS in face |
| 88907 | 6077 cache CACHE for ASCII characters. Do it for TTY frame CACHE->f. |
| 6078 Value is a pointer to the newly created realized face. */ | |
| 24995 | 6079 |
| 6080 static struct face * | |
| 88907 | 6081 realize_tty_face (cache, attrs) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6082 struct face_cache *cache; |
| 24995 | 6083 Lisp_Object *attrs; |
| 6084 { | |
| 6085 struct face *face; | |
| 6086 int weight, slant; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6087 int face_colors_defaulted = 0; |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6088 struct frame *f = cache->f; |
| 24995 | 6089 |
| 6090 /* Frame must be a termcap frame. */ | |
| 35443 | 6091 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
|
6092 |
| 24995 | 6093 /* Allocate a new realized face. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6094 face = make_realized_face (attrs); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6095 #if 0 |
| 35443 | 6096 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
|
6097 #endif |
| 24995 | 6098 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6099 /* Map face attributes to TTY appearances. We map slant to |
| 24995 | 6100 dimmed text because we want italic text to appear differently |
| 6101 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
|
6102 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
|
6103 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
|
6104 if (weight > 100) |
| 24995 | 6105 face->tty_bold_p = 1; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6106 if (weight < 100 || slant != 100) |
| 24995 | 6107 face->tty_dim_p = 1; |
| 6108 if (!NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 6109 face->tty_underline_p = 1; | |
| 6110 if (!NILP (attrs[LFACE_INVERSE_INDEX])) | |
| 6111 face->tty_reverse_p = 1; | |
| 6112 | |
| 6113 /* Map color names to color indices. */ | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6114 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
|
6115 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
|
6116 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6117 /* 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
|
6118 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
|
6119 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
|
6120 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
|
6121 { |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6122 unsigned long tem = face->foreground; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6123 face->foreground = face->background; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6124 face->background = tem; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6125 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6126 |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6127 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
|
6128 && face->tty_bold_p |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6129 && 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
|
6130 && 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
|
6131 face->tty_bold_p = 0; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6132 |
| 24995 | 6133 return face; |
| 6134 } | |
| 6135 | |
| 6136 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6137 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
|
6138 Ftty_suppress_bold_inverse_default_colors, |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6139 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
|
6140 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
|
6141 SUPPRESS non-nil means suppress it. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6142 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
|
6143 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
|
6144 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
|
6145 is non-nil. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6146 (suppress) |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6147 Lisp_Object suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6148 { |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6149 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
|
6150 ++face_change_count; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6151 return suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6152 } |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6153 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6154 |
| 24995 | 6155 |
| 6156 /*********************************************************************** | |
| 6157 Computing Faces | |
| 6158 ***********************************************************************/ | |
| 6159 | |
| 6160 /* Return the ID of the face to use to display character CH with face | |
| 6161 property PROP on frame F in current_buffer. */ | |
| 6162 | |
| 6163 int | |
| 6164 compute_char_face (f, ch, prop) | |
| 6165 struct frame *f; | |
| 6166 int ch; | |
| 6167 Lisp_Object prop; | |
| 6168 { | |
| 6169 int face_id; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6170 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6171 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
|
6172 ch = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6173 |
| 24995 | 6174 if (NILP (prop)) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6175 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6176 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
|
6177 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
|
6178 } |
| 24995 | 6179 else |
| 6180 { | |
| 6181 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6182 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 6183 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
|
6184 merge_face_ref (f, prop, attrs, 1, 0); |
| 88907 | 6185 face_id = lookup_face (f, attrs); |
| 24995 | 6186 } |
| 6187 | |
| 6188 return face_id; | |
| 6189 } | |
| 6190 | |
| 6191 /* Return the face ID associated with buffer position POS for | |
| 6192 displaying ASCII characters. Return in *ENDPTR the position at | |
| 6193 which a different face is needed, as far as text properties and | |
| 6194 overlays are concerned. W is a window displaying current_buffer. | |
| 6195 | |
| 6196 REGION_BEG, REGION_END delimit the region, so it can be | |
| 6197 highlighted. | |
| 6198 | |
| 6199 LIMIT is a position not to scan beyond. That is to limit the time | |
| 6200 this function can take. | |
| 6201 | |
| 6202 If MOUSE is non-zero, use the character's mouse-face, not its face. | |
| 6203 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6204 The face returned is suitable for displaying ASCII characters. */ |
| 24995 | 6205 |
| 6206 int | |
| 6207 face_at_buffer_position (w, pos, region_beg, region_end, | |
| 6208 endptr, limit, mouse) | |
| 2391 | 6209 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
|
6210 EMACS_INT pos; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6211 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
|
6212 EMACS_INT *endptr; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6213 EMACS_INT limit; |
|
6615
96ddf85642d1
(compute_char_face): New arg MOUSE.
Richard M. Stallman <rms@gnu.org>
parents:
5858
diff
changeset
|
6214 int mouse; |
| 2342 | 6215 { |
| 24995 | 6216 struct frame *f = XFRAME (w->frame); |
| 6217 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
|
6218 Lisp_Object prop, position; |
| 24995 | 6219 int i, noverlays; |
| 2342 | 6220 Lisp_Object *overlay_vec; |
| 2391 | 6221 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
|
6222 EMACS_INT endpos; |
| 24995 | 6223 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
| 6224 Lisp_Object limit1, end; | |
| 6225 struct face *default_face; | |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6226 |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6227 /* 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
|
6228 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
|
6229 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
| 2391 | 6230 |
|
9284
a969e0eefaf5
(compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9186
diff
changeset
|
6231 XSETFRAME (frame, f); |
| 24995 | 6232 XSETFASTINT (position, pos); |
| 2342 | 6233 |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6234 endpos = ZV; |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6235 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
|
6236 endpos = region_beg; |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6237 |
| 24995 | 6238 /* Get the `face' or `mouse_face' text property at POS, and |
| 6239 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
|
6240 prop = Fget_text_property (position, propname, w->buffer); |
| 24995 | 6241 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
| 6242 end = Fnext_single_property_change (position, propname, w->buffer, limit1); | |
| 6243 if (INTEGERP (end)) | |
| 6244 endpos = XINT (end); | |
| 6245 | |
| 6246 /* 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
|
6247 { |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
6248 EMACS_INT next_overlay; |
|
55654
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6249 |
|
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6250 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
|
6251 if (next_overlay < endpos) |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6252 endpos = next_overlay; |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6253 } |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6254 |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6255 *endptr = endpos; |
| 2342 | 6256 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6257 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6258 /* Perhaps remap BASE_FACE_ID to a user-specified alternative. */ |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6259 if (NILP (Vface_remapping_alist)) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6260 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6261 else |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6262 default_face = FACE_FROM_ID (f, lookup_basic_face (f, DEFAULT_FACE_ID)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6263 |
| 24995 | 6264 /* Optimize common cases where we can use the default face. */ |
| 6265 if (noverlays == 0 | |
| 6266 && NILP (prop) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6267 && !(pos >= region_beg && pos < region_end)) |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6268 return default_face->id; |
| 24995 | 6269 |
| 6270 /* Begin with attributes from the default face. */ | |
| 6271 bcopy (default_face->lface, attrs, sizeof attrs); | |
| 6272 | |
| 6273 /* Merge in attributes specified via text properties. */ | |
| 6274 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
|
6275 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 6276 |
| 6277 /* 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
|
6278 noverlays = sort_overlays (overlay_vec, noverlays, w); |
| 2342 | 6279 for (i = 0; i < noverlays; i++) |
| 6280 { | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6281 Lisp_Object oend; |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6282 int oendpos; |
|
9186
45bac5feb065
(compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents:
9184
diff
changeset
|
6283 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6284 prop = Foverlay_get (overlay_vec[i], propname); |
| 24995 | 6285 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
|
6286 merge_face_ref (f, prop, attrs, 1, 0); |
| 2342 | 6287 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6288 oend = OVERLAY_END (overlay_vec[i]); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6289 oendpos = OVERLAY_POSITION (oend); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6290 if (oendpos < endpos) |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6291 endpos = oendpos; |
| 2342 | 6292 } |
| 6293 | |
| 24995 | 6294 /* 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
|
6295 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
|
6296 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
6297 merge_named_face (f, Qregion, attrs, 0); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6298 |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6299 if (region_end < endpos) |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6300 endpos = region_end; |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6301 } |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6302 |
| 2342 | 6303 *endptr = endpos; |
| 6304 | |
| 24995 | 6305 /* 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
|
6306 or realize a new one for ASCII characters. */ |
| 88907 | 6307 return lookup_face (f, attrs); |
| 2342 | 6308 } |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6309 |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6310 /* 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
|
6311 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
|
6312 |
|
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6313 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
|
6314 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
|
6315 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6316 int |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6317 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
|
6318 endptr, limit, mouse, overlay) |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6319 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
|
6320 EMACS_INT pos; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6321 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
|
6322 EMACS_INT *endptr; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6323 EMACS_INT limit; |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6324 int mouse; |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6325 Lisp_Object overlay; |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6326 { |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6327 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
|
6328 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
|
6329 Lisp_Object prop, position; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6330 Lisp_Object frame; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6331 int endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6332 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
|
6333 Lisp_Object limit1, end; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6334 struct face *default_face; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6335 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6336 /* 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
|
6337 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
|
6338 /* 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
|
6339 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6340 XSETFRAME (frame, f); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6341 XSETFASTINT (position, pos); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6342 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6343 endpos = ZV; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6344 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
|
6345 endpos = region_beg; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6346 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6347 /* 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
|
6348 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
|
6349 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
|
6350 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
|
6351 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
|
6352 if (INTEGERP (end)) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6353 endpos = XINT (end); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6354 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6355 *endptr = endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6356 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6357 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
|
6358 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6359 /* 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
|
6360 if (NILP (prop) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6361 && !(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
|
6362 return DEFAULT_FACE_ID; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6363 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6364 /* 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
|
6365 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
|
6366 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6367 /* 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
|
6368 if (!NILP (prop)) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6369 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
|
6370 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6371 /* 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
|
6372 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
|
6373 { |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6374 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
|
6375 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6376 if (region_end < endpos) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6377 endpos = region_end; |
|
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 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6380 *endptr = endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6381 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6382 /* 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
|
6383 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
|
6384 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
|
6385 } |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6386 |
| 24995 | 6387 |
| 6388 /* 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
|
6389 window W, for ASCII characters. |
| 24995 | 6390 |
| 6391 If STRING is an overlay string, it comes from position BUFPOS in | |
| 6392 current_buffer, otherwise BUFPOS is zero to indicate that STRING is | |
| 6393 not an overlay string. W must display the current buffer. | |
| 6394 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
|
6395 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
|
6396 |
|
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
6397 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
|
6398 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
|
6399 |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6400 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
|
6401 |
| 24995 | 6402 Set *ENDPTR to the next position where to check for faces in |
| 6403 STRING; -1 if the face is constant from POS to the end of the | |
| 6404 string. | |
| 6405 | |
| 6406 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
|
6407 for displaying ASCII characters. */ |
| 24995 | 6408 |
| 6409 int | |
| 6410 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
|
6411 region_end, endptr, base_face_id, mouse_p) |
| 24995 | 6412 struct window *w; |
| 6413 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
|
6414 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
|
6415 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
|
6416 EMACS_INT *endptr; |
| 24995 | 6417 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
|
6418 int mouse_p; |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6419 { |
| 24995 | 6420 Lisp_Object prop, position, end, limit; |
| 6421 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
| 6422 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6423 struct face *base_face; | |
| 6424 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
|
6425 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface; |
| 24995 | 6426 |
| 6427 /* Get the value of the face property at the current position within | |
| 6428 STRING. Value is nil if there is no face property. */ | |
| 6429 XSETFASTINT (position, pos); | |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6430 prop = Fget_text_property (position, prop_name, string); |
| 24995 | 6431 |
| 6432 /* Get the next position at which to check for faces. Value of end | |
| 6433 is nil if face is constant all the way to the end of the string. | |
| 6434 Otherwise it is a string position where to check faces next. | |
| 6435 Limit is the maximum position up to which to check for property | |
| 6436 changes in Fnext_single_property_change. Strings are usually | |
| 6437 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
|
6438 XSETFASTINT (limit, SCHARS (string)); |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6439 end = Fnext_single_property_change (position, prop_name, string, limit); |
| 24995 | 6440 if (INTEGERP (end)) |
| 6441 *endptr = XFASTINT (end); | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6442 else |
| 24995 | 6443 *endptr = -1; |
| 6444 | |
| 6445 base_face = FACE_FROM_ID (f, base_face_id); | |
| 6446 xassert (base_face); | |
| 6447 | |
| 6448 /* Optimize the default case that there is no face property and we | |
| 6449 are not in the region. */ | |
| 6450 if (NILP (prop) | |
| 6451 && (base_face_id != DEFAULT_FACE_ID | |
| 6452 /* BUFPOS <= 0 means STRING is not an overlay string, so | |
| 6453 that the region doesn't have to be taken into account. */ | |
| 6454 || bufpos <= 0 | |
| 6455 || bufpos < region_beg | |
| 6456 || bufpos >= region_end) | |
| 6457 && (multibyte_p | |
| 6458 /* We can't realize faces for different charsets differently | |
| 6459 if we don't have fonts, so we can stop here if not working | |
| 6460 on a window-system frame. */ | |
| 6461 || !FRAME_WINDOW_P (f) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6462 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0))) |
| 24995 | 6463 return base_face->id; |
| 6464 | |
| 6465 /* Begin with attributes from the base face. */ | |
| 6466 bcopy (base_face->lface, attrs, sizeof attrs); | |
| 6467 | |
| 6468 /* Merge in attributes specified via text properties. */ | |
| 6469 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
|
6470 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 6471 |
| 6472 /* If in the region, merge in the region face. */ | |
| 6473 if (bufpos | |
| 6474 && bufpos >= region_beg | |
| 6475 && 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
|
6476 merge_named_face (f, Qregion, attrs, 0); |
| 24995 | 6477 |
| 6478 /* 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
|
6479 or realize a new one for ASCII characters. */ |
| 88907 | 6480 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
|
6481 } |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6482 |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6483 |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6484 /* 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
|
6485 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6486 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
|
6487 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6488 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
|
6489 |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6490 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
|
6491 |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6492 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
|
6493 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6494 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
|
6495 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6496 Return new face id. |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6497 */ |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6498 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6499 int |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6500 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
|
6501 struct frame *f; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6502 Lisp_Object face_name; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6503 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
|
6504 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6505 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
|
6506 struct face *base_face; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6507 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6508 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
|
6509 if (!base_face) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6510 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6511 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6512 if (EQ (face_name, Qt)) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6513 { |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6514 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
|
6515 return base_face_id; |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6516 face_name = lface_id_to_name[face_id]; |
|
90128
13796b0653c7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-29
Miles Bader <miles@gnu.org>
diff
changeset
|
6517 face_id = lookup_derived_face (f, face_name, base_face_id, 1); |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6518 if (face_id >= 0) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6519 return face_id; |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6520 return base_face_id; |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6521 } |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6522 |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6523 /* 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
|
6524 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
|
6525 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6526 if (!NILP (face_name)) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6527 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6528 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
|
6529 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6530 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6531 else |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6532 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6533 struct face *face; |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6534 if (face_id < 0) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6535 return base_face_id; |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6536 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
|
6537 if (!face) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6538 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6539 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
|
6540 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6541 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6542 /* 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
|
6543 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
|
6544 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
|
6545 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6546 |
| 2336 | 6547 |
| 24995 | 6548 /*********************************************************************** |
| 6549 Tests | |
| 6550 ***********************************************************************/ | |
| 6551 | |
| 6552 #if GLYPH_DEBUG | |
| 6553 | |
| 6554 /* Print the contents of the realized face FACE to stderr. */ | |
| 6555 | |
| 6556 static void | |
| 6557 dump_realized_face (face) | |
| 6558 struct face *face; | |
| 2336 | 6559 { |
| 24995 | 6560 fprintf (stderr, "ID: %d\n", face->id); |
| 6561 #ifdef HAVE_X_WINDOWS | |
|
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
6562 fprintf (stderr, "gc: %ld\n", (long) face->gc); |
| 24995 | 6563 #endif |
| 6564 fprintf (stderr, "foreground: 0x%lx (%s)\n", | |
| 6565 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
|
6566 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
| 24995 | 6567 fprintf (stderr, "background: 0x%lx (%s)\n", |
| 6568 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
|
6569 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
|
6570 if (face->font) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6571 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
|
6572 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
|
6573 SDATA (face->lface[LFACE_FAMILY_INDEX])); |
| 24995 | 6574 #ifdef HAVE_X_WINDOWS |
| 6575 fprintf (stderr, "font = %p\n", face->font); | |
| 6576 #endif | |
| 6577 fprintf (stderr, "fontset: %d\n", face->fontset); | |
| 6578 fprintf (stderr, "underline: %d (%s)\n", | |
| 6579 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
|
6580 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))); |
| 24995 | 6581 fprintf (stderr, "hash: %d\n", face->hash); |
| 6582 } | |
| 6583 | |
| 6584 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6585 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
|
6586 (n) |
| 24995 | 6587 Lisp_Object n; |
| 6588 { | |
| 6589 if (NILP (n)) | |
| 2336 | 6590 { |
| 24995 | 6591 int i; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6592 |
| 24995 | 6593 fprintf (stderr, "font selection order: "); |
| 6594 for (i = 0; i < DIM (font_sort_order); ++i) | |
| 6595 fprintf (stderr, "%d ", font_sort_order[i]); | |
| 6596 fprintf (stderr, "\n"); | |
| 6597 | |
| 6598 fprintf (stderr, "alternative fonts: "); | |
| 6599 debug_print (Vface_alternative_font_family_alist); | |
| 6600 fprintf (stderr, "\n"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6601 |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6602 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i) |
| 24995 | 6603 Fdump_face (make_number (i)); |
| 2336 | 6604 } |
| 24995 | 6605 else |
| 6606 { | |
| 6607 struct face *face; | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6608 CHECK_NUMBER (n); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6609 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n)); |
| 24995 | 6610 if (face == NULL) |
| 6611 error ("Not a valid face"); | |
| 6612 dump_realized_face (face); | |
| 6613 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6614 |
| 2336 | 6615 return Qnil; |
| 6616 } | |
| 6617 | |
| 6618 | |
| 24995 | 6619 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
|
6620 0, 0, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6621 () |
| 2336 | 6622 { |
| 24995 | 6623 fprintf (stderr, "number of colors = %d\n", ncolors_allocated); |
| 6624 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated); | |
| 6625 fprintf (stderr, "number of GCs = %d\n", ngcs); | |
| 2336 | 6626 return Qnil; |
| 6627 } | |
| 24995 | 6628 |
| 6629 #endif /* GLYPH_DEBUG != 0 */ | |
| 6630 | |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6631 |
|
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6632 |
| 24995 | 6633 /*********************************************************************** |
| 6634 Initialization | |
| 6635 ***********************************************************************/ | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
6636 |
| 2336 | 6637 void |
| 2391 | 6638 syms_of_xfaces () |
| 2336 | 6639 { |
| 2391 | 6640 Qface = intern ("face"); |
| 6641 staticpro (&Qface); | |
| 57107 | 6642 Qface_no_inherit = intern ("face-no-inherit"); |
| 6643 staticpro (&Qface_no_inherit); | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6644 Qbitmap_spec_p = intern ("bitmap-spec-p"); |
|
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6645 staticpro (&Qbitmap_spec_p); |
|
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
6646 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
|
6647 staticpro (&Qframe_set_background_mode); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6648 |
| 24995 | 6649 /* Lisp face attribute keywords. */ |
| 6650 QCfamily = intern (":family"); | |
| 6651 staticpro (&QCfamily); | |
| 6652 QCheight = intern (":height"); | |
| 6653 staticpro (&QCheight); | |
| 6654 QCweight = intern (":weight"); | |
| 6655 staticpro (&QCweight); | |
| 6656 QCslant = intern (":slant"); | |
| 6657 staticpro (&QCslant); | |
| 6658 QCunderline = intern (":underline"); | |
| 6659 staticpro (&QCunderline); | |
| 6660 QCinverse_video = intern (":inverse-video"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6661 staticpro (&QCinverse_video); |
| 24995 | 6662 QCreverse_video = intern (":reverse-video"); |
| 6663 staticpro (&QCreverse_video); | |
| 6664 QCforeground = intern (":foreground"); | |
| 6665 staticpro (&QCforeground); | |
| 6666 QCbackground = intern (":background"); | |
| 6667 staticpro (&QCbackground); | |
|
77903
9a64509cb354
(syms_of_xfaces): Delete stray semicolon.
Chong Yidong <cyd@stupidchicken.com>
parents:
75885
diff
changeset
|
6668 QCstipple = intern (":stipple"); |
| 24995 | 6669 staticpro (&QCstipple); |
| 6670 QCwidth = intern (":width"); | |
| 6671 staticpro (&QCwidth); | |
| 6672 QCfont = intern (":font"); | |
| 6673 staticpro (&QCfont); | |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6674 QCfontset = intern (":fontset"); |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6675 staticpro (&QCfontset); |
| 24995 | 6676 QCbold = intern (":bold"); |
| 6677 staticpro (&QCbold); | |
| 6678 QCitalic = intern (":italic"); | |
| 6679 staticpro (&QCitalic); | |
| 6680 QCoverline = intern (":overline"); | |
| 6681 staticpro (&QCoverline); | |
| 6682 QCstrike_through = intern (":strike-through"); | |
| 6683 staticpro (&QCstrike_through); | |
| 6684 QCbox = intern (":box"); | |
| 6685 staticpro (&QCbox); | |
| 31178 | 6686 QCinherit = intern (":inherit"); |
| 6687 staticpro (&QCinherit); | |
| 24995 | 6688 |
| 6689 /* Symbols used for Lisp face attribute values. */ | |
| 6690 QCcolor = intern (":color"); | |
| 6691 staticpro (&QCcolor); | |
| 6692 QCline_width = intern (":line-width"); | |
| 6693 staticpro (&QCline_width); | |
| 6694 QCstyle = intern (":style"); | |
| 6695 staticpro (&QCstyle); | |
| 6696 Qreleased_button = intern ("released-button"); | |
| 6697 staticpro (&Qreleased_button); | |
| 6698 Qpressed_button = intern ("pressed-button"); | |
| 6699 staticpro (&Qpressed_button); | |
| 6700 Qnormal = intern ("normal"); | |
| 6701 staticpro (&Qnormal); | |
| 6702 Qultra_light = intern ("ultra-light"); | |
| 6703 staticpro (&Qultra_light); | |
| 6704 Qextra_light = intern ("extra-light"); | |
| 6705 staticpro (&Qextra_light); | |
| 6706 Qlight = intern ("light"); | |
| 6707 staticpro (&Qlight); | |
| 6708 Qsemi_light = intern ("semi-light"); | |
| 6709 staticpro (&Qsemi_light); | |
| 6710 Qsemi_bold = intern ("semi-bold"); | |
| 6711 staticpro (&Qsemi_bold); | |
| 6712 Qbold = intern ("bold"); | |
| 6713 staticpro (&Qbold); | |
| 6714 Qextra_bold = intern ("extra-bold"); | |
| 6715 staticpro (&Qextra_bold); | |
| 6716 Qultra_bold = intern ("ultra-bold"); | |
| 6717 staticpro (&Qultra_bold); | |
| 6718 Qoblique = intern ("oblique"); | |
| 6719 staticpro (&Qoblique); | |
| 6720 Qitalic = intern ("italic"); | |
| 6721 staticpro (&Qitalic); | |
| 6722 Qreverse_oblique = intern ("reverse-oblique"); | |
| 6723 staticpro (&Qreverse_oblique); | |
| 6724 Qreverse_italic = intern ("reverse-italic"); | |
| 6725 staticpro (&Qreverse_italic); | |
| 6726 Qultra_condensed = intern ("ultra-condensed"); | |
| 6727 staticpro (&Qultra_condensed); | |
| 6728 Qextra_condensed = intern ("extra-condensed"); | |
| 6729 staticpro (&Qextra_condensed); | |
| 6730 Qcondensed = intern ("condensed"); | |
| 6731 staticpro (&Qcondensed); | |
| 6732 Qsemi_condensed = intern ("semi-condensed"); | |
| 6733 staticpro (&Qsemi_condensed); | |
| 6734 Qsemi_expanded = intern ("semi-expanded"); | |
| 6735 staticpro (&Qsemi_expanded); | |
| 6736 Qexpanded = intern ("expanded"); | |
| 6737 staticpro (&Qexpanded); | |
| 6738 Qextra_expanded = intern ("extra-expanded"); | |
| 6739 staticpro (&Qextra_expanded); | |
| 6740 Qultra_expanded = intern ("ultra-expanded"); | |
| 6741 staticpro (&Qultra_expanded); | |
| 6742 Qbackground_color = intern ("background-color"); | |
| 6743 staticpro (&Qbackground_color); | |
| 6744 Qforeground_color = intern ("foreground-color"); | |
| 6745 staticpro (&Qforeground_color); | |
| 6746 Qunspecified = intern ("unspecified"); | |
| 6747 staticpro (&Qunspecified); | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6748 Qignore_defface = intern (":ignore-defface"); |
|
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6749 staticpro (&Qignore_defface); |
| 24995 | 6750 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6751 Qface_alias = intern ("face-alias"); |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6752 staticpro (&Qface_alias); |
| 24995 | 6753 Qdefault = intern ("default"); |
| 6754 staticpro (&Qdefault); | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
6755 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
|
6756 staticpro (&Qtool_bar); |
| 24995 | 6757 Qregion = intern ("region"); |
| 6758 staticpro (&Qregion); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6759 Qfringe = intern ("fringe"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6760 staticpro (&Qfringe); |
| 25546 | 6761 Qheader_line = intern ("header-line"); |
| 6762 staticpro (&Qheader_line); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6763 Qscroll_bar = intern ("scroll-bar"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6764 staticpro (&Qscroll_bar); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6765 Qmenu = intern ("menu"); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6766 staticpro (&Qmenu); |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6767 Qcursor = intern ("cursor"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6768 staticpro (&Qcursor); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6769 Qborder = intern ("border"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6770 staticpro (&Qborder); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6771 Qmouse = intern ("mouse"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6772 staticpro (&Qmouse); |
|
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
6773 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
|
6774 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
|
6775 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
|
6776 staticpro (&Qvertical_border); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6777 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
|
6778 staticpro (&Qtty_color_desc); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6779 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
|
6780 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
|
6781 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
|
6782 staticpro (&Qtty_color_by_index); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6783 Qtty_color_alist = intern ("tty-color-alist"); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6784 staticpro (&Qtty_color_alist); |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6785 Qscalable_fonts_allowed = intern ("scalable-fonts-allowed"); |
|
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6786 staticpro (&Qscalable_fonts_allowed); |
| 24995 | 6787 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6788 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil); |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6789 staticpro (&Vparam_value_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6790 Vface_alternative_font_family_alist = Qnil; |
|
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6791 staticpro (&Vface_alternative_font_family_alist); |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6792 Vface_alternative_font_registry_alist = Qnil; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6793 staticpro (&Vface_alternative_font_registry_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6794 |
| 24995 | 6795 defsubr (&Sinternal_make_lisp_face); |
| 6796 defsubr (&Sinternal_lisp_face_p); | |
| 6797 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
|
6798 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 6799 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
|
6800 #endif |
|
27120
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6801 defsubr (&Scolor_gray_p); |
|
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6802 defsubr (&Scolor_supported_p); |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6803 defsubr (&Sface_attribute_relative_p); |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6804 defsubr (&Smerge_face_attribute); |
| 24995 | 6805 defsubr (&Sinternal_get_lisp_face_attribute); |
| 6806 defsubr (&Sinternal_lisp_face_attribute_values); | |
| 6807 defsubr (&Sinternal_lisp_face_equal_p); | |
| 6808 defsubr (&Sinternal_lisp_face_empty_p); | |
| 6809 defsubr (&Sinternal_copy_lisp_face); | |
| 6810 defsubr (&Sinternal_merge_in_global_face); | |
| 6811 defsubr (&Sface_font); | |
| 6812 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
|
6813 defsubr (&Sdisplay_supports_face_attributes_p); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6814 defsubr (&Scolor_distance); |
| 24995 | 6815 defsubr (&Sinternal_set_font_selection_order); |
| 6816 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
|
6817 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
|
6818 defsubr (&Sface_attributes_as_vector); |
| 24995 | 6819 #if GLYPH_DEBUG |
| 6820 defsubr (&Sdump_face); | |
| 6821 defsubr (&Sshow_face_resources); | |
| 6822 #endif /* GLYPH_DEBUG */ | |
| 6823 defsubr (&Sclear_face_cache); | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6824 defsubr (&Stty_suppress_bold_inverse_default_colors); |
| 24995 | 6825 |
|
29711
913fab478495
(syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents:
29599
diff
changeset
|
6826 #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
|
6827 defsubr (&Sdump_colors); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6828 #endif |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6829 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6830 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
|
6831 doc: /* *Limit for font matching. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6832 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
|
6833 that number of fonts when searching for a matching font. */); |
| 25270 | 6834 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
| 6835 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6836 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
|
6837 doc: /* List of global face definitions (for internal use only.) */); |
| 24995 | 6838 Vface_new_frame_defaults = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6839 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6840 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
|
6841 doc: /* *Default stipple pattern used on monochrome displays. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6842 This stipple pattern is used on monochrome displays |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6843 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
|
6844 See `set-face-stipple' for possible values for this variable. */); |
| 24995 | 6845 Vface_default_stipple = build_string ("gray3"); |
| 6846 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6847 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
|
6848 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
|
6849 Vtty_defined_color_alist = Qnil; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6850 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6851 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
|
6852 doc: /* Allowed scalable fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6853 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
|
6854 A value of t means allow any scalable font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6855 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
|
6856 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
|
6857 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
|
6858 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
|
6859 Vscalable_fonts_allowed = Qnil; |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6860 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6861 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
|
6862 doc: /* List of ignored fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6863 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
|
6864 ignore. */); |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6865 Vface_ignored_fonts = Qnil; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6866 |
|
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6867 DEFVAR_LISP ("face-remapping-alist", &Vface_remapping_alist, |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6868 doc: /* Alist of face remappings. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6869 Each element is of the form: |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6870 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6871 (FACE REPLACEMENT...), |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6872 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6873 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
|
6874 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
|
6875 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
|
6876 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
|
6877 intermixed with lists containing face attribute/value pairs. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6878 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6879 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
|
6880 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
|
6881 over those that are later. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6882 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6883 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
|
6884 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
|
6885 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6886 (FACE EXTRA-FACE... FACE) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6887 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6888 or: |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6889 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6890 (FACE (FACE-ATTR VAL ...) FACE) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6891 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6892 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
|
6893 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
|
6894 necessary, as every face inherits from the default face. |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6895 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6896 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
|
6897 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
|
6898 `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
|
6899 |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6900 (set (make-local-variable 'face-remapping-alist) |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6901 '((default my-mode-default)))). */); |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6902 Vface_remapping_alist = Qnil; |
|
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6903 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6904 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
|
6905 doc: /* Alist of fonts vs the rescaling factors. |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6906 Each element is a cons (FONT-NAME-PATTERN . RESCALE-RATIO), where |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6907 FONT-NAME-PATTERN is a regular expression matching a font name, and |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6908 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
|
6909 \(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
|
6910 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
|
6911 Vface_font_rescale_alist = Qnil; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6912 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6913 #ifdef HAVE_WINDOW_SYSTEM |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6914 defsubr (&Sbitmap_spec_p); |
| 24995 | 6915 defsubr (&Sx_list_fonts); |
| 6916 defsubr (&Sinternal_face_x_get_resource); | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6917 defsubr (&Sx_family_fonts); |
| 24995 | 6918 defsubr (&Sx_font_family_list); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6919 #endif /* HAVE_WINDOW_SYSTEM */ |
| 2336 | 6920 } |
| 52401 | 6921 |
| 6922 /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 | |
| 6923 (do not change this comment) */ |
