Mercurial > emacs
annotate src/xfaces.c @ 95065:36c19ba93dca
(fortran-font-lock-keywords-2): Add .eqv., .neqv.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 17 May 2008 20:08:37 +0000 |
| parents | f4fac6175e87 |
| children | 9c4d21df23ff |
| 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 |
| 24995 | 30 2. Relative proportionate width, aka character set width or set |
| 31 width (swidth), e.g. `semi-compressed'. | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
32 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
33 3. Font height in 1/10pt. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
34 |
| 24995 | 35 4. Font weight, e.g. `bold'. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
36 |
| 24995 | 37 5. Font slant, e.g. `italic'. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
38 |
| 24995 | 39 6. Foreground color. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
40 |
| 24995 | 41 7. Background color. |
| 42 | |
| 43 8. Whether or not characters should be underlined, and in what color. | |
| 44 | |
| 45 9. Whether or not characters should be displayed in inverse video. | |
| 46 | |
| 47 10. A background stipple, a bitmap. | |
| 48 | |
| 49 11. Whether or not characters should be overlined, and in what color. | |
| 50 | |
| 51 12. Whether or not characters should be strike-through, and in what | |
| 52 color. | |
| 53 | |
| 54 13. Whether or not a box should be drawn around characters, the box | |
| 55 type, and, for simple boxes, in what color. | |
| 56 | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
57 14. Font-spec, or nil. This is a special attribute. |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
58 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
59 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
|
60 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
61 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
|
62 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
|
63 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
|
64 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
|
65 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
66 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
|
67 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
|
68 |
| 31178 | 69 15. A face name or list of face names from which to inherit attributes. |
| 70 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
71 16. A specified average font width, which is invisible from Lisp, |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
72 and is used to ensure that a font specified on the command line, |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
73 for example, can be matched exactly. |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
74 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
75 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
|
76 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
77 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
|
78 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
|
79 |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
80 |
| 24995 | 81 Faces are frame-local by nature because Emacs allows to define the |
| 82 same named face (face names are symbols) differently for different | |
| 83 frames. Each frame has an alist of face definitions for all named | |
| 84 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
|
85 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
|
86 attributes mentioned above. |
| 24995 | 87 |
| 88 There is also a global face alist `Vface_new_frame_defaults'. Face | |
| 89 definitions from this list are used to initialize faces of newly | |
| 90 created frames. | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
91 |
| 24995 | 92 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
|
93 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
|
94 the 14th are called `fully-specified'. |
| 24995 | 95 |
| 96 | |
| 97 Face merging. | |
| 98 | |
| 99 The display style of a given character in the text is determined by | |
| 100 combining several faces. This process is called `face merging'. | |
| 101 Any aspect of the display style that isn't specified by overlays or | |
| 102 text properties is taken from the `default' face. Since it is made | |
| 103 sure that the default face is always fully-specified, face merging | |
| 104 always results in a fully-specified face. | |
| 105 | |
| 106 | |
| 107 Face realization. | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
108 |
| 24995 | 109 After all face attributes for a character have been determined by |
| 110 merging faces of that character, that face is `realized'. The | |
| 111 realization process maps face attributes to what is physically | |
| 112 available on the system where Emacs runs. The result is a | |
| 113 `realized face' in form of a struct face which is stored in the | |
| 114 face cache of the frame on which it was realized. | |
| 115 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
116 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
|
117 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
|
118 other words, for characters that have different font |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
119 specifications, different realized faces are needed to display |
| 24995 | 120 them. |
| 121 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
122 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
|
123 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
|
124 characters share the same font in a fontset. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
125 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
126 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
|
127 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
|
128 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
|
129 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
|
130 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
|
131 |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
132 Thus, all realized faces have a realized fontset. |
| 24995 | 133 |
| 134 | |
| 135 Unibyte text. | |
| 136 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
137 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
|
138 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
|
139 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
|
140 and raw 8-bit characters. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
141 |
| 24995 | 142 |
| 143 Font selection. | |
| 144 | |
| 145 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
|
146 given (character, face) combination. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
147 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
148 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
|
149 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
|
150 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
|
151 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
|
152 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
|
153 default fontset determines a pattern for multibyte characters. |
| 24995 | 154 |
| 155 Available fonts on the system on which Emacs runs are then matched | |
| 156 against the font pattern. The result of font selection is the best | |
| 157 match for the given face attributes in this font list. | |
| 158 | |
| 159 Font selection can be influenced by the user. | |
| 160 | |
| 161 1. The user can specify the relative importance he gives the face | |
| 162 attributes width, height, weight, and slant by setting | |
| 163 face-font-selection-order (faces.el) to a list of face attribute | |
| 164 names. The default is '(:width :height :weight :slant), and means | |
| 165 that font selection first tries to find a good match for the font | |
| 166 width specified by a face, then---within fonts with that | |
| 167 width---tries to find a best match for the specified font height, | |
| 168 etc. | |
| 169 | |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
170 2. Setting face-font-family-alternatives allows the user to |
| 24995 | 171 specify alternative font families to try if a family specified by a |
| 172 face doesn't exist. | |
| 173 | |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
174 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
|
175 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
|
176 specifying a registry. |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
177 |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
178 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
|
179 fonts. |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
180 |
| 24995 | 181 |
| 36946 | 182 Character composition. |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
183 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
184 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
|
185 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
|
186 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
|
187 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
|
188 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
|
189 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
|
190 the same. |
| 24995 | 191 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
192 |
| 24995 | 193 Initialization of basic faces. |
| 194 | |
| 195 The faces `default', `modeline' are considered `basic faces'. | |
| 196 When redisplay happens the first time for a newly created frame, | |
| 197 basic faces are realized for CHARSET_ASCII. Frame parameters are | |
| 198 used to fill in unspecified attributes of the default face. */ | |
| 199 | |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25890
diff
changeset
|
200 #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
|
201 #include <stdio.h> |
| 2336 | 202 #include <sys/types.h> |
| 203 #include <sys/stat.h> | |
|
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
204 #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
|
205 |
| 2336 | 206 #include "lisp.h" |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
207 #include "character.h" |
| 17047 | 208 #include "charset.h" |
|
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
209 #include "keyboard.h" |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
210 #include "frame.h" |
|
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
211 #include "termhooks.h" |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
212 |
| 9572 | 213 #ifdef HAVE_X_WINDOWS |
| 2336 | 214 #include "xterm.h" |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
215 #ifdef USE_MOTIF |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
216 #include <Xm/Xm.h> |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
217 #include <Xm/XmStrDefs.h> |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
218 #endif /* USE_MOTIF */ |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
219 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 220 |
| 9572 | 221 #ifdef MSDOS |
| 222 #include "dosfns.h" | |
| 223 #endif | |
| 24995 | 224 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
225 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
226 #include "w32term.h" |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
227 #include "fontset.h" |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
228 /* 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
|
229 code with #ifdef blocks. */ |
|
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
230 #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
|
231 #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
|
232 #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
|
233 #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
|
234 #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
|
235 #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
|
236 #define GCGraphicsExposures 0 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
237 #endif /* WINDOWSNT */ |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
238 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
239 #ifdef MAC_OS |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
240 #include "macterm.h" |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
241 #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
|
242 #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
|
243 #endif /* MAC_OS */ |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
244 |
| 2336 | 245 #include "buffer.h" |
| 2391 | 246 #include "dispextern.h" |
| 2438 | 247 #include "blockinput.h" |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
248 #include "window.h" |
| 8848 | 249 #include "intervals.h" |
|
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
250 #include "termchar.h" |
| 2336 | 251 |
| 90414 | 252 #ifdef HAVE_WINDOW_SYSTEM |
| 253 #include "font.h" | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
254 #include "fontset.h" |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
255 #endif /* HAVE_WINDOW_SYSTEM */ |
| 90414 | 256 |
| 9572 | 257 #ifdef HAVE_X_WINDOWS |
| 24995 | 258 |
| 259 /* 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
|
260 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
|
261 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
|
262 #included. */ |
| 24995 | 263 |
|
3436
291f28da7ea1
Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents:
3401
diff
changeset
|
264 #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
|
265 #include <time.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
266 #undef USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
267 #include <X11/Xos.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
268 #define USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
269 #define __TIMEVAL__ |
| 24995 | 270 #else /* not XOS_NEEDS_TIME_H */ |
| 2336 | 271 #include <X11/Xos.h> |
| 24995 | 272 #endif /* not XOS_NEEDS_TIME_H */ |
| 273 | |
| 9572 | 274 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 275 |
| 276 #include <ctype.h> | |
| 277 | |
| 34882 | 278 /* Number of pt per inch (from the TeXbook). */ |
| 279 | |
| 280 #define PT_PER_INCH 72.27 | |
| 281 | |
| 24995 | 282 /* Non-zero if face attribute ATTR is unspecified. */ |
| 283 | |
| 284 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) | |
| 285 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
286 /* 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
|
287 |
|
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
288 #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
|
289 |
| 24995 | 290 /* Value is the number of elements of VECTOR. */ |
| 291 | |
| 292 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) | |
| 293 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
294 /* Make a copy of string S on the stack using alloca. Value is a pointer |
| 24995 | 295 to the copy. */ |
| 296 | |
| 297 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S)) | |
| 298 | |
| 299 /* Make a copy of the contents of Lisp string S on the stack using | |
| 300 alloca. Value is a pointer to the copy. */ | |
| 301 | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
302 #define LSTRDUPA(S) STRDUPA (SDATA ((S))) |
| 24995 | 303 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
304 /* Size of hash table of realized faces in face caches (should be a |
| 24995 | 305 prime number). */ |
| 306 | |
| 307 #define FACE_CACHE_BUCKETS_SIZE 1001 | |
| 308 | |
| 309 /* Keyword symbols used for face attribute names. */ | |
| 310 | |
| 311 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; | |
| 312 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; | |
| 313 Lisp_Object QCwidth, QCfont, QCbold, QCitalic; | |
| 314 Lisp_Object QCreverse_video; | |
| 31178 | 315 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
316 Lisp_Object QCfontset; |
| 24995 | 317 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
318 /* Keywords symbols used for font properties. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
319 extern Lisp_Object QCfoundry, QCadstyle, QCregistry; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
320 extern Lisp_Object QCspacing, QCsize, QCavgwidth; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
321 extern Lisp_Object Qp; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
322 |
| 24995 | 323 /* Symbols used for attribute values. */ |
| 324 | |
| 325 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
| 326 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
| 327 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
| 328 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
| 329 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
| 330 Lisp_Object Qultra_expanded; | |
| 331 Lisp_Object Qreleased_button, Qpressed_button; | |
| 332 Lisp_Object QCstyle, QCcolor, QCline_width; | |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
333 Lisp_Object Qunspecified; |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
334 Lisp_Object Qignore_defface; |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
335 |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
336 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
| 24995 | 337 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
338 /* 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
|
339 has changed, frame_set_background_mode. */ |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
340 |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
341 Lisp_Object Qframe_set_background_mode; |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
342 |
| 24995 | 343 /* Names of basic faces. */ |
| 344 | |
|
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
345 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
|
346 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
|
347 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
|
348 extern Lisp_Object Qmode_line; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
349 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
350 /* The symbol `face-alias'. A symbols having that property is an |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
351 alias for another face. Value of the property is the name of |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
352 the aliased face. */ |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
353 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
354 Lisp_Object Qface_alias; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
355 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
356 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
|
357 |
| 24995 | 358 /* Default stipple pattern used on monochrome displays. This stipple |
| 359 pattern is used on monochrome displays instead of shades of gray | |
| 360 for a face background color. See `set-face-stipple' for possible | |
| 361 values for this variable. */ | |
| 362 | |
| 363 Lisp_Object Vface_default_stipple; | |
| 364 | |
| 365 /* Alist of alternative font families. Each element is of the form | |
| 366 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
| 367 try FAMILY1, then FAMILY2, ... */ | |
| 368 | |
| 369 Lisp_Object Vface_alternative_font_family_alist; | |
| 370 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
371 /* 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
|
372 (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
|
373 loaded, try REGISTRY1, then REGISTRY2, ... */ |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
374 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
375 Lisp_Object Vface_alternative_font_registry_alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
376 |
| 24995 | 377 /* Allowed scalable fonts. A value of nil means don't allow any |
| 378 scalable fonts. A value of t means allow the use of any scalable | |
| 379 font. Otherwise, value must be a list of regular expressions. A | |
| 380 font may be scaled if its name matches a regular expression in the | |
| 381 list. */ | |
| 382 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
383 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
| 24995 | 384 |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
385 /* 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
|
386 |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
387 Lisp_Object Vface_ignored_fonts; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
388 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
389 /* 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
|
390 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
391 Lisp_Object Vface_font_rescale_alist; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
392 |
| 25270 | 393 /* Maximum number of fonts to consider in font_list. If not an |
| 394 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
| 395 | |
| 396 Lisp_Object Vfont_list_limit; | |
| 397 #define DEFAULT_FONT_LIST_LIMIT 100 | |
| 398 | |
| 24995 | 399 /* The symbols `foreground-color' and `background-color' which can be |
| 400 used as part of a `face' property. This is for compatibility with | |
| 401 Emacs 20.2. */ | |
| 402 | |
| 403 Lisp_Object Qforeground_color, Qbackground_color; | |
| 404 | |
| 405 /* The symbols `face' and `mouse-face' used as text properties. */ | |
| 2342 | 406 |
|
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
407 Lisp_Object Qface; |
| 24995 | 408 extern Lisp_Object Qmouse_face; |
| 409 | |
| 57107 | 410 /* Property for basic faces which other faces cannot inherit. */ |
| 411 | |
| 412 Lisp_Object Qface_no_inherit; | |
| 413 | |
| 24995 | 414 /* Error symbol for wrong_type_argument in load_pixmap. */ |
| 415 | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
416 Lisp_Object Qbitmap_spec_p; |
| 2391 | 417 |
| 24995 | 418 /* Alist of global face definitions. Each element is of the form |
| 419 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
| 420 is a Lisp vector of face attributes. These faces are used | |
| 421 to initialize faces for new frames. */ | |
| 422 | |
| 423 Lisp_Object Vface_new_frame_defaults; | |
| 424 | |
| 425 /* The next ID to assign to Lisp faces. */ | |
| 426 | |
| 427 static int next_lface_id; | |
| 428 | |
| 429 /* A vector mapping Lisp face Id's to face names. */ | |
| 430 | |
| 431 static Lisp_Object *lface_id_to_name; | |
| 432 static int lface_id_to_name_size; | |
| 433 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
434 /* 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
|
435 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
436 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
| 24995 | 437 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
438 /* 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
|
439 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
440 Lisp_Object Qtty_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
441 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
442 /* 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
|
443 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
444 Lisp_Object Vtty_defined_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
445 |
| 24995 | 446 /* Counter for calls to clear_face_cache. If this counter reaches |
| 447 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
| 448 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
| 449 | |
| 450 static int clear_font_table_count; | |
| 451 #define CLEAR_FONT_TABLE_COUNT 100 | |
| 452 #define CLEAR_FONT_TABLE_NFONTS 10 | |
| 453 | |
| 454 /* Non-zero means face attributes have been changed since the last | |
| 455 redisplay. Used in redisplay_internal. */ | |
| 456 | |
| 457 int face_change_count; | |
| 458 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
459 /* 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
|
460 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
|
461 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
|
462 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
|
463 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
464 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
|
465 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
466 /* 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
|
467 Finternal_set_lisp_face_attribute. */ |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
468 |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
469 static Lisp_Object Vparam_value_alist; |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
470 |
| 24995 | 471 /* The total number of colors currently allocated. */ |
| 472 | |
| 473 #if GLYPH_DEBUG | |
| 474 static int ncolors_allocated; | |
| 475 static int npixmaps_allocated; | |
| 476 static int ngcs; | |
| 477 #endif | |
| 478 | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
479 /* 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
|
480 been changed. */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
481 |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
482 int menu_face_changed_default; |
| 24995 | 483 |
| 2336 | 484 |
| 24995 | 485 /* Function prototypes. */ |
| 486 | |
| 487 struct font_name; | |
| 488 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
|
489 struct named_merge_point; |
| 24995 | 490 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
491 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
|
492 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
|
493 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
|
494 static int may_use_scalable_font_p P_ ((const char *)); |
| 24995 | 495 static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); |
| 496 static int better_font_p P_ ((int *, struct font_name *, struct font_name *, | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
497 int, int)); |
| 24995 | 498 static int x_face_list_fonts P_ ((struct frame *, char *, |
|
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
499 struct font_name **, int, int)); |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
500 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int)); |
| 24995 | 501 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); |
| 502 static unsigned char *xstrlwr P_ ((unsigned char *)); | |
| 503 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); | |
| 88907 | 504 static void load_face_font P_ ((struct frame *, struct face *)); |
| 24995 | 505 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); |
| 506 static void free_face_colors P_ ((struct frame *, struct face *)); | |
| 507 static int face_color_gray_p P_ ((struct frame *, char *)); | |
| 508 static char *build_font_name P_ ((struct font_name *)); | |
| 509 static void free_font_names P_ ((struct font_name *, int)); | |
| 510 static int sorted_font_list P_ ((struct frame *, char *, | |
| 511 int (*cmpfn) P_ ((const void *, const void *)), | |
| 512 struct font_name **)); | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
513 static int font_list_1 P_ ((struct frame *, Lisp_Object, Lisp_Object, |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
514 Lisp_Object, struct font_name **)); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
515 static int font_list P_ ((struct frame *, Lisp_Object, Lisp_Object, |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
516 Lisp_Object, struct font_name **)); |
| 88907 | 517 static int try_font_list P_ ((struct frame *, Lisp_Object, |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
518 Lisp_Object, Lisp_Object, struct font_name **)); |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
519 static int try_alternative_families P_ ((struct frame *f, Lisp_Object, |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
520 Lisp_Object, struct font_name **)); |
| 24995 | 521 static int cmp_font_names P_ ((const void *, const void *)); |
| 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 char *best_matching_font P_ ((struct frame *, Lisp_Object *, |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
549 struct font_name *, int, int, int *)); |
| 24995 | 550 static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); |
| 551 static void uncache_face P_ ((struct face_cache *, struct face *)); | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
552 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
553 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 554 |
| 555 static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); | |
| 556 static void x_free_gc P_ ((struct frame *, GC)); | |
| 557 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
558 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
559 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
|
560 #endif /* WINDOWSNT */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
561 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
562 #ifdef USE_X_TOOLKIT |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
563 static void x_update_menu_appearance P_ ((struct frame *)); |
| 39675 | 564 |
| 565 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
|
566 #endif /* USE_X_TOOLKIT */ |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
567 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
568 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 569 |
| 570 | |
| 571 /*********************************************************************** | |
| 572 Utilities | |
| 573 ***********************************************************************/ | |
| 574 | |
| 575 #ifdef HAVE_X_WINDOWS | |
| 576 | |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
577 #ifdef DEBUG_X_COLORS |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
578 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
579 /* 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
|
580 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
|
581 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
|
582 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
|
583 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
|
584 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
|
585 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
|
586 single display/screen. --gerd. */ |
|
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 /* Reference counts for pixel colors. */ |
|
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 int color_count[256]; |
|
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 /* Register color PIXEL as allocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
593 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
594 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 register_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 unsigned long pixel; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
597 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
598 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
599 ++color_count[pixel]; |
|
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 |
|
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 /* Register color PIXEL as deallocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
605 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
606 unregister_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
607 unsigned long pixel; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
608 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
609 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
610 if (color_count[pixel] > 0) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
611 --color_count[pixel]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 else |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 abort (); |
|
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 |
|
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 /* Register N colors from PIXELS as deallocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
618 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
619 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
620 unregister_colors (pixels, n) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
621 unsigned long *pixels; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
622 int n; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
623 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
624 int i; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
625 for (i = 0; i < n; ++i) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
626 unregister_color (pixels[i]); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
627 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
628 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
629 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
630 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
|
631 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
|
632 () |
|
29599
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 int i, n; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
635 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
636 fputc ('\n', stderr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
637 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
638 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
|
639 if (color_count[i]) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
640 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
641 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
|
642 ++n; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
643 if (n % 5 == 0) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
644 fputc ('\n', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
645 else |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
646 fputc ('\t', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
647 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
648 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
649 if (n % 5 != 0) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
650 fputc ('\n', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
651 return Qnil; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
652 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
653 |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
654 #endif /* DEBUG_X_COLORS */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
655 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
656 |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
657 /* 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
|
658 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
|
659 is called. */ |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
660 |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
661 void |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
662 x_free_colors (f, pixels, npixels) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
663 struct frame *f; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
664 unsigned long *pixels; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
665 int npixels; |
|
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 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
668 |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
669 /* 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
|
670 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
|
671 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
672 { |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
673 #ifdef DEBUG_X_COLORS |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
674 unregister_colors (pixels, npixels); |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
675 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
676 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
|
677 pixels, npixels, 0); |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
678 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
679 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
680 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
681 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
682 /* 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
|
683 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
|
684 is called. */ |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
685 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
686 void |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
687 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
|
688 Display *dpy; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
689 Screen *screen; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
690 Colormap cmap; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
691 unsigned long *pixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
692 int npixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
693 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
694 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
|
695 int class = dpyinfo->visual->class; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
696 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
697 /* 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
|
698 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
|
699 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
700 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
701 #ifdef DEBUG_X_COLORS |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
702 unregister_colors (pixels, npixels); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
703 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
704 XFreeColors (dpy, cmap, pixels, npixels, 0); |
|
29599
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 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
707 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
708 |
| 24995 | 709 /* Create and return a GC for use on frame F. GC values and mask |
| 710 are given by XGCV and MASK. */ | |
| 711 | |
| 712 static INLINE GC | |
| 713 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
|
714 struct frame *f; |
| 24995 | 715 unsigned long mask; |
| 716 XGCValues *xgcv; | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
717 { |
| 2336 | 718 GC gc; |
| 24995 | 719 BLOCK_INPUT; |
| 720 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
| 721 UNBLOCK_INPUT; | |
| 722 IF_DEBUG (++ngcs); | |
| 723 return gc; | |
| 724 } | |
| 725 | |
| 726 | |
| 727 /* Free GC which was used on frame F. */ | |
| 728 | |
| 729 static INLINE void | |
| 730 x_free_gc (f, gc) | |
| 731 struct frame *f; | |
| 732 GC gc; | |
| 733 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
734 eassert (interrupt_input_blocked); |
|
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
735 IF_DEBUG (xassert (--ngcs >= 0)); |
| 24995 | 736 XFreeGC (FRAME_X_DISPLAY (f), gc); |
| 737 } | |
| 738 | |
| 739 #endif /* HAVE_X_WINDOWS */ | |
| 740 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
741 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
742 /* W32 emulation of GCs */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
743 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
744 static INLINE GC |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
745 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
|
746 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
747 unsigned long mask; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
748 XGCValues *xgcv; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
749 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
750 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
751 BLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
752 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
|
753 UNBLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
754 IF_DEBUG (++ngcs); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
755 return gc; |
|
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 |
|
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 /* 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
|
760 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
761 static INLINE void |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
762 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
|
763 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
764 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
765 { |
|
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
766 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
|
767 xfree (gc); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
768 } |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
769 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
770 #endif /* WINDOWSNT */ |
| 24995 | 771 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
772 #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
|
773 /* 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
|
774 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
775 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
|
776 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
|
777 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
|
778 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
|
779 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
|
780 { |
|
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 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
|
782 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
|
783 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
|
784 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
|
785 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
|
786 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
|
787 } |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
788 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
789 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
|
790 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
|
791 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
|
792 GC gc; |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
793 { |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
794 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
|
795 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
|
796 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
|
797 } |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
798 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
799 #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
|
800 |
| 24995 | 801 /* Like stricmp. Used to compare parts of font names which are in |
| 802 ISO8859-1. */ | |
| 803 | |
| 804 int | |
| 805 xstricmp (s1, s2) | |
|
46478
d6b51ec01987
(xstricmp): String pointer args now point to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
806 const unsigned char *s1, *s2; |
| 24995 | 807 { |
| 808 while (*s1 && *s2) | |
| 809 { | |
| 810 unsigned char c1 = tolower (*s1); | |
| 811 unsigned char c2 = tolower (*s2); | |
| 812 if (c1 != c2) | |
| 813 return c1 < c2 ? -1 : 1; | |
| 814 ++s1, ++s2; | |
| 815 } | |
| 816 | |
| 817 if (*s1 == 0) | |
| 818 return *s2 == 0 ? 0 : -1; | |
| 819 return 1; | |
| 820 } | |
| 821 | |
| 822 | |
| 823 /* Like strlwr, which might not always be available. */ | |
| 824 | |
| 825 static unsigned char * | |
| 826 xstrlwr (s) | |
| 827 unsigned char *s; | |
| 828 { | |
| 829 unsigned char *p = s; | |
| 830 | |
| 831 for (p = s; *p; ++p) | |
|
65347
307b8f7742fe
(xstrlwr): Don't use tolower for non-ASCII characters.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64770
diff
changeset
|
832 /* On Mac OS X 10.3, tolower also converts non-ASCII characters |
|
307b8f7742fe
(xstrlwr): Don't use tolower for non-ASCII characters.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64770
diff
changeset
|
833 for some locales. */ |
|
307b8f7742fe
(xstrlwr): Don't use tolower for non-ASCII characters.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64770
diff
changeset
|
834 if (isascii (*p)) |
|
307b8f7742fe
(xstrlwr): Don't use tolower for non-ASCII characters.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64770
diff
changeset
|
835 *p = tolower (*p); |
| 24995 | 836 |
| 837 return s; | |
| 838 } | |
| 839 | |
| 840 | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
841 /* 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
|
842 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
|
843 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
|
844 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
|
845 Lisp function definitions. */ |
| 24995 | 846 |
| 847 static INLINE struct frame * | |
| 848 frame_or_selected_frame (frame, nparam) | |
| 849 Lisp_Object frame; | |
| 850 int nparam; | |
| 851 { | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
852 if (NILP (frame)) |
|
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
853 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
854 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
855 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
856 return XFRAME (frame); |
| 24995 | 857 } |
| 858 | |
| 859 | |
| 860 /*********************************************************************** | |
| 861 Frames and faces | |
| 862 ***********************************************************************/ | |
| 863 | |
| 864 /* 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
|
865 |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
866 void |
| 24995 | 867 init_frame_faces (f) |
| 868 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
|
869 { |
| 24995 | 870 /* Make a face cache, if F doesn't have one. */ |
| 871 if (FRAME_FACE_CACHE (f) == NULL) | |
| 872 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
873 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
874 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 875 /* 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
|
876 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
|
877 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
878 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
|
879 /* Is that ever possible?? --Stef */ |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
880 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
|
881 ++FRAME_IMAGE_CACHE (f)->refcount; |
| 24995 | 882 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
883 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 884 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
885 /* Realize basic faces. Must have enough information in frame |
| 24995 | 886 parameters to realize basic faces at this point. */ |
| 887 #ifdef HAVE_X_WINDOWS | |
| 888 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
| 889 #endif | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
890 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
891 if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
892 #endif |
| 45848 | 893 #ifdef MAC_OS |
| 894 if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) | |
| 895 #endif | |
| 24995 | 896 if (!realize_basic_faces (f)) |
| 897 abort (); | |
| 898 } | |
| 899 | |
| 900 | |
| 901 /* Free face cache of frame F. Called from Fdelete_frame. */ | |
| 902 | |
| 903 void | |
| 904 free_frame_faces (f) | |
| 905 struct frame *f; | |
| 906 { | |
| 907 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
|
908 |
| 24995 | 909 if (face_cache) |
| 910 { | |
| 911 free_face_cache (face_cache); | |
| 912 FRAME_FACE_CACHE (f) = NULL; | |
| 913 } | |
| 914 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
915 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
916 if (FRAME_WINDOW_P (f)) |
| 24995 | 917 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
918 struct image_cache *image_cache = FRAME_IMAGE_CACHE (f); |
| 24995 | 919 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
|
920 { |
| 24995 | 921 --image_cache->refcount; |
| 922 if (image_cache->refcount == 0) | |
| 923 free_image_cache (f); | |
| 924 } | |
| 925 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
926 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 927 } |
| 928 | |
| 929 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
930 /* 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
|
931 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
|
932 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
|
933 of named faces. */ |
| 24995 | 934 |
| 935 void | |
| 936 recompute_basic_faces (f) | |
| 937 struct frame *f; | |
| 938 { | |
| 939 if (FRAME_FACE_CACHE (f)) | |
| 940 { | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
941 clear_face_cache (0); |
|
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
942 if (!realize_basic_faces (f)) |
|
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
943 abort (); |
| 24995 | 944 } |
| 945 } | |
| 946 | |
| 947 | |
| 948 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
| 949 try to free unused fonts, too. */ | |
| 950 | |
| 951 void | |
| 952 clear_face_cache (clear_fonts_p) | |
| 953 int clear_fonts_p; | |
| 954 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
955 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 956 Lisp_Object tail, frame; |
| 957 struct frame *f; | |
| 958 | |
| 959 if (clear_fonts_p | |
| 960 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
| 961 { | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
962 struct x_display_info *dpyinfo; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
963 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
964 #if 0 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
965 /* Not yet implemented. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
966 clear_font_cache (frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
967 #endif |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
968 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
969 |
| 24995 | 970 /* From time to time see if we can unload some fonts. This also |
| 971 frees all realized faces on all frames. Fonts needed by | |
| 972 faces will be loaded again when faces are realized again. */ | |
| 973 clear_font_table_count = 0; | |
| 974 | |
| 975 FOR_EACH_FRAME (tail, frame) | |
| 976 { | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
977 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
|
978 if (FRAME_WINDOW_P (f) |
| 24995 | 979 && 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
|
980 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
|
981 } |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
982 } |
| 24995 | 983 else |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
984 { |
| 24995 | 985 /* Clear GCs of realized faces. */ |
| 986 FOR_EACH_FRAME (tail, frame) | |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
987 { |
| 24995 | 988 f = XFRAME (frame); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
989 if (FRAME_WINDOW_P (f)) |
| 24995 | 990 clear_face_gcs (FRAME_FACE_CACHE (f)); |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
991 } |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
992 clear_image_caches (Qnil); |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
993 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
994 #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
|
995 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
996 |
| 24995 | 997 |
| 998 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
|
999 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
|
1000 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
|
1001 (thoroughly) |
|
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1002 Lisp_Object thoroughly; |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1003 { |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1004 clear_face_cache (!NILP (thoroughly)); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1005 ++face_change_count; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1006 ++windows_or_buffers_changed; |
| 24995 | 1007 return Qnil; |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1008 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1009 |
| 24995 | 1010 |
| 1011 /*********************************************************************** | |
| 1012 X Pixmaps | |
| 1013 ***********************************************************************/ | |
| 1014 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1015 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1016 |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1017 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
|
1018 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
|
1019 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
|
1020 \(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
|
1021 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
|
1022 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
|
1023 \(WIDTH + 7)/8 bytes. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1024 (object) |
|
14090
24b93860d392
(Fpixmap_spec_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1025 Lisp_Object object; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1026 { |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1027 int pixmap_p = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1028 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1029 if (STRINGP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1030 /* 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
|
1031 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1032 else if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1033 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1034 /* 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
|
1035 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
|
1036 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
|
1037 Lisp_Object width, height, data; |
|
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 height = width = data = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1040 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1041 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1042 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1043 width = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1044 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1045 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1046 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1047 height = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1048 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1049 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1050 data = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1051 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1052 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1053 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1054 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1055 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1056 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
|
1057 / 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
|
1058 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
|
1059 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1060 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1061 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1062 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1063 return pixmap_p ? Qt : Qnil; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1064 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1065 |
| 24995 | 1066 |
| 1067 /* Load a bitmap according to NAME (which is either a file name or a | |
| 1068 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
| 1069 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
| 1070 bitmap cannot be loaded, display a message saying so, and return | |
| 1071 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
| 1072 if these pointers are not null. */ | |
| 1073 | |
| 1074 static int | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1075 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
|
1076 FRAME_PTR f; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1077 Lisp_Object name; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1078 unsigned int *w_ptr, *h_ptr; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1079 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1080 int bitmap_id; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1081 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1082 if (NILP (name)) |
| 24995 | 1083 return 0; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1084 |
|
71845
085d9056841a
(load_pixmap): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71576
diff
changeset
|
1085 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
|
1086 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1087 BLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1088 if (CONSP (name)) |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1089 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1090 /* Decode a bitmap spec into a bitmap. */ |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1091 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1092 int h, w; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1093 Lisp_Object bits; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1094 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1095 w = XINT (Fcar (name)); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1096 h = XINT (Fcar (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1097 bits = Fcar (Fcdr (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1098 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1099 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
|
1100 w, h); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1101 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1102 else |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1103 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1104 /* 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
|
1105 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
|
1106 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1107 UNBLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1108 |
|
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1109 if (bitmap_id < 0) |
| 24995 | 1110 { |
|
72446
44f03dd44abf
(load_pixmap): Add quotes in error message.
Richard M. Stallman <rms@gnu.org>
parents:
72170
diff
changeset
|
1111 add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil); |
| 24995 | 1112 bitmap_id = 0; |
| 1113 | |
| 1114 if (w_ptr) | |
| 1115 *w_ptr = 0; | |
| 1116 if (h_ptr) | |
| 1117 *h_ptr = 0; | |
| 1118 } | |
| 1119 else | |
| 1120 { | |
| 1121 #if GLYPH_DEBUG | |
| 1122 ++npixmaps_allocated; | |
| 1123 #endif | |
| 1124 if (w_ptr) | |
| 1125 *w_ptr = x_bitmap_width (f, bitmap_id); | |
| 1126 | |
| 1127 if (h_ptr) | |
| 1128 *h_ptr = x_bitmap_height (f, bitmap_id); | |
| 1129 } | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1130 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1131 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
|
1132 } |
| 9572 | 1133 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1134 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1135 |
| 9572 | 1136 |
| 2336 | 1137 |
| 24995 | 1138 /*********************************************************************** |
| 1139 X Colors | |
| 1140 ***********************************************************************/ | |
| 1141 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1142 /* 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
|
1143 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
|
1144 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
|
1145 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1146 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1147 parse_rgb_list (rgb_list, color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1148 Lisp_Object rgb_list; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1149 XColor *color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1150 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1151 #define PARSE_RGB_LIST_FIELD(field) \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1152 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
|
1153 { \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1154 color->field = XINT (XCAR (rgb_list)); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1155 rgb_list = XCDR (rgb_list); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1156 } \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1157 else \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1158 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1159 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1160 PARSE_RGB_LIST_FIELD (red); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1161 PARSE_RGB_LIST_FIELD (green); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1162 PARSE_RGB_LIST_FIELD (blue); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1163 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1164 return 1; |
|
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 |
|
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 /* 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
|
1169 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
|
1170 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
|
1171 returned in it. */ |
|
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 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1174 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
|
1175 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1176 Lisp_Object color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1177 XColor *tty_color, *std_color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1178 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1179 Lisp_Object frame, color_desc; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1180 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1181 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
|
1182 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1183 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1184 XSETFRAME (frame, f); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1185 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1186 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
|
1187 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
|
1188 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1189 Lisp_Object rgb; |
|
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 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1192 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1193 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1194 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
|
1195 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1196 rgb = XCDR (XCDR (color_desc)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1197 if (! parse_rgb_list (rgb, tty_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1198 return 0; |
|
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 /* Should we fill in STD_COLOR too? */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1201 if (std_color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1202 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1203 /* 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
|
1204 *std_color = *tty_color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1205 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1206 /* 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
|
1207 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
|
1208 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
|
1209 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
|
1210 if ((!STRINGP (XCAR (color_desc)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1211 || 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
|
1212 && !NILP (Ffboundp (Qtty_color_standard_values))) |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1213 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1214 /* Look up STD_COLOR separately. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1215 rgb = call1 (Qtty_color_standard_values, color); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1216 if (! parse_rgb_list (rgb, std_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1217 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1218 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1219 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1220 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1221 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1222 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1223 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
|
1224 /* 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
|
1225 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
|
1226 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
|
1227 load color" messages in the *Messages* buffer. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1228 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1229 else |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1230 /* 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
|
1231 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1232 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1233 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1234 /* 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
|
1235 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1236 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1237 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
|
1238 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1239 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1240 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1241 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1242 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1243 int status = 1; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1244 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1245 /* Defaults. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1246 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
|
1247 color_def->red = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1248 color_def->blue = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1249 color_def->green = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1250 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1251 if (*color_name) |
|
89554
15da46f6f0ac
(face_numeric_value): Declare dim size_t.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1252 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
|
1253 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1254 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
|
1255 { |
|
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1256 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
|
1257 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
|
1258 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
|
1259 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
|
1260 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1261 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1262 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
|
1263 status = 1; |
|
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1264 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1265 return status; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1266 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1267 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1268 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1269 /* 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
|
1270 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
|
1271 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
|
1272 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1273 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
|
1274 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1275 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1276 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
|
1277 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1278 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1279 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1280 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1281 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1282 if (!FRAME_WINDOW_P (f)) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1283 return tty_defined_color (f, color_name, color_def, alloc); |
| 24995 | 1284 #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
|
1285 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
|
1286 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
|
1287 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1288 #ifdef WINDOWSNT |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1289 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
|
1290 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
|
1291 #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
|
1292 #ifdef MAC_OS |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1293 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
|
1294 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
|
1295 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1296 else |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1297 abort (); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1298 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1299 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1300 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1301 /* 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
|
1302 Lisp string. */ |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1303 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1304 Lisp_Object |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1305 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
|
1306 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1307 int idx; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1308 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1309 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
|
1310 { |
|
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1311 Lisp_Object frame; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1312 Lisp_Object coldesc; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1313 |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1314 XSETFRAME (frame, f); |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1315 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
|
1316 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1317 if (!NILP (coldesc)) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1318 return XCAR (coldesc); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1319 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1320 #ifdef MSDOS |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1321 /* 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
|
1322 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
|
1323 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
|
1324 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
|
1325 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1326 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1327 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1328 return build_string (unspecified_fg); |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1329 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1330 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
|
1331 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1332 return Qunspecified; |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1333 } |
| 24995 | 1334 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1335 |
| 24995 | 1336 /* 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
|
1337 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
|
1338 |
|
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1339 The criterion implemented here is not a terribly sophisticated one. */ |
| 24995 | 1340 |
| 1341 static int | |
| 1342 face_color_gray_p (f, color_name) | |
| 1343 struct frame *f; | |
| 1344 char *color_name; | |
| 1345 { | |
| 1346 XColor color; | |
| 1347 int gray_p; | |
| 1348 | |
| 1349 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
|
1350 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
|
1351 (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
|
1352 || |
| 85262 | 1353 ((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
|
1354 < max (color.red, color.green) / 20) |
| 85262 | 1355 && (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
|
1356 < max (color.green, color.blue) / 20) |
| 85262 | 1357 && (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
|
1358 < max (color.blue, color.red) / 20))); |
| 24995 | 1359 else |
| 1360 gray_p = 0; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1361 |
| 24995 | 1362 return gray_p; |
| 1363 } | |
| 1364 | |
| 1365 | |
| 1366 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
| 1367 BACKGROUND_P non-zero means the color will be used as background | |
| 1368 color. */ | |
| 1369 | |
| 1370 static int | |
| 1371 face_color_supported_p (f, color_name, background_p) | |
| 1372 struct frame *f; | |
| 1373 char *color_name; | |
| 1374 int background_p; | |
| 1375 { | |
| 1376 Lisp_Object frame; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1377 XColor not_used; |
| 24995 | 1378 |
| 1379 XSETFRAME (frame, f); | |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1380 return |
|
59924
3590dd3050ba
(face_color_supported_p): Use HAVE_WINDOW_SYSTEM
Eli Zaretskii <eliz@gnu.org>
parents:
59905
diff
changeset
|
1381 #ifdef HAVE_WINDOW_SYSTEM |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1382 FRAME_WINDOW_P (f) |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1383 ? (!NILP (Fxw_display_color_p (frame)) |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1384 || xstricmp (color_name, "black") == 0 |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1385 || xstricmp (color_name, "white") == 0 |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1386 || (background_p |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1387 && 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
|
1388 || (!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
|
1389 && 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
|
1390 : |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1391 #endif |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1392 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
|
1393 } |
| 24995 | 1394 |
| 1395 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1396 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
|
1397 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
|
1398 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
|
1399 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
|
1400 (color, frame) |
| 24995 | 1401 Lisp_Object color, frame; |
| 1402 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1403 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1404 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1405 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1406 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1407 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1408 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1409 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1410 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
|
1411 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
| 24995 | 1412 } |
| 1413 | |
| 1414 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1415 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
|
1416 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
|
1417 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
|
1418 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
|
1419 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
|
1420 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
|
1421 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
|
1422 (color, frame, background_p) |
| 24995 | 1423 Lisp_Object frame, color, background_p; |
| 1424 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1425 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1426 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1427 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1428 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1429 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1430 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1431 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1432 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
|
1433 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
| 24995 | 1434 return Qt; |
| 1435 return Qnil; | |
| 1436 } | |
| 1437 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1438 |
| 24995 | 1439 /* Load color with name NAME for use by face FACE on frame F. |
| 1440 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
| 1441 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
| 1442 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
| 1443 pixel color. If color cannot be loaded, display a message, and | |
| 1444 return the foreground, background or underline color of F, but | |
| 1445 record that fact in flags of the face so that we don't try to free | |
| 1446 these colors. */ | |
| 1447 | |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1448 unsigned long |
| 24995 | 1449 load_color (f, face, name, target_index) |
| 1450 struct frame *f; | |
| 1451 struct face *face; | |
| 1452 Lisp_Object name; | |
| 1453 enum lface_attribute_index target_index; | |
| 1454 { | |
| 1455 XColor color; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1456 |
| 24995 | 1457 xassert (STRINGP (name)); |
| 1458 xassert (target_index == LFACE_FOREGROUND_INDEX | |
| 1459 || target_index == LFACE_BACKGROUND_INDEX | |
| 1460 || target_index == LFACE_UNDERLINE_INDEX | |
| 1461 || target_index == LFACE_OVERLINE_INDEX | |
| 1462 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
| 1463 || target_index == LFACE_BOX_INDEX); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1464 |
| 24995 | 1465 /* if the color map is full, defined_color will return a best match |
| 1466 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
|
1467 if (!defined_color (f, SDATA (name), &color, 1)) |
| 24995 | 1468 { |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1469 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
|
1470 |
| 24995 | 1471 switch (target_index) |
| 1472 { | |
| 1473 case LFACE_FOREGROUND_INDEX: | |
| 1474 face->foreground_defaulted_p = 1; | |
| 1475 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1476 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1477 |
| 24995 | 1478 case LFACE_BACKGROUND_INDEX: |
| 1479 face->background_defaulted_p = 1; | |
| 1480 color.pixel = FRAME_BACKGROUND_PIXEL (f); | |
| 1481 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1482 |
| 24995 | 1483 case LFACE_UNDERLINE_INDEX: |
| 1484 face->underline_defaulted_p = 1; | |
| 1485 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1486 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1487 |
| 24995 | 1488 case LFACE_OVERLINE_INDEX: |
| 1489 face->overline_color_defaulted_p = 1; | |
| 1490 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1491 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1492 |
| 24995 | 1493 case LFACE_STRIKE_THROUGH_INDEX: |
| 1494 face->strike_through_color_defaulted_p = 1; | |
| 1495 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1496 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1497 |
| 24995 | 1498 case LFACE_BOX_INDEX: |
| 1499 face->box_color_defaulted_p = 1; | |
| 1500 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1501 break; | |
| 1502 | |
| 1503 default: | |
| 1504 abort (); | |
| 1505 } | |
| 1506 } | |
| 1507 #if GLYPH_DEBUG | |
| 1508 else | |
| 1509 ++ncolors_allocated; | |
| 1510 #endif | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1511 |
| 24995 | 1512 return color.pixel; |
| 1513 } | |
| 1514 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1515 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1516 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1517 |
| 1518 /* Load colors for face FACE which is used on frame F. Colors are | |
| 1519 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
| 1520 of ATTRS. If the background color specified is not supported on F, | |
| 1521 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
| 1522 | |
| 1523 static void | |
| 1524 load_face_colors (f, face, attrs) | |
| 1525 struct frame *f; | |
| 1526 struct face *face; | |
| 1527 Lisp_Object *attrs; | |
| 1528 { | |
| 1529 Lisp_Object fg, bg; | |
| 1530 | |
| 1531 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
| 1532 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
| 1533 | |
| 1534 /* Swap colors if face is inverse-video. */ | |
| 1535 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
| 1536 { | |
| 1537 Lisp_Object tmp; | |
| 1538 tmp = fg; | |
| 1539 fg = bg; | |
| 1540 bg = tmp; | |
| 1541 } | |
| 1542 | |
| 1543 /* Check for support for foreground, not for background because | |
| 1544 face_color_supported_p is smart enough to know that grays are | |
| 1545 "supported" as background because we are supposed to use stipple | |
| 1546 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
|
1547 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
|
1548 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
| 24995 | 1549 { |
| 1550 x_destroy_bitmap (f, face->stipple); | |
| 1551 face->stipple = load_pixmap (f, Vface_default_stipple, | |
| 1552 &face->pixmap_w, &face->pixmap_h); | |
| 1553 } | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1554 |
|
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1555 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
| 24995 | 1556 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
| 1557 } | |
| 1558 | |
| 1559 | |
| 1560 /* Free color PIXEL on frame F. */ | |
| 1561 | |
| 1562 void | |
| 1563 unload_color (f, pixel) | |
| 1564 struct frame *f; | |
| 1565 unsigned long pixel; | |
| 1566 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1567 #ifdef HAVE_X_WINDOWS |
|
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1568 if (pixel != -1) |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1569 { |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1570 BLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1571 x_free_colors (f, &pixel, 1); |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1572 UNBLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1573 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1574 #endif |
| 24995 | 1575 } |
| 1576 | |
| 1577 | |
| 1578 /* Free colors allocated for FACE. */ | |
| 1579 | |
| 1580 static void | |
| 1581 free_face_colors (f, face) | |
| 1582 struct frame *f; | |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1583 struct face *face; |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1584 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1585 #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
|
1586 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
|
1587 return; |
|
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1588 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1589 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1590 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1591 if (!face->foreground_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1592 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1593 x_free_colors (f, &face->foreground, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1594 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1595 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1596 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1597 if (!face->background_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1598 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1599 x_free_colors (f, &face->background, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1600 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1601 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1602 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1603 if (face->underline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1604 && !face->underline_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1605 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1606 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
|
1607 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1608 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1609 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1610 if (face->overline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1611 && !face->overline_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1612 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1613 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
|
1614 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1615 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1616 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1617 if (face->strike_through_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1618 && !face->strike_through_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1619 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1620 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
|
1621 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1622 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1623 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1624 if (face->box != FACE_NO_BOX |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1625 && !face->box_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1626 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1627 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
|
1628 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1629 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1630 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1631 UNBLOCK_INPUT; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1632 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 1633 } |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1634 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1635 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1636 |
| 1637 | |
| 1638 | |
| 1639 /*********************************************************************** | |
| 1640 XLFD Font Names | |
| 1641 ***********************************************************************/ | |
| 1642 | |
| 1643 /* An enumerator for each field of an XLFD font name. */ | |
| 1644 | |
| 1645 enum xlfd_field | |
| 1646 { | |
| 1647 XLFD_FOUNDRY, | |
| 1648 XLFD_FAMILY, | |
| 1649 XLFD_WEIGHT, | |
| 1650 XLFD_SLANT, | |
| 1651 XLFD_SWIDTH, | |
| 1652 XLFD_ADSTYLE, | |
| 1653 XLFD_PIXEL_SIZE, | |
| 1654 XLFD_POINT_SIZE, | |
| 1655 XLFD_RESX, | |
| 1656 XLFD_RESY, | |
| 1657 XLFD_SPACING, | |
| 1658 XLFD_AVGWIDTH, | |
| 1659 XLFD_REGISTRY, | |
| 1660 XLFD_ENCODING, | |
| 1661 XLFD_LAST | |
| 1662 }; | |
| 1663 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1664 /* An enumerator for each possible slant value of a font. Taken from |
| 24995 | 1665 the XLFD specification. */ |
| 1666 | |
| 1667 enum xlfd_slant | |
| 1668 { | |
| 1669 XLFD_SLANT_UNKNOWN, | |
| 1670 XLFD_SLANT_ROMAN, | |
| 1671 XLFD_SLANT_ITALIC, | |
| 1672 XLFD_SLANT_OBLIQUE, | |
| 1673 XLFD_SLANT_REVERSE_ITALIC, | |
| 1674 XLFD_SLANT_REVERSE_OBLIQUE, | |
| 1675 XLFD_SLANT_OTHER | |
| 1676 }; | |
| 1677 | |
| 1678 /* Relative font weight according to XLFD documentation. */ | |
| 1679 | |
| 1680 enum xlfd_weight | |
| 1681 { | |
| 1682 XLFD_WEIGHT_UNKNOWN, | |
| 1683 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
| 1684 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
| 1685 XLFD_WEIGHT_LIGHT, /* 30 */ | |
| 1686 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
| 1687 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1688 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
| 1689 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
| 1690 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
| 1691 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
| 1692 }; | |
| 1693 | |
| 1694 /* Relative proportionate width. */ | |
| 1695 | |
| 1696 enum xlfd_swidth | |
| 1697 { | |
| 1698 XLFD_SWIDTH_UNKNOWN, | |
| 1699 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
| 1700 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
| 1701 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
| 1702 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
| 1703 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1704 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
| 1705 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
| 1706 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
| 1707 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
| 1708 }; | |
| 1709 | |
| 1710 /* Structure used for tables mapping XLFD weight, slant, and width | |
| 1711 names to numeric and symbolic values. */ | |
| 1712 | |
| 1713 struct table_entry | |
| 1714 { | |
| 1715 char *name; | |
| 1716 int numeric; | |
| 1717 Lisp_Object *symbol; | |
| 1718 }; | |
| 1719 | |
| 1720 /* Table of XLFD slant names and their numeric and symbolic | |
| 1721 representations. This table must be sorted by slant names in | |
| 1722 ascending order. */ | |
| 1723 | |
| 1724 static struct table_entry slant_table[] = | |
| 1725 { | |
| 1726 {"i", XLFD_SLANT_ITALIC, &Qitalic}, | |
| 1727 {"o", XLFD_SLANT_OBLIQUE, &Qoblique}, | |
| 1728 {"ot", XLFD_SLANT_OTHER, &Qitalic}, | |
| 1729 {"r", XLFD_SLANT_ROMAN, &Qnormal}, | |
| 1730 {"ri", XLFD_SLANT_REVERSE_ITALIC, &Qreverse_italic}, | |
| 1731 {"ro", XLFD_SLANT_REVERSE_OBLIQUE, &Qreverse_oblique} | |
| 1732 }; | |
| 1733 | |
| 1734 /* Table of XLFD weight names. This table must be sorted by weight | |
| 1735 names in ascending order. */ | |
| 1736 | |
| 1737 static struct table_entry weight_table[] = | |
| 1738 { | |
| 1739 {"black", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold}, | |
| 1740 {"bold", XLFD_WEIGHT_BOLD, &Qbold}, | |
| 1741 {"book", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light}, | |
|
33529
2e6d343c238d
(weight_table): Add `demi' with the same meaning as
Gerd Moellmann <gerd@gnu.org>
parents:
33372
diff
changeset
|
1742 {"demi", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
| 24995 | 1743 {"demibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
| 1744 {"extralight", XLFD_WEIGHT_EXTRA_LIGHT, &Qextra_light}, | |
| 1745 {"extrabold", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
| 1746 {"heavy", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
| 1747 {"light", XLFD_WEIGHT_LIGHT, &Qlight}, | |
| 1748 {"medium", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
| 1749 {"normal", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
| 1750 {"regular", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
| 1751 {"semibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, | |
| 1752 {"semilight", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light}, | |
| 1753 {"ultralight", XLFD_WEIGHT_ULTRA_LIGHT, &Qultra_light}, | |
| 1754 {"ultrabold", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold} | |
| 1755 }; | |
| 1756 | |
| 1757 /* Table of XLFD width names. This table must be sorted by width | |
| 1758 names in ascending order. */ | |
| 1759 | |
| 1760 static struct table_entry swidth_table[] = | |
| 1761 { | |
| 1762 {"compressed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
| 1763 {"condensed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
| 1764 {"demiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
| 1765 {"expanded", XLFD_SWIDTH_EXPANDED, &Qexpanded}, | |
| 1766 {"extracondensed", XLFD_SWIDTH_EXTRA_CONDENSED, &Qextra_condensed}, | |
| 1767 {"extraexpanded", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded}, | |
| 1768 {"medium", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
| 1769 {"narrow", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
| 1770 {"normal", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
| 1771 {"regular", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
| 1772 {"semicondensed", XLFD_SWIDTH_SEMI_CONDENSED, &Qsemi_condensed}, | |
| 1773 {"semiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
| 1774 {"ultracondensed", XLFD_SWIDTH_ULTRA_CONDENSED, &Qultra_condensed}, | |
| 1775 {"ultraexpanded", XLFD_SWIDTH_ULTRA_EXPANDED, &Qultra_expanded}, | |
| 1776 {"wide", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded} | |
| 1777 }; | |
| 1778 | |
| 1779 /* The frame in effect when sorting font names. Set temporarily in | |
| 1780 sort_fonts so that it is available in font comparison functions. */ | |
| 1781 | |
| 1782 static struct frame *font_frame; | |
| 1783 | |
| 1784 /* Order by which font selection chooses fonts. The default values | |
| 1785 mean `first, find a best match for the font width, then for the | |
| 1786 font height, then for weight, then for slant.' This variable can be | |
| 1787 set via set-face-font-sort-order. */ | |
| 1788 | |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
1789 #ifdef MAC_OS |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1790 static int font_sort_order[4] = { |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1791 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
|
1792 }; |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
1793 #else |
| 24995 | 1794 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
|
1795 #endif |
| 24995 | 1796 |
| 1797 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1798 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1799 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1800 /* 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
|
1801 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1802 static double |
|
51401
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
1803 font_rescale_ratio (name) |
|
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
1804 char *name; |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1805 { |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1806 Lisp_Object tail, elt; |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1807 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1808 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
|
1809 { |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1810 elt = XCAR (tail); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1811 if (STRINGP (XCAR (elt)) && FLOATP (XCDR (elt)) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1812 && 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
|
1813 return XFLOAT_DATA (XCDR (elt)); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1814 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1815 return 1.0; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1816 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1817 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1818 static enum font_property_index font_props_for_sorting[FONT_SIZE_INDEX]; |
| 24995 | 1819 |
| 1820 static int | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1821 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
|
1822 const void *v1, *v2; |
| 24995 | 1823 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1824 Lisp_Object font1 = *(Lisp_Object *) v1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1825 Lisp_Object font2 = *(Lisp_Object *) v2; |
| 24995 | 1826 int i; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1827 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1828 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
|
1829 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1830 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
|
1831 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
|
1832 int result; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1833 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1834 if (idx <= FONT_REGISTRY_INDEX) |
| 24995 | 1835 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1836 if (STRINGP (val1)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1837 result = STRINGP (val2) ? strcmp (SDATA (val1), SDATA (val2)) : -1; |
| 24995 | 1838 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1839 result = STRINGP (val2) ? 1 : 0; |
| 24995 | 1840 } |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
1841 else |
| 24995 | 1842 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1843 if (INTEGERP (val1)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1844 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
|
1845 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1846 result = INTEGERP (val2) ? 1 : 0; |
|
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
1847 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1848 if (result) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1849 return result; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1850 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1851 return 0; |
| 24995 | 1852 } |
| 1853 | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
1854 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
|
1855 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
|
1856 If FAMILY is omitted or nil, list all families. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1857 Otherwise, FAMILY must be a string, possibly containing wildcards |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1858 `?' and `*'. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1859 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
|
1860 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
|
1861 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1862 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
|
1863 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
|
1864 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
|
1865 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
|
1866 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
|
1867 giving the registry and encoding of the font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1868 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
|
1869 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
|
1870 (family, frame) |
| 24995 | 1871 Lisp_Object family, frame; |
| 1872 { | |
| 1873 struct frame *f = check_x_frame (frame); | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1874 Lisp_Object font_spec = Qnil, vec; |
| 24995 | 1875 int i, nfonts; |
| 1876 Lisp_Object result; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1877 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1878 if (!NILP (family)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1879 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1880 CHECK_STRING (family); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1881 font_spec = Ffont_spec (0, NULL); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1882 Ffont_put (font_spec, QCfamily, family); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1883 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1884 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
|
1885 nfonts = ASIZE (vec); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1886 if (nfonts == 0) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1887 return Qnil; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1888 if (nfonts > 1) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1889 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1890 for (i = 0; i < 4; i++) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1891 switch (font_sort_order[i]) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1892 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1893 case XLFD_SWIDTH: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1894 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
|
1895 case XLFD_POINT_SIZE: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1896 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
|
1897 case XLFD_WEIGHT: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1898 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
|
1899 default: |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1900 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
|
1901 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1902 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
|
1903 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
|
1904 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
|
1905 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
|
1906 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1907 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
|
1908 compare_fonts_by_sort_order); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1909 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1910 |
| 24995 | 1911 result = Qnil; |
| 1912 for (i = nfonts - 1; i >= 0; --i) | |
| 1913 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1914 Lisp_Object font = AREF (vec, i); |
| 25270 | 1915 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
|
1916 int point; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1917 Lisp_Object spacing; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1918 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1919 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
|
1920 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
|
1921 point = PIXEL_TO_POINT (XINT (AREF (font, FONT_SIZE_INDEX)) * 10, |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1922 f->resy); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1923 ASET (v, 2, make_number (point)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1924 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
|
1925 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
|
1926 spacing = Ffont_get (font, QCspacing); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1927 ASET (v, 5, (NILP (spacing) || EQ (spacing, Qp)) ? Qnil : Qt); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1928 ASET (v, 6, AREF (font, FONT_NAME_INDEX)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1929 ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1930 |
| 24995 | 1931 result = Fcons (v, result); |
| 1932 } | |
| 1933 | |
| 1934 return result; | |
| 1935 } | |
| 1936 | |
| 1937 | |
| 1938 DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list, | |
| 1939 0, 1, 0, | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1940 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
|
1941 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
|
1942 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
|
1943 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
|
1944 are fixed-pitch. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1945 (frame) |
| 24995 | 1946 Lisp_Object frame; |
| 1947 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1948 return Ffont_family_list (frame); |
| 24995 | 1949 } |
| 1950 | |
| 1951 | |
| 1952 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
|
1953 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
|
1954 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
|
1955 the same size as FACE on FRAME. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1956 PATTERN is a string, perhaps with wildcard characters; |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1957 the * character matches any substring, and |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1958 the ? character matches any single character. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1959 PATTERN is case-insensitive. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1960 FACE is a face name--a symbol. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1961 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1962 The return value is a list of strings, suitable as arguments to |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1963 set-face-font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1964 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1965 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
|
1966 even if they match PATTERN and FACE. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1967 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
|
1968 fonts to match. The first MAXIMUM fonts are reported. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1969 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
|
1970 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
|
1971 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
|
1972 (pattern, face, frame, maximum, width) |
| 24995 | 1973 Lisp_Object pattern, face, frame, maximum, width; |
| 1974 { | |
| 1975 struct frame *f; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1976 int size, avgwidth; |
| 24995 | 1977 |
| 1978 check_x (); | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1979 CHECK_STRING (pattern); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1980 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1981 if (! NILP (maximum)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1982 CHECK_NATNUM (maximum); |
| 24995 | 1983 |
| 1984 if (!NILP (width)) | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1985 CHECK_NUMBER (width); |
| 24995 | 1986 |
| 1987 /* We can't simply call check_x_frame because this function may be | |
| 1988 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
|
1989 if (NILP (frame)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1990 frame = selected_frame; |
| 24995 | 1991 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
|
1992 if (! FRAME_WINDOW_P (f)) |
| 24995 | 1993 { |
| 1994 /* Perhaps we have not yet created any frame. */ | |
| 1995 f = NULL; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1996 frame = Qnil; |
| 24995 | 1997 face = Qnil; |
| 1998 } | |
| 1999 | |
| 2000 /* Determine the width standard for comparison with the fonts we find. */ | |
| 2001 | |
| 2002 if (NILP (face)) | |
| 2003 size = 0; | |
| 2004 else | |
| 2005 { | |
| 2006 /* This is of limited utility since it works with character | |
| 2007 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
|
2008 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
|
2009 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
|
2010 ? NULL |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
2011 : 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
|
2012 |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
2013 if (face && face->font) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2014 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2015 size = face->font->pixel_size; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2016 avgwidth = face->font->average_width; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2017 } |
| 24995 | 2018 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2019 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2020 size = FRAME_FONT (f)->pixel_size; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2021 avgwidth = FRAME_FONT (f)->average_width; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2022 } |
| 24995 | 2023 if (!NILP (width)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2024 avgwidth *= XINT (width); |
| 24995 | 2025 } |
| 2026 | |
| 2027 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2028 Lisp_Object font_spec; |
| 24995 | 2029 Lisp_Object args[2]; |
| 2030 | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2031 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
|
2032 if (size) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2033 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2034 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
|
2035 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
|
2036 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2037 args[0] = Flist_fonts (font_spec, frame, maximum, Qnil); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2038 if (NILP (frame)) |
| 24995 | 2039 /* We don't have to check fontsets. */ |
| 2040 return args[0]; | |
| 2041 args[1] = list_fontsets (f, pattern, size); | |
| 2042 return Fnconc (2, args); | |
| 2043 } | |
| 2044 } | |
| 2045 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2046 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 2047 |
| 2048 | |
| 2049 | |
| 2050 /*********************************************************************** | |
| 2051 Lisp Faces | |
| 2052 ***********************************************************************/ | |
| 2053 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
2054 /* 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
|
2055 |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
2056 #define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
2057 #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
|
2058 #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
|
2059 #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
|
2060 #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
|
2061 #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
|
2062 #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
|
2063 #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
|
2064 #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
|
2065 #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
|
2066 #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
|
2067 #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
|
2068 #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
|
2069 #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
|
2070 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2071 #define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) |
| 24995 | 2072 |
| 2073 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
| 2074 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
| 2075 | |
| 2076 #define LFACEP(LFACE) \ | |
| 2077 (VECTORP (LFACE) \ | |
| 2078 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
2079 && EQ (AREF (LFACE, 0), Qface)) |
| 24995 | 2080 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2081 |
| 24995 | 2082 #if GLYPH_DEBUG |
| 2083 | |
| 2084 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
| 2085 | |
| 2086 static void | |
| 2087 check_lface_attrs (attrs) | |
| 2088 Lisp_Object *attrs; | |
| 2089 { | |
| 2090 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2091 || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX]) |
| 24995 | 2092 || STRINGP (attrs[LFACE_FAMILY_INDEX])); |
| 2093 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2094 || IGNORE_DEFFACE_P (attrs[LFACE_SWIDTH_INDEX]) |
| 24995 | 2095 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); |
| 2096 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2097 || IGNORE_DEFFACE_P (attrs[LFACE_HEIGHT_INDEX]) |
| 31178 | 2098 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
| 2099 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
| 2100 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
| 24995 | 2101 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2102 || IGNORE_DEFFACE_P (attrs[LFACE_WEIGHT_INDEX]) |
| 24995 | 2103 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); |
| 2104 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2105 || IGNORE_DEFFACE_P (attrs[LFACE_SLANT_INDEX]) |
| 24995 | 2106 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); |
| 2107 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2108 || IGNORE_DEFFACE_P (attrs[LFACE_UNDERLINE_INDEX]) |
| 24995 | 2109 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) |
| 2110 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
| 2111 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2112 || IGNORE_DEFFACE_P (attrs[LFACE_OVERLINE_INDEX]) |
| 24995 | 2113 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) |
| 2114 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
| 2115 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2116 || IGNORE_DEFFACE_P (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
| 24995 | 2117 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
| 2118 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
| 2119 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2120 || IGNORE_DEFFACE_P (attrs[LFACE_BOX_INDEX]) |
| 24995 | 2121 || SYMBOLP (attrs[LFACE_BOX_INDEX]) |
| 2122 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
| 2123 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
| 2124 || CONSP (attrs[LFACE_BOX_INDEX])); | |
| 2125 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2126 || IGNORE_DEFFACE_P (attrs[LFACE_INVERSE_INDEX]) |
| 24995 | 2127 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); |
| 2128 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2129 || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX]) |
| 24995 | 2130 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); |
| 2131 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2132 || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX]) |
| 24995 | 2133 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); |
| 31178 | 2134 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2135 || IGNORE_DEFFACE_P (attrs[LFACE_INHERIT_INDEX]) |
| 31178 | 2136 || NILP (attrs[LFACE_INHERIT_INDEX]) |
| 2137 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
| 2138 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
| 24995 | 2139 #ifdef HAVE_WINDOW_SYSTEM |
| 2140 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2141 || IGNORE_DEFFACE_P (attrs[LFACE_STIPPLE_INDEX]) |
| 24995 | 2142 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
2143 || !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
|
2144 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX]) |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2145 || 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
|
2146 || FONTP (attrs[LFACE_FONT_INDEX])); |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2147 xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2148 || STRINGP (attrs[LFACE_FONTSET_INDEX])); |
| 24995 | 2149 #endif |
| 2150 } | |
| 2151 | |
| 2152 | |
| 2153 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
| 2154 | |
| 2155 static void | |
| 2156 check_lface (lface) | |
| 2157 Lisp_Object lface; | |
| 2158 { | |
| 2159 if (!NILP (lface)) | |
| 2160 { | |
| 2161 xassert (LFACEP (lface)); | |
| 2162 check_lface_attrs (XVECTOR (lface)->contents); | |
| 2163 } | |
| 2164 } | |
| 2165 | |
| 2166 #else /* GLYPH_DEBUG == 0 */ | |
| 2167 | |
| 2168 #define check_lface_attrs(attrs) (void) 0 | |
| 2169 #define check_lface(lface) (void) 0 | |
| 2170 | |
| 2171 #endif /* GLYPH_DEBUG == 0 */ | |
| 2172 | |
| 2173 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2174 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2175 /* 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
|
2176 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2177 /* 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
|
2178 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
|
2179 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
|
2180 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
|
2181 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
|
2182 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
|
2183 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
|
2184 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2185 Lisp_Object face_name; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2186 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
|
2187 }; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2188 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2189 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2190 /* 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
|
2191 otherwise add NEW_NAMED_MERGE_POINT, which is initialized using |
|
55982
de4c259f651b
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
55966
diff
changeset
|
2192 FACE_NAME, as the head of the linked list pointed to by |
|
de4c259f651b
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
55966
diff
changeset
|
2193 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
|
2194 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2195 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
|
2196 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
|
2197 Lisp_Object face_name, |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2198 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
|
2199 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2200 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
|
2201 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2202 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
|
2203 if (EQ (face_name, prev->face_name)) |
|
55982
de4c259f651b
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
55966
diff
changeset
|
2204 return 0; |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2205 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2206 new_named_merge_point->face_name = face_name; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2207 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
|
2208 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2209 *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
|
2210 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2211 return 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2212 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2213 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2214 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2215 |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2216 #if 0 /* Seems to be unused. */ |
|
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2217 static Lisp_Object |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2218 internal_resolve_face_name (nargs, args) |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2219 int nargs; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2220 Lisp_Object *args; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2221 { |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2222 return Fget (args[0], args[1]); |
|
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2223 } |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2224 |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2225 static Lisp_Object |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2226 resolve_face_name_error (ignore) |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2227 Lisp_Object ignore; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2228 { |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2229 return Qnil; |
|
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2230 } |
|
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2231 #endif |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2232 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2233 /* 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
|
2234 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
|
2235 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
|
2236 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2237 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
|
2238 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2239 static Lisp_Object |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2240 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
|
2241 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
|
2242 int signal_p; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2243 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2244 Lisp_Object orig_face; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2245 Lisp_Object tortoise, hare; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2246 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2247 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
|
2248 face_name = intern (SDATA (face_name)); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2249 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2250 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
|
2251 return face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2252 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2253 orig_face = face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2254 tortoise = hare = face_name; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2255 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2256 while (1) |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2257 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2258 face_name = hare; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2259 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
|
2260 if (NILP (hare) || !SYMBOLP (hare)) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2261 break; |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2262 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2263 face_name = hare; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2264 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
|
2265 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
|
2266 break; |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2267 |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2268 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
|
2269 if (EQ (hare, tortoise)) |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2270 { |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2271 if (signal_p) |
|
71992
760807463226
* xfaces.c (signal_error): Move to eval.c.
Kim F. Storm <storm@cua.dk>
parents:
71845
diff
changeset
|
2272 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
|
2273 return Qdefault; |
|
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2274 } |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2275 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2276 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2277 return face_name; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2278 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2279 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2280 |
| 24995 | 2281 /* 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
|
2282 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
|
2283 a symbol (apparently Emacs 20.2 allowed strings as face names in |
|
eb4affa4abc6
(lface_from_face_name): Function comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
33529
diff
changeset
|
2284 face text properties; Ediff uses that). If FACE_NAME is an alias |
|
eb4affa4abc6
(lface_from_face_name): Function comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
33529
diff
changeset
|
2285 for another face, return that face's definition. If SIGNAL_P is |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2286 non-zero, signal an error if FACE_NAME is not a valid face name. |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2287 If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2288 name. */ |
| 24995 | 2289 |
| 2290 static INLINE Lisp_Object | |
| 2291 lface_from_face_name (f, face_name, signal_p) | |
| 2292 struct frame *f; | |
| 2293 Lisp_Object face_name; | |
| 2294 int signal_p; | |
| 2295 { | |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2296 Lisp_Object lface; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2297 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2298 face_name = resolve_face_name (face_name, signal_p); |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2299 |
| 24995 | 2300 if (f) |
| 2301 lface = assq_no_quit (face_name, f->face_alist); | |
| 2302 else | |
| 2303 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
| 2304 | |
| 2305 if (CONSP (lface)) | |
| 2306 lface = XCDR (lface); | |
| 2307 else if (signal_p) | |
| 2308 signal_error ("Invalid face", face_name); | |
| 2309 | |
| 2310 check_lface (lface); | |
| 2311 return lface; | |
| 2312 } | |
| 2313 | |
| 2314 | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2315 /* 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
|
2316 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
|
2317 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
|
2318 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
|
2319 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
|
2320 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2321 static INLINE int |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2322 get_lface_attributes (f, face_name, attrs, 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
|
2323 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
|
2324 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
|
2325 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
|
2326 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
|
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 Lisp_Object lface; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2329 int success_p; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2330 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2331 lface = lface_from_face_name (f, face_name, 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
|
2332 if (!NILP (lface)) |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2333 { |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2334 bcopy (XVECTOR (lface)->contents, attrs, |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2335 LFACE_VECTOR_SIZE * sizeof *attrs); |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2336 success_p = 1; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2337 } |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2338 else |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2339 success_p = 0; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2340 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2341 return success_p; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2342 } |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2343 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2344 |
| 24995 | 2345 /* Non-zero if all attributes in face attribute vector ATTRS are |
| 2346 specified, i.e. are non-nil. */ | |
| 2347 | |
| 2348 static int | |
| 2349 lface_fully_specified_p (attrs) | |
| 2350 Lisp_Object *attrs; | |
| 2351 { | |
| 2352 int i; | |
| 2353 | |
| 2354 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
|
2355 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
|
2356 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
|
2357 #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
|
2358 /* 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
|
2359 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
|
2360 && 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
|
2361 #endif |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
2362 ) |
|
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
2363 break; |
| 24995 | 2364 |
| 2365 return i == LFACE_VECTOR_SIZE; | |
| 2366 } | |
| 2367 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2368 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 2369 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2370 /* 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
|
2371 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
|
2372 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
|
2373 of FORCE_P. */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2374 |
| 24995 | 2375 static int |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2376 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
|
2377 struct frame *f; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2378 Lisp_Object lface, font_object; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2379 int force_p; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2380 { |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2381 Lisp_Object val; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2382 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
|
2383 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2384 /* 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
|
2385 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
|
2386 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
|
2387 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2388 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
|
2389 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2390 Lisp_Object foundry = AREF (font_object, FONT_FOUNDRY_INDEX); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2391 Lisp_Object family = AREF (font_object, FONT_FAMILY_INDEX); |
|
90463
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 if (! NILP (foundry)) |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2394 { |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2395 if (! NILP (family)) |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2396 val = concat3 (SYMBOL_NAME (foundry), build_string ("-"), |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2397 SYMBOL_NAME (family)); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2398 else |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2399 val = concat2 (SYMBOL_NAME (foundry), build_string ("-*")); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2400 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2401 else |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2402 { |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2403 if (! NILP (family)) |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2404 val = SYMBOL_NAME (family); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2405 else |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2406 val = build_string ("*"); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2407 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2408 LFACE_FAMILY (lface) = val; |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2409 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2410 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2411 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
|
2412 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2413 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
|
2414 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2415 xassert (pt > 0); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2416 LFACE_HEIGHT (lface) = make_number (pt); |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2417 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2418 |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2419 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
|
2420 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2421 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
|
2422 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
|
2423 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2424 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
|
2425 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2426 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
|
2427 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
|
2428 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2429 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
|
2430 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2431 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
|
2432 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
|
2433 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2434 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2435 LFACE_FONT (lface) = font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2436 return 1; |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2437 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2438 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2439 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 2440 |
| 2441 | |
| 31178 | 2442 /* Merges the face height FROM with the face height TO, and returns the |
| 2443 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
|
2444 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
|
2445 `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
|
2446 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
|
2447 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
|
2448 call into lisp. */ |
| 31178 | 2449 |
| 2450 Lisp_Object | |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2451 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
|
2452 Lisp_Object from, to, invalid; |
| 31178 | 2453 { |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2454 Lisp_Object result = invalid; |
| 31178 | 2455 |
| 2456 if (INTEGERP (from)) | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2457 /* 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
|
2458 result = from; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2459 else if (FLOATP (from)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2460 /* 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
|
2461 { |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2462 if (INTEGERP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2463 /* relative X absolute => absolute */ |
|
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
2464 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
|
2465 else if (FLOATP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2466 /* relative X relative => relative */ |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2467 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
|
2468 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
|
2469 result = from; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2470 } |
| 31178 | 2471 else if (FUNCTIONP (from)) |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2472 /* FROM is a function, which use to adjust TO. */ |
| 31178 | 2473 { |
| 2474 /* Call function with current height as argument. | |
| 2475 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
|
2476 Lisp_Object args[2]; |
| 31178 | 2477 |
| 2478 args[0] = from; | |
| 2479 args[1] = to; | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2480 result = safe_call (2, args); |
| 31178 | 2481 |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2482 /* 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
|
2483 if (INTEGERP (to) && !INTEGERP (result)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2484 result = invalid; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2485 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2486 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2487 return result; |
| 31178 | 2488 } |
| 2489 | |
| 2490 | |
| 2491 /* 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
|
2492 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
|
2493 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
|
2494 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
|
2495 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
|
2496 TO and replace it. NAMED_MERGE_POINTS is used internally to detect |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2497 loops in face inheritance; it should be 0 when called from other |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2498 places. */ |
| 24995 | 2499 |
| 2500 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
|
2501 merge_face_vectors (f, from, to, named_merge_points) |
| 31178 | 2502 struct frame *f; |
| 24995 | 2503 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
|
2504 struct named_merge_point *named_merge_points; |
| 24995 | 2505 { |
| 2506 int i; | |
| 31178 | 2507 |
| 2508 /* If FROM inherits from some other faces, merge their attributes into | |
| 2509 TO before merging FROM's direct attributes. Note that an :inherit | |
| 2510 attribute of `unspecified' is the same as one of nil; we never | |
| 2511 merge :inherit attributes, so nil is more correct, but lots of | |
| 2512 other code uses `unspecified' as a generic value for face attributes. */ | |
| 2513 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
| 2514 && !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
|
2515 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
| 31178 | 2516 |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2517 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2518 i = LFACE_FONT_INDEX; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2519 if (!UNSPECIFIEDP (from[i])) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2520 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2521 if (!UNSPECIFIEDP (to[i])) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2522 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
|
2523 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2524 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
|
2525 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
|
2526 } |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2527 #endif |
| 31221 | 2528 |
| 24995 | 2529 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
| 2530 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
|
2531 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2532 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
|
2533 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2534 to[i] = merge_face_heights (from[i], to[i], to[i]); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2535 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2536 font_clear_prop (to, FONT_SIZE_INDEX); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2537 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2538 } |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2539 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2540 else if (i != LFACE_FONT_INDEX) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2541 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2542 to[i] = from[i]; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2543 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
|
2544 font_clear_prop (to, |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2545 (i == LFACE_FAMILY_INDEX ? FONT_FAMILY_INDEX |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2546 : 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
|
2547 : 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
|
2548 : 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
|
2549 : FONT_SLANT_INDEX)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2550 } |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2551 #endif |
|
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2552 } |
| 31178 | 2553 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2554 /* 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
|
2555 it to the other attributes. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2556 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
|
2557 font_update_lface (f, to); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2558 |
| 31178 | 2559 /* TO is always an absolute face, which should inherit from nothing. |
| 2560 We blindly copy the :inherit attribute above and fix it up here. */ | |
| 2561 to[LFACE_INHERIT_INDEX] = Qnil; | |
| 2562 } | |
| 2563 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2564 /* 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
|
2565 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
|
2566 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
|
2567 merging succeeded. */ |
|
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 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2570 merge_named_face (f, face_name, to, named_merge_points) |
| 31178 | 2571 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
|
2572 Lisp_Object face_name; |
| 31178 | 2573 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
|
2574 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
|
2575 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2576 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
|
2577 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2578 if (push_named_merge_point (&named_merge_point, |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2579 face_name, &named_merge_points)) |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2580 { |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2581 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
|
2582 Lisp_Object from[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
|
2583 int ok = get_lface_attributes (f, face_name, from, 0); |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2584 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2585 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
|
2586 { |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2587 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
|
2588 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
|
2589 UNGCPRO; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2590 } |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2591 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2592 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
|
2593 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2594 else |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2595 return 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2596 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2597 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2598 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2599 /* 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
|
2600 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
|
2601 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
|
2602 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
|
2603 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
|
2604 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
|
2605 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2606 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
|
2607 specifications. Each face specification can be: |
| 24995 | 2608 |
| 2609 1. A symbol or string naming a Lisp face. | |
| 2610 | |
| 2611 2. A property list of the form (KEYWORD VALUE ...) where each | |
| 2612 KEYWORD is a face attribute name, and value is an appropriate value | |
| 2613 for that attribute. | |
| 2614 | |
| 2615 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
| 2616 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
| 2617 for compatibility with 20.2. | |
| 2618 | |
| 2619 Face specifications earlier in lists take precedence over later | |
| 2620 specifications. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2621 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2622 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2623 merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) |
| 24995 | 2624 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
|
2625 Lisp_Object face_ref; |
| 24995 | 2626 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
|
2627 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
|
2628 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
|
2629 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2630 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
|
2631 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2632 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
|
2633 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2634 Lisp_Object first = XCAR (face_ref); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2635 |
| 24995 | 2636 if (EQ (first, Qforeground_color) |
| 2637 || EQ (first, Qbackground_color)) | |
| 2638 { | |
| 2639 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
| 2640 . 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
|
2641 Lisp_Object color_name = XCDR (face_ref); |
| 24995 | 2642 Lisp_Object color = first; |
| 2643 | |
| 2644 if (STRINGP (color_name)) | |
| 2645 { | |
| 2646 if (EQ (color, Qforeground_color)) | |
| 2647 to[LFACE_FOREGROUND_INDEX] = color_name; | |
| 2648 else | |
| 2649 to[LFACE_BACKGROUND_INDEX] = color_name; | |
| 2650 } | |
| 2651 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2652 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2653 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
|
2654 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
|
2655 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2656 } |
| 24995 | 2657 } |
| 2658 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
|
2659 && *SDATA (SYMBOL_NAME (first)) == ':') |
| 24995 | 2660 { |
| 2661 /* 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
|
2662 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
| 24995 | 2663 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2664 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
|
2665 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
|
2666 int err = 0; |
| 24995 | 2667 |
|
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2668 /* 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
|
2669 if (EQ (value, Qunspecified)) |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2670 ; |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2671 else if (EQ (keyword, QCfamily)) |
| 24995 | 2672 { |
| 2673 if (STRINGP (value)) | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2674 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2675 to[LFACE_FAMILY_INDEX] = value; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2676 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2677 font_clear_prop (to, FONT_FAMILY_INDEX); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2678 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2679 } |
| 24995 | 2680 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2681 err = 1; |
| 24995 | 2682 } |
| 2683 else if (EQ (keyword, QCheight)) | |
| 2684 { | |
| 31178 | 2685 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
|
2686 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
| 31178 | 2687 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2688 if (! NILP (new_height)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2689 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2690 to[LFACE_HEIGHT_INDEX] = new_height; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2691 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2692 font_clear_prop (to, FONT_SIZE_INDEX); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2693 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2694 } |
| 24995 | 2695 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2696 err = 1; |
| 24995 | 2697 } |
| 2698 else if (EQ (keyword, QCweight)) | |
| 2699 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2700 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
|
2701 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2702 to[LFACE_WEIGHT_INDEX] = value; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2703 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2704 font_clear_prop (to, FONT_WEIGHT_INDEX); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2705 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2706 } |
| 24995 | 2707 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2708 err = 1; |
| 24995 | 2709 } |
| 2710 else if (EQ (keyword, QCslant)) | |
| 2711 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2712 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
|
2713 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2714 to[LFACE_SLANT_INDEX] = value; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2715 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2716 font_clear_prop (to, FONT_SLANT_INDEX); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2717 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2718 } |
| 24995 | 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, QCunderline)) | |
| 2723 { | |
| 2724 if (EQ (value, Qt) | |
| 2725 || NILP (value) | |
| 2726 || STRINGP (value)) | |
| 2727 to[LFACE_UNDERLINE_INDEX] = value; | |
| 2728 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2729 err = 1; |
| 24995 | 2730 } |
| 2731 else if (EQ (keyword, QCoverline)) | |
| 2732 { | |
| 2733 if (EQ (value, Qt) | |
| 2734 || NILP (value) | |
| 2735 || STRINGP (value)) | |
| 2736 to[LFACE_OVERLINE_INDEX] = value; | |
| 2737 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2738 err = 1; |
| 24995 | 2739 } |
| 2740 else if (EQ (keyword, QCstrike_through)) | |
| 2741 { | |
| 2742 if (EQ (value, Qt) | |
| 2743 || NILP (value) | |
| 2744 || STRINGP (value)) | |
| 2745 to[LFACE_STRIKE_THROUGH_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, QCbox)) | |
| 2750 { | |
| 2751 if (EQ (value, Qt)) | |
| 2752 value = make_number (1); | |
| 2753 if (INTEGERP (value) | |
| 2754 || STRINGP (value) | |
| 2755 || CONSP (value) | |
| 2756 || NILP (value)) | |
| 2757 to[LFACE_BOX_INDEX] = value; | |
| 2758 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2759 err = 1; |
| 24995 | 2760 } |
| 2761 else if (EQ (keyword, QCinverse_video) | |
| 2762 || EQ (keyword, QCreverse_video)) | |
| 2763 { | |
| 2764 if (EQ (value, Qt) || NILP (value)) | |
| 2765 to[LFACE_INVERSE_INDEX] = value; | |
| 2766 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2767 err = 1; |
| 24995 | 2768 } |
| 2769 else if (EQ (keyword, QCforeground)) | |
| 2770 { | |
| 2771 if (STRINGP (value)) | |
| 2772 to[LFACE_FOREGROUND_INDEX] = value; | |
| 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 } |
| 2776 else if (EQ (keyword, QCbackground)) | |
| 2777 { | |
| 2778 if (STRINGP (value)) | |
| 2779 to[LFACE_BACKGROUND_INDEX] = value; | |
| 2780 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2781 err = 1; |
| 24995 | 2782 } |
| 2783 else if (EQ (keyword, QCstipple)) | |
| 2784 { | |
| 2785 #ifdef HAVE_X_WINDOWS | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
2786 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
| 24995 | 2787 if (!NILP (pixmap_p)) |
| 2788 to[LFACE_STIPPLE_INDEX] = value; | |
| 2789 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2790 err = 1; |
| 24995 | 2791 #endif |
| 2792 } | |
| 2793 else if (EQ (keyword, QCwidth)) | |
| 2794 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2795 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
|
2796 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2797 to[LFACE_SWIDTH_INDEX] = value; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2798 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2799 font_clear_prop (to, FONT_WIDTH_INDEX); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
2800 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2801 } |
| 24995 | 2802 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2803 err = 1; |
| 24995 | 2804 } |
| 31178 | 2805 else if (EQ (keyword, QCinherit)) |
| 2806 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2807 /* 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
|
2808 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
|
2809 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
|
2810 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
|
2811 err = 1; |
| 31178 | 2812 } |
| 24995 | 2813 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2814 err = 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2815 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2816 if (err) |
|
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 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
|
2819 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2820 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2821 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2822 face_ref = XCDR (XCDR (face_ref)); |
| 24995 | 2823 } |
| 2824 } | |
| 2825 else | |
| 2826 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2827 /* 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
|
2828 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
|
2829 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
|
2830 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
|
2831 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2832 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
|
2833 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
|
2834 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2835 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
|
2836 ok = 0; |
| 24995 | 2837 } |
| 2838 } | |
| 2839 else | |
| 2840 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2841 /* 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
|
2842 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
|
2843 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
|
2844 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
|
2845 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2846 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2847 return ok; |
| 24995 | 2848 } |
| 2849 | |
| 2850 | |
| 2851 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
| 2852 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
|
2853 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
|
2854 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
|
2855 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
|
2856 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
|
2857 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
|
2858 (face, frame) |
| 24995 | 2859 Lisp_Object face, frame; |
| 2860 { | |
| 2861 Lisp_Object global_lface, lface; | |
| 2862 struct frame *f; | |
| 2863 int i; | |
| 2864 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2865 CHECK_SYMBOL (face); |
| 24995 | 2866 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
|
2867 |
| 24995 | 2868 if (!NILP (frame)) |
| 2869 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2870 CHECK_LIVE_FRAME (frame); |
| 24995 | 2871 f = XFRAME (frame); |
| 2872 lface = lface_from_face_name (f, face, 0); | |
| 2873 } | |
| 2874 else | |
| 2875 f = NULL, lface = Qnil; | |
| 2876 | |
| 2877 /* Add a global definition if there is none. */ | |
| 2878 if (NILP (global_lface)) | |
| 2879 { | |
| 2880 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 2881 Qunspecified); | |
|
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2882 ASET (global_lface, 0, Qface); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2883 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
| 24995 | 2884 Vface_new_frame_defaults); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2885 |
| 24995 | 2886 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
| 2887 face id to Lisp face is given by the vector lface_id_to_name. | |
| 2888 The mapping from Lisp face to Lisp face id is given by the | |
| 2889 property `face' of the Lisp face name. */ | |
| 2890 if (next_lface_id == lface_id_to_name_size) | |
| 2891 { | |
| 2892 int new_size = max (50, 2 * lface_id_to_name_size); | |
| 2893 int sz = new_size * sizeof *lface_id_to_name; | |
| 2894 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
| 2895 lface_id_to_name_size = new_size; | |
| 2896 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2897 |
| 24995 | 2898 lface_id_to_name[next_lface_id] = face; |
| 2899 Fput (face, Qface, make_number (next_lface_id)); | |
| 2900 ++next_lface_id; | |
| 2901 } | |
| 2902 else if (f == NULL) | |
| 2903 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
|
2904 ASET (global_lface, i, Qunspecified); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2905 |
| 24995 | 2906 /* Add a frame-local definition. */ |
| 2907 if (f) | |
| 2908 { | |
| 2909 if (NILP (lface)) | |
| 2910 { | |
| 2911 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 2912 Qunspecified); | |
|
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2913 ASET (lface, 0, Qface); |
| 24995 | 2914 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
| 2915 } | |
| 2916 else | |
| 2917 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
|
2918 ASET (lface, i, Qunspecified); |
| 24995 | 2919 } |
| 2920 else | |
| 2921 lface = global_lface; | |
| 2922 | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2923 /* 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
|
2924 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
|
2925 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
|
2926 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
|
2927 init_iterator will then free realized faces. */ |
| 57107 | 2928 if (NILP (Fget (face, Qface_no_inherit))) |
| 2929 { | |
| 2930 ++face_change_count; | |
| 2931 ++windows_or_buffers_changed; | |
| 2932 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2933 |
| 24995 | 2934 xassert (LFACEP (lface)); |
| 2935 check_lface (lface); | |
| 2936 return lface; | |
| 2937 } | |
| 2938 | |
| 2939 | |
| 2940 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
| 2941 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
|
2942 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
|
2943 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
|
2944 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
|
2945 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
|
2946 (face, frame) |
| 24995 | 2947 Lisp_Object face, frame; |
| 2948 { | |
| 2949 Lisp_Object lface; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2950 |
|
81146
8f50479e40d1
(Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents:
77903
diff
changeset
|
2951 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
|
2952 |
| 24995 | 2953 if (!NILP (frame)) |
| 2954 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2955 CHECK_LIVE_FRAME (frame); |
| 24995 | 2956 lface = lface_from_face_name (XFRAME (frame), face, 0); |
| 2957 } | |
| 2958 else | |
| 2959 lface = lface_from_face_name (NULL, face, 0); | |
| 2960 | |
| 2961 return lface; | |
| 2962 } | |
| 2963 | |
| 2964 | |
| 2965 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
| 2966 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
|
2967 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
|
2968 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
|
2969 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
|
2970 If NEW-FRAME is a frame, copy that data into the frame-local |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2971 definition of TO on NEW-FRAME. If NEW-FRAME is nil. |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2972 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
|
2973 |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2974 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
|
2975 (from, to, frame, new_frame) |
| 24995 | 2976 Lisp_Object from, to, frame, new_frame; |
| 2977 { | |
| 2978 Lisp_Object lface, copy; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2979 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2980 CHECK_SYMBOL (from); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2981 CHECK_SYMBOL (to); |
| 24995 | 2982 |
| 2983 if (EQ (frame, Qt)) | |
| 2984 { | |
| 2985 /* Copy global definition of FROM. We don't make copies of | |
| 2986 strings etc. because 20.2 didn't do it either. */ | |
| 2987 lface = lface_from_face_name (NULL, from, 1); | |
| 2988 copy = Finternal_make_lisp_face (to, Qnil); | |
| 2989 } | |
| 2990 else | |
| 2991 { | |
| 2992 /* 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
|
2993 if (NILP (new_frame)) |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2994 new_frame = frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2995 CHECK_LIVE_FRAME (frame); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2996 CHECK_LIVE_FRAME (new_frame); |
| 24995 | 2997 lface = lface_from_face_name (XFRAME (frame), from, 1); |
| 2998 copy = Finternal_make_lisp_face (to, new_frame); | |
| 2999 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3000 |
| 24995 | 3001 bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents, |
| 3002 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3003 |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3004 /* 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
|
3005 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
|
3006 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
|
3007 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
|
3008 init_iterator will then free realized faces. */ |
| 57107 | 3009 if (NILP (Fget (to, Qface_no_inherit))) |
| 3010 { | |
| 3011 ++face_change_count; | |
| 3012 ++windows_or_buffers_changed; | |
| 3013 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3014 |
| 24995 | 3015 return to; |
| 3016 } | |
| 3017 | |
| 3018 | |
| 3019 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
| 3020 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
|
3021 doc: /* Set attribute ATTR of FACE to VALUE. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3022 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
|
3023 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
|
3024 FRAME t means change the default for new frames. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3025 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
|
3026 for new frames. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3027 (face, attr, value, frame) |
| 24995 | 3028 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
|
3029 { |
| 24995 | 3030 Lisp_Object lface; |
| 3031 Lisp_Object old_value = Qnil; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3032 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3033 /* 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
|
3034 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
|
3035 enum font_property_index prop_index = 0; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3036 #endif |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3037 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3038 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3039 CHECK_SYMBOL (attr); |
| 24995 | 3040 |
|
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
3041 face = resolve_face_name (face, 1); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3042 |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3043 /* 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
|
3044 default for new frames. */ |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3045 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
|
3046 { |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3047 Lisp_Object tail; |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3048 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
|
3049 FOR_EACH_FRAME (tail, frame) |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3050 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
|
3051 return face; |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3052 } |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3053 |
| 24995 | 3054 /* Set lface to the Lisp attribute vector of FACE. */ |
| 3055 if (EQ (frame, Qt)) | |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3056 { |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3057 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
|
3058 |
|
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3059 /* 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
|
3060 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
|
3061 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
|
3062 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
|
3063 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
|
3064 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
|
3065 if (UNSPECIFIEDP (value)) |
|
67056
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3066 value = Qignore_defface; |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3067 } |
| 24995 | 3068 else |
| 3069 { | |
| 3070 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3071 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3072 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3073 CHECK_LIVE_FRAME (frame); |
| 24995 | 3074 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
|
3075 |
| 24995 | 3076 /* If a frame-local face doesn't exist yet, create one. */ |
| 3077 if (NILP (lface)) | |
| 3078 lface = Finternal_make_lisp_face (face, frame); | |
| 3079 } | |
| 3080 | |
| 3081 if (EQ (attr, QCfamily)) | |
| 3082 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3083 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3084 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3085 CHECK_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
|
3086 if (SCHARS (value) == 0) |
| 24995 | 3087 signal_error ("Invalid face family", value); |
| 3088 } | |
| 3089 old_value = LFACE_FAMILY (lface); | |
| 3090 LFACE_FAMILY (lface) = value; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3091 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3092 prop_index = FONT_FAMILY_INDEX; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3093 #endif |
| 24995 | 3094 } |
| 3095 else if (EQ (attr, QCheight)) | |
| 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 { |
|
40023
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3099 Lisp_Object test; |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3100 |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3101 test = (EQ (face, Qdefault) |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3102 ? value |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3103 /* 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
|
3104 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
|
3105 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
|
3106 : 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
|
3107 |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
3108 if (!INTEGERP (test) || XINT (test) <= 0) |
| 24995 | 3109 signal_error ("Invalid face height", value); |
| 3110 } | |
| 31178 | 3111 |
| 24995 | 3112 old_value = LFACE_HEIGHT (lface); |
| 3113 LFACE_HEIGHT (lface) = value; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3114 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3115 prop_index = FONT_SIZE_INDEX; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3116 #endif |
| 24995 | 3117 } |
| 3118 else if (EQ (attr, QCweight)) | |
| 3119 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3120 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3121 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3122 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3123 if (FONT_WEIGHT_NAME_NUMERIC (value) < 0) |
| 24995 | 3124 signal_error ("Invalid face weight", value); |
| 3125 } | |
| 3126 old_value = LFACE_WEIGHT (lface); | |
| 3127 LFACE_WEIGHT (lface) = value; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3128 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3129 prop_index = FONT_WEIGHT_INDEX; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3130 #endif |
| 24995 | 3131 } |
| 3132 else if (EQ (attr, QCslant)) | |
| 3133 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3134 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3135 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3136 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3137 if (FONT_SLANT_NAME_NUMERIC (value) < 0) |
| 24995 | 3138 signal_error ("Invalid face slant", value); |
| 3139 } | |
| 3140 old_value = LFACE_SLANT (lface); | |
| 3141 LFACE_SLANT (lface) = value; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3142 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3143 prop_index = FONT_SLANT_INDEX; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3144 #endif |
| 24995 | 3145 } |
| 3146 else if (EQ (attr, QCunderline)) | |
| 3147 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3148 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3149 if ((SYMBOLP (value) |
| 3150 && !EQ (value, Qt) | |
| 3151 && !EQ (value, Qnil)) | |
| 3152 /* Underline color. */ | |
| 3153 || (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
|
3154 && SCHARS (value) == 0)) |
| 24995 | 3155 signal_error ("Invalid face underline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3156 |
| 24995 | 3157 old_value = LFACE_UNDERLINE (lface); |
| 3158 LFACE_UNDERLINE (lface) = value; | |
| 3159 } | |
| 3160 else if (EQ (attr, QCoverline)) | |
| 3161 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3162 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3163 if ((SYMBOLP (value) |
| 3164 && !EQ (value, Qt) | |
| 3165 && !EQ (value, Qnil)) | |
| 3166 /* Overline color. */ | |
| 3167 || (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
|
3168 && SCHARS (value) == 0)) |
| 24995 | 3169 signal_error ("Invalid face overline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3170 |
| 24995 | 3171 old_value = LFACE_OVERLINE (lface); |
| 3172 LFACE_OVERLINE (lface) = value; | |
| 3173 } | |
| 3174 else if (EQ (attr, QCstrike_through)) | |
| 3175 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3176 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3177 if ((SYMBOLP (value) |
| 3178 && !EQ (value, Qt) | |
| 3179 && !EQ (value, Qnil)) | |
| 3180 /* Strike-through color. */ | |
| 3181 || (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
|
3182 && SCHARS (value) == 0)) |
| 24995 | 3183 signal_error ("Invalid face strike-through", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3184 |
| 24995 | 3185 old_value = LFACE_STRIKE_THROUGH (lface); |
| 3186 LFACE_STRIKE_THROUGH (lface) = value; | |
| 3187 } | |
| 3188 else if (EQ (attr, QCbox)) | |
| 3189 { | |
| 3190 int valid_p; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3191 |
| 24995 | 3192 /* Allow t meaning a simple box of width 1 in foreground color |
| 3193 of the face. */ | |
| 3194 if (EQ (value, Qt)) | |
| 3195 value = make_number (1); | |
| 3196 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3197 if (UNSPECIFIEDP (value) || IGNORE_DEFFACE_P (value)) |
| 24995 | 3198 valid_p = 1; |
| 3199 else if (NILP (value)) | |
| 3200 valid_p = 1; | |
| 3201 else if (INTEGERP (value)) | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3202 valid_p = XINT (value) != 0; |
| 24995 | 3203 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
|
3204 valid_p = SCHARS (value) > 0; |
| 24995 | 3205 else if (CONSP (value)) |
| 3206 { | |
| 3207 Lisp_Object tem; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3208 |
| 24995 | 3209 tem = value; |
| 3210 while (CONSP (tem)) | |
| 3211 { | |
| 3212 Lisp_Object k, v; | |
| 3213 | |
| 3214 k = XCAR (tem); | |
| 3215 tem = XCDR (tem); | |
| 3216 if (!CONSP (tem)) | |
| 3217 break; | |
| 3218 v = XCAR (tem); | |
| 3219 tem = XCDR (tem); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3220 |
| 24995 | 3221 if (EQ (k, QCline_width)) |
| 3222 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3223 if (!INTEGERP (v) || XINT (v) == 0) |
| 24995 | 3224 break; |
| 3225 } | |
| 3226 else if (EQ (k, QCcolor)) | |
| 3227 { | |
|
60150
ffb5cb773521
(Finternal_set_lisp_face_attribute): Allow :color property
Kim F. Storm <storm@cua.dk>
parents:
59924
diff
changeset
|
3228 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0)) |
| 24995 | 3229 break; |
| 3230 } | |
| 3231 else if (EQ (k, QCstyle)) | |
| 3232 { | |
| 3233 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
| 3234 break; | |
| 3235 } | |
| 3236 else | |
| 3237 break; | |
| 3238 } | |
| 3239 | |
| 3240 valid_p = NILP (tem); | |
| 3241 } | |
| 3242 else | |
| 3243 valid_p = 0; | |
| 3244 | |
| 3245 if (!valid_p) | |
| 3246 signal_error ("Invalid face box", value); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3247 |
| 24995 | 3248 old_value = LFACE_BOX (lface); |
| 3249 LFACE_BOX (lface) = value; | |
| 3250 } | |
| 3251 else if (EQ (attr, QCinverse_video) | |
| 3252 || EQ (attr, QCreverse_video)) | |
| 3253 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3254 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3255 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3256 CHECK_SYMBOL (value); |
| 24995 | 3257 if (!EQ (value, Qt) && !NILP (value)) |
| 3258 signal_error ("Invalid inverse-video face attribute value", value); | |
| 3259 } | |
| 3260 old_value = LFACE_INVERSE (lface); | |
| 3261 LFACE_INVERSE (lface) = value; | |
| 3262 } | |
| 3263 else if (EQ (attr, QCforeground)) | |
| 3264 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3265 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3266 { |
| 3267 /* Don't check for valid color names here because it depends | |
| 3268 on the frame (display) whether the color will be valid | |
| 3269 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
|
3270 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
|
3271 if (SCHARS (value) == 0) |
| 24995 | 3272 signal_error ("Empty foreground color value", value); |
| 3273 } | |
| 3274 old_value = LFACE_FOREGROUND (lface); | |
| 3275 LFACE_FOREGROUND (lface) = value; | |
| 3276 } | |
| 3277 else if (EQ (attr, QCbackground)) | |
| 3278 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3279 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3280 { |
| 3281 /* Don't check for valid color names here because it depends | |
| 3282 on the frame (display) whether the color will be valid | |
| 3283 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
|
3284 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
|
3285 if (SCHARS (value) == 0) |
| 24995 | 3286 signal_error ("Empty background color value", value); |
| 3287 } | |
| 3288 old_value = LFACE_BACKGROUND (lface); | |
| 3289 LFACE_BACKGROUND (lface) = value; | |
| 3290 } | |
| 3291 else if (EQ (attr, QCstipple)) | |
| 3292 { | |
| 3293 #ifdef HAVE_X_WINDOWS | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3294 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
| 24995 | 3295 && !NILP (value) |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3296 && NILP (Fbitmap_spec_p (value))) |
| 24995 | 3297 signal_error ("Invalid stipple attribute", value); |
| 3298 old_value = LFACE_STIPPLE (lface); | |
| 3299 LFACE_STIPPLE (lface) = value; | |
| 3300 #endif /* HAVE_X_WINDOWS */ | |
| 3301 } | |
| 3302 else if (EQ (attr, QCwidth)) | |
| 3303 { | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3304 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
| 24995 | 3305 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3306 CHECK_SYMBOL (value); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3307 if (FONT_WIDTH_NAME_NUMERIC (value) < 0) |
| 24995 | 3308 signal_error ("Invalid face width", value); |
| 3309 } | |
| 3310 old_value = LFACE_SWIDTH (lface); | |
| 3311 LFACE_SWIDTH (lface) = value; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3312 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3313 prop_index = FONT_WIDTH_INDEX; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3314 #endif |
|
94938
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 else if (EQ (attr, QCfont)) |
| 24995 | 3317 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3318 #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
|
3319 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
|
3320 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3321 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
|
3322 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3323 FRAME_PTR f; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3324 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3325 old_value = LFACE_FONT (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3326 if (! FONTP (value)) |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3327 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3328 if (STRINGP (value)) |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3329 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3330 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
|
3331 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3332 if (fontset >= 0) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3333 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
|
3334 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
|
3335 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3336 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3337 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
|
3338 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3339 if (EQ (frame, Qt)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3340 f = XFRAME (selected_frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3341 else |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3342 f = XFRAME (frame); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3343 if (! FONT_OBJECT_P (value)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3344 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3345 Lisp_Object *attrs = XVECTOR (lface)->contents; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3346 Lisp_Object font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3347 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3348 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
|
3349 if (NILP (font_object)) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3350 signal_error ("Font not available", value); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3351 value = font_object; |
|
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3352 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3353 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
|
3354 } |
|
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3355 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3356 LFACE_FONT (lface) = value; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3357 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3358 #endif /* HAVE_WINDOW_SYSTEM */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3359 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3360 else if (EQ (attr, QCfontset)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3361 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3362 #ifdef HAVE_WINDOW_SYSTEM |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3363 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
|
3364 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3365 Lisp_Object tmp; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3366 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3367 old_value = LFACE_FONTSET (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3368 tmp = Fquery_fontset (value, Qnil); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3369 if (NILP (tmp)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3370 signal_error ("Invalid fontset name", value); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3371 LFACE_FONTSET (lface) = value = tmp; |
|
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
3372 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3373 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3374 } |
| 31178 | 3375 else if (EQ (attr, QCinherit)) |
| 3376 { | |
| 3377 Lisp_Object tail; | |
| 3378 if (SYMBOLP (value)) | |
| 3379 tail = Qnil; | |
| 3380 else | |
| 3381 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
| 3382 if (!SYMBOLP (XCAR (tail))) | |
| 3383 break; | |
| 3384 if (NILP (tail)) | |
| 3385 LFACE_INHERIT (lface) = value; | |
| 3386 else | |
|
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3387 signal_error ("Invalid face inheritance", value); |
| 31178 | 3388 } |
| 24995 | 3389 else if (EQ (attr, QCbold)) |
| 3390 { | |
| 3391 old_value = LFACE_WEIGHT (lface); | |
| 3392 LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3393 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3394 prop_index = FONT_WEIGHT_INDEX; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3395 #endif |
| 24995 | 3396 } |
| 3397 else if (EQ (attr, QCitalic)) | |
| 3398 { | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3399 attr = QCslant; |
| 24995 | 3400 old_value = LFACE_SLANT (lface); |
| 3401 LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic; | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3402 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3403 prop_index = FONT_SLANT_INDEX; |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3404 #endif |
| 24995 | 3405 } |
| 3406 else | |
| 3407 signal_error ("Invalid face attribute name", attr); | |
| 3408 | |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3409 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3410 if (prop_index) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3411 /* 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
|
3412 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
|
3413 (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
|
3414 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
|
3415 the attribute is mandatory. */ |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3416 font_clear_prop (XVECTOR (lface)->contents, prop_index); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3417 #endif |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3418 |
| 24995 | 3419 /* Changing a named face means that all realized faces depending on |
| 3420 that face are invalid. Since we cannot tell which realized faces | |
| 3421 depend on the face, make sure they are all removed. This is done | |
| 3422 by incrementing face_change_count. The next call to | |
| 3423 init_iterator will then free realized faces. */ | |
| 3424 if (!EQ (frame, Qt) | |
| 57107 | 3425 && 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
|
3426 && NILP (Fequal (old_value, value))) |
| 24995 | 3427 { |
| 3428 ++face_change_count; | |
| 3429 ++windows_or_buffers_changed; | |
| 3430 } | |
| 3431 | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3432 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
| 24995 | 3433 && NILP (Fequal (old_value, value))) |
|
25592
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 Lisp_Object param; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3436 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3437 param = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3438 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3439 if (EQ (face, Qdefault)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3440 { |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3441 #ifdef HAVE_WINDOW_SYSTEM |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3442 /* 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
|
3443 reflected in changed `font' frame parameters. */ |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3444 if (FRAMEP (frame) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3445 && (prop_index || EQ (attr, QCfont)) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3446 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3447 set_font_frame_param (frame, lface); |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3448 else |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3449 #endif /* HAVE_WINDOW_SYSTEM */ |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3450 |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3451 if (EQ (attr, QCforeground)) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3452 param = Qforeground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3453 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3454 param = Qbackground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3455 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3456 #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
|
3457 #ifndef WINDOWSNT |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3458 else if (EQ (face, Qscroll_bar)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3459 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3460 /* 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
|
3461 `scroll-bar-foreground' and `scroll-bar-background'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3462 if (EQ (attr, QCforeground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3463 param = Qscroll_bar_foreground; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3464 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3465 param = Qscroll_bar_background; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3466 } |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3467 #endif /* not WINDOWSNT */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3468 else if (EQ (face, Qborder)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3469 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3470 /* Changing background color of `border' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3471 `border-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3472 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3473 param = Qborder_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3474 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3475 else if (EQ (face, Qcursor)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3476 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3477 /* Changing background color of `cursor' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3478 `cursor-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3479 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3480 param = Qcursor_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3481 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3482 else if (EQ (face, Qmouse)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3483 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3484 /* Changing background color of `mouse' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3485 `mouse-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3486 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3487 param = Qmouse_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3488 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3489 #endif /* HAVE_WINDOW_SYSTEM */ |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
3490 else if (EQ (face, Qmenu)) |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3491 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3492 /* 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
|
3493 realizing faces on FRAME. FRAME t change the |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3494 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
|
3495 setting the flag in new face caches */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3496 if (FRAMEP (frame)) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3497 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3498 struct frame *f = XFRAME (frame); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3499 if (FRAME_FACE_CACHE (f) == NULL) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3500 FRAME_FACE_CACHE (f) = make_face_cache (f); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3501 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
|
3502 } |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3503 else |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3504 menu_face_changed_default = 1; |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3505 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3506 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3507 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
|
3508 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3509 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
|
3510 /* 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
|
3511 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3512 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
|
3513 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3514 else |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3515 /* 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
|
3516 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3517 Lisp_Object cons; |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3518 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
|
3519 XSETCAR (cons, param); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3520 XSETCDR (cons, value); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3521 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
|
3522 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3523 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3524 } |
| 24995 | 3525 |
| 3526 return face; | |
| 3527 } | |
| 3528 | |
| 3529 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3530 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 3531 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3532 /* 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
|
3533 font-object set in `default' face attributes LFACE. */ |
| 24995 | 3534 |
| 3535 static void | |
| 3536 set_font_frame_param (frame, lface) | |
| 3537 Lisp_Object frame, lface; | |
| 3538 { | |
| 3539 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
|
3540 |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
3541 if (FRAME_WINDOW_P (f)) |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
3542 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3543 Lisp_Object font = LFACE_FONT (lface); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3544 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3545 if (FONT_SPEC_P (font)) |
| 90414 | 3546 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3547 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
|
3548 if (NILP (font)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3549 return; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3550 LFACE_FONT (lface) = font; |
| 90414 | 3551 } |
|
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
3552 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
|
3553 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
|
3554 } |
| 24995 | 3555 } |
| 3556 | |
| 3557 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3558 /* 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
|
3559 has been assigned the value NEW_VALUE. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3560 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3561 void |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3562 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
|
3563 struct frame *f; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3564 Lisp_Object param, new_value; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3565 { |
| 57107 | 3566 Lisp_Object face = Qnil; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3567 Lisp_Object lface; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3568 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3569 /* 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
|
3570 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
|
3571 face-set-after-frame-defaults. */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3572 if (NILP (f->face_alist)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3573 return; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3574 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3575 if (EQ (param, Qforeground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3576 { |
| 57107 | 3577 face = Qdefault; |
| 3578 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
|
3579 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3580 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3581 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3582 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3583 else if (EQ (param, Qbackground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3584 { |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3585 Lisp_Object frame; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3586 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3587 /* 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
|
3588 mode, so that we have to load new defface specs. |
|
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
3589 Call frame-set-background-mode to do that. */ |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3590 XSETFRAME (frame, f); |
|
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
3591 call1 (Qframe_set_background_mode, frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3592 |
| 57107 | 3593 face = Qdefault; |
| 3594 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
|
3595 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3596 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3597 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3598 } |
| 57107 | 3599 else if (EQ (param, Qborder_color)) |
| 3600 { | |
| 3601 face = Qborder; | |
| 3602 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
|
3603 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3604 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3605 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3606 else if (EQ (param, Qcursor_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3607 { |
| 57107 | 3608 face = Qcursor; |
| 3609 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
|
3610 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3611 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3612 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3613 else if (EQ (param, Qmouse_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3614 { |
| 57107 | 3615 face = Qmouse; |
| 3616 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
|
3617 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3618 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3619 } |
| 57107 | 3620 |
| 3621 /* Changing a named face means that all realized faces depending on | |
| 3622 that face are invalid. Since we cannot tell which realized faces | |
| 3623 depend on the face, make sure they are all removed. This is done | |
| 3624 by incrementing face_change_count. The next call to | |
| 3625 init_iterator will then free realized faces. */ | |
| 3626 if (!NILP (face) | |
| 3627 && NILP (Fget (face, Qface_no_inherit))) | |
| 3628 { | |
| 3629 ++face_change_count; | |
| 3630 ++windows_or_buffers_changed; | |
| 3631 } | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3632 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3633 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3634 |
| 24995 | 3635 /* Get the value of X resource RESOURCE, class CLASS for the display |
| 3636 of frame FRAME. This is here because ordinary `x-get-resource' | |
| 3637 doesn't take a frame argument. */ | |
| 3638 | |
| 3639 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
|
3640 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
|
3641 (resource, class, frame) |
| 24995 | 3642 Lisp_Object resource, class, frame; |
| 3643 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3644 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
|
3645 CHECK_STRING (resource); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3646 CHECK_STRING (class); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3647 CHECK_LIVE_FRAME (frame); |
| 24995 | 3648 BLOCK_INPUT; |
| 3649 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
| 3650 resource, class, Qnil, Qnil); | |
| 3651 UNBLOCK_INPUT; | |
| 3652 return value; | |
| 3653 } | |
| 3654 | |
| 3655 | |
| 3656 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
| 3657 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
| 3658 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
| 3659 error; if SIGNAL_P is zero, return 0. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3660 |
| 24995 | 3661 static Lisp_Object |
| 3662 face_boolean_x_resource_value (value, signal_p) | |
| 3663 Lisp_Object value; | |
| 3664 int signal_p; | |
| 3665 { | |
| 3666 Lisp_Object result = make_number (0); | |
| 3667 | |
| 3668 xassert (STRINGP (value)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3669 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3670 if (xstricmp (SDATA (value), "on") == 0 |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3671 || xstricmp (SDATA (value), "true") == 0) |
| 24995 | 3672 result = Qt; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3673 else if (xstricmp (SDATA (value), "off") == 0 |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3674 || xstricmp (SDATA (value), "false") == 0) |
| 24995 | 3675 result = Qnil; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3676 else if (xstricmp (SDATA (value), "unspecified") == 0) |
| 24995 | 3677 result = Qunspecified; |
| 3678 else if (signal_p) | |
| 3679 signal_error ("Invalid face attribute value from X resource", value); | |
| 3680 | |
| 3681 return result; | |
| 3682 } | |
| 3683 | |
| 3684 | |
| 3685 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
| 3686 Finternal_set_lisp_face_attribute_from_resource, | |
| 3687 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
|
3688 3, 4, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3689 (face, attr, value, frame) |
| 24995 | 3690 Lisp_Object face, attr, value, frame; |
| 3691 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3692 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3693 CHECK_SYMBOL (attr); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3694 CHECK_STRING (value); |
| 24995 | 3695 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3696 if (xstricmp (SDATA (value), "unspecified") == 0) |
| 24995 | 3697 value = Qunspecified; |
| 3698 else if (EQ (attr, QCheight)) | |
| 3699 { | |
| 3700 value = Fstring_to_number (value, make_number (10)); | |
| 3701 if (XINT (value) <= 0) | |
| 3702 signal_error ("Invalid face height from X resource", value); | |
| 3703 } | |
| 3704 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
| 3705 value = face_boolean_x_resource_value (value, 1); | |
| 3706 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
|
3707 value = intern (SDATA (value)); |
| 24995 | 3708 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
| 3709 value = face_boolean_x_resource_value (value, 1); | |
| 3710 else if (EQ (attr, QCunderline) | |
| 3711 || EQ (attr, QCoverline) | |
|
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
3712 || EQ (attr, QCstrike_through)) |
| 24995 | 3713 { |
| 3714 Lisp_Object boolean_value; | |
| 3715 | |
| 3716 /* If the result of face_boolean_x_resource_value is t or nil, | |
| 3717 VALUE does NOT specify a color. */ | |
| 3718 boolean_value = face_boolean_x_resource_value (value, 0); | |
| 3719 if (SYMBOLP (boolean_value)) | |
| 3720 value = boolean_value; | |
| 3721 } | |
|
67130
c5ff1098b0b8
(Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
Eli Zaretskii <eliz@gnu.org>
parents:
67056
diff
changeset
|
3722 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
|
3723 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
| 24995 | 3724 |
| 3725 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
|
3726 } |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
3727 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3728 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3729 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3730 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3731 /*********************************************************************** |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3732 Menu face |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3733 ***********************************************************************/ |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3734 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3735 #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
|
3736 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3737 /* 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
|
3738 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3739 static void |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3740 x_update_menu_appearance (f) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3741 struct frame *f; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3742 { |
|
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3743 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
|
3744 XrmDatabase rdb; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3745 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3746 if (dpyinfo |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3747 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3748 rdb != NULL)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3749 { |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3750 char line[512]; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3751 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
|
3752 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
|
3753 const char *myname = SDATA (Vx_resource_name); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3754 int changed_p = 0; |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3755 #ifdef USE_MOTIF |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3756 const char *popup_path = "popup_menu"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3757 #else |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3758 const char *popup_path = "menu.popup"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3759 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3760 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3761 if (STRINGP (LFACE_FOREGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3762 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3763 sprintf (line, "%s.%s*foreground: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3764 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
|
3765 SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3766 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3767 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
|
3768 myname, SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3769 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3770 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3771 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3772 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3773 if (STRINGP (LFACE_BACKGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3774 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3775 sprintf (line, "%s.%s*background: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3776 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
|
3777 SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3778 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3779 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
|
3780 myname, SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3781 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3782 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3783 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3784 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3785 if (face->font |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3786 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3787 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3788 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3789 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3790 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3791 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3792 Lisp_Object xlfd = Ffont_xlfd_name (LFACE_FONT (lface)); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3793 #ifdef USE_MOTIF |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3794 const char *suffix = "List"; |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3795 Bool motif = True; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3796 #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
|
3797 #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
|
3798 |
|
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3799 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
|
3800 #else |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3801 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
|
3802 #endif |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3803 Bool motif = False; |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3804 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3805 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3806 if (! NILP (xlfd)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3807 { |
|
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3808 #if defined HAVE_X_I18N |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3809 extern char *xic_create_fontsetname |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3810 P_ ((char *base_fontname, Bool motif)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3811 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
|
3812 #else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3813 char *fontsetname = (char *) SDATA (xlfd); |
|
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
3814 #endif |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3815 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
|
3816 myname, suffix, fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3817 XrmPutLineResource (&rdb, line); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3818 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
|
3819 myname, popup_path, suffix, fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3820 XrmPutLineResource (&rdb, line); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3821 changed_p = 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3822 if (fontsetname != (char *) SDATA (xlfd)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3823 xfree (fontsetname); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3824 } |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3825 } |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3826 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3827 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
|
3828 free_frame_menubar (f); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3829 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3830 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3831 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3832 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
| 24995 | 3833 |
| 3834 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3835 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
|
3836 Sface_attribute_relative_p, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3837 2, 2, 0, |
|
71576
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3838 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
|
3839 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
|
3840 with the value VALUE is relative. |
|
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3841 |
|
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3842 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
|
3843 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
|
3844 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
|
3845 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
|
3846 (attribute, value) |
|
40532
221868112227
(Fface_attribute_relative_p): Declare args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40441
diff
changeset
|
3847 Lisp_Object attribute, value; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3848 { |
|
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3849 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
|
3850 return Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3851 else if (EQ (attribute, QCheight)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3852 return INTEGERP (value) ? Qnil : Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3853 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3854 return Qnil; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3855 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3856 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3857 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
|
3858 3, 3, 0, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3859 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
|
3860 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
|
3861 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
|
3862 (attribute, value1, value2) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3863 Lisp_Object attribute, value1, value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3864 { |
|
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3865 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
|
3866 return value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3867 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
|
3868 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
|
3869 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3870 return value1; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3871 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3872 |
| 24995 | 3873 |
| 3874 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
| 3875 Sinternal_get_lisp_face_attribute, | |
| 3876 2, 3, 0, | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3877 doc: /* Return face attribute KEYWORD of face SYMBOL. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3878 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
|
3879 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
|
3880 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
|
3881 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
|
3882 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
|
3883 (symbol, keyword, frame) |
| 24995 | 3884 Lisp_Object symbol, keyword, frame; |
| 3885 { | |
| 3886 Lisp_Object lface, value = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3887 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3888 CHECK_SYMBOL (symbol); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3889 CHECK_SYMBOL (keyword); |
| 24995 | 3890 |
| 3891 if (EQ (frame, Qt)) | |
| 3892 lface = lface_from_face_name (NULL, symbol, 1); | |
| 3893 else | |
| 3894 { | |
| 3895 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3896 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3897 CHECK_LIVE_FRAME (frame); |
| 24995 | 3898 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
| 3899 } | |
| 3900 | |
| 3901 if (EQ (keyword, QCfamily)) | |
| 3902 value = LFACE_FAMILY (lface); | |
| 3903 else if (EQ (keyword, QCheight)) | |
| 3904 value = LFACE_HEIGHT (lface); | |
| 3905 else if (EQ (keyword, QCweight)) | |
| 3906 value = LFACE_WEIGHT (lface); | |
| 3907 else if (EQ (keyword, QCslant)) | |
| 3908 value = LFACE_SLANT (lface); | |
| 3909 else if (EQ (keyword, QCunderline)) | |
| 3910 value = LFACE_UNDERLINE (lface); | |
| 3911 else if (EQ (keyword, QCoverline)) | |
| 3912 value = LFACE_OVERLINE (lface); | |
| 3913 else if (EQ (keyword, QCstrike_through)) | |
| 3914 value = LFACE_STRIKE_THROUGH (lface); | |
| 3915 else if (EQ (keyword, QCbox)) | |
| 3916 value = LFACE_BOX (lface); | |
| 3917 else if (EQ (keyword, QCinverse_video) | |
| 3918 || EQ (keyword, QCreverse_video)) | |
| 3919 value = LFACE_INVERSE (lface); | |
| 3920 else if (EQ (keyword, QCforeground)) | |
| 3921 value = LFACE_FOREGROUND (lface); | |
| 3922 else if (EQ (keyword, QCbackground)) | |
| 3923 value = LFACE_BACKGROUND (lface); | |
| 3924 else if (EQ (keyword, QCstipple)) | |
| 3925 value = LFACE_STIPPLE (lface); | |
| 3926 else if (EQ (keyword, QCwidth)) | |
| 3927 value = LFACE_SWIDTH (lface); | |
| 31178 | 3928 else if (EQ (keyword, QCinherit)) |
| 3929 value = LFACE_INHERIT (lface); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3930 else if (EQ (keyword, QCfont)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3931 value = LFACE_FONT (lface); |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3932 else if (EQ (keyword, QCfontset)) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3933 value = LFACE_FONTSET (lface); |
| 24995 | 3934 else |
| 3935 signal_error ("Invalid face attribute name", keyword); | |
| 3936 | |
|
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3937 if (IGNORE_DEFFACE_P (value)) |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3938 return Qunspecified; |
|
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3939 |
| 24995 | 3940 return value; |
| 3941 } | |
| 3942 | |
| 3943 | |
| 3944 DEFUN ("internal-lisp-face-attribute-values", | |
| 3945 Finternal_lisp_face_attribute_values, | |
| 3946 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
|
3947 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
|
3948 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
|
3949 (attr) |
| 24995 | 3950 Lisp_Object attr; |
| 3951 { | |
| 3952 Lisp_Object result = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3953 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3954 CHECK_SYMBOL (attr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3955 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3956 if (EQ (attr, QCunderline)) |
| 24995 | 3957 result = Fcons (Qt, Fcons (Qnil, Qnil)); |
| 3958 else if (EQ (attr, QCoverline)) | |
| 3959 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3960 else if (EQ (attr, QCstrike_through)) | |
| 3961 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3962 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
| 3963 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 3964 | |
| 3965 return result; | |
| 3966 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3967 |
| 24995 | 3968 |
| 3969 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
|
3970 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
|
3971 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
|
3972 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
|
3973 (face, frame) |
| 24995 | 3974 Lisp_Object face, frame; |
| 3975 { | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3976 int i; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3977 Lisp_Object global_lface, local_lface, *gvec, *lvec; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3978 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3979 CHECK_LIVE_FRAME (frame); |
| 24995 | 3980 global_lface = lface_from_face_name (NULL, face, 1); |
| 3981 local_lface = lface_from_face_name (XFRAME (frame), face, 0); | |
| 3982 if (NILP (local_lface)) | |
| 3983 local_lface = Finternal_make_lisp_face (face, frame); | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3984 |
|
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
3985 /* 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
|
3986 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
|
3987 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
|
3988 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
|
3989 "global before local" priority. */ |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3990 lvec = XVECTOR (local_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3991 gvec = XVECTOR (global_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3992 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3993 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
|
3994 { |
|
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3995 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
|
3996 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
|
3997 else |
|
d153d2fdd948
(Finternal_merge_in_global_face, try_font_list): Add
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3998 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
|
3999 } |
|
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4000 |
|
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4001 return Qnil; |
| 24995 | 4002 } |
| 4003 | |
| 4004 | |
| 4005 /* The following function is implemented for compatibility with 20.2. | |
| 4006 The function is used in x-resolve-fonts when it is asked to | |
| 4007 return fonts with the same size as the font of a face. This is | |
| 4008 done in fontset.el. */ | |
| 4009 | |
|
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4010 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
|
4011 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
|
4012 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
|
4013 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
|
4014 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
|
4015 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
|
4016 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
|
4017 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
|
4018 if the optional third argument CHARACTER is given, |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4019 return the font name used for CHARACTER. */) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4020 (face, frame, character) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4021 Lisp_Object face, frame, character; |
| 24995 | 4022 { |
| 4023 if (EQ (frame, Qt)) | |
| 4024 { | |
| 4025 Lisp_Object result = Qnil; | |
| 4026 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
| 4027 | |
| 4028 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
| 4029 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
| 4030 result = Fcons (Qbold, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4031 |
|
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
4032 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
| 24995 | 4033 && !EQ (LFACE_SLANT (lface), Qnormal)) |
| 4034 result = Fcons (Qitalic, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4035 |
| 24995 | 4036 return result; |
| 4037 } | |
| 4038 else | |
| 4039 { | |
| 4040 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
|
4041 int face_id = lookup_named_face (f, face, 1); |
| 24995 | 4042 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
|
4043 |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4044 if (! face) |
|
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4045 return Qnil; |
|
89947
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4046 #ifdef HAVE_WINDOW_SYSTEM |
|
89948
e94e49dc760e
(Fface_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89947
diff
changeset
|
4047 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
|
4048 { |
|
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4049 CHECK_CHARACTER (character); |
|
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4050 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
|
4051 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
|
4052 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4053 return (face->font |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4054 ? face->font->props[FONT_NAME_INDEX] |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4055 : Qnil); |
|
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4056 #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
|
4057 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
|
4058 ? "ms-dos" |
|
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4059 : 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
|
4060 :"tty"); |
|
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4061 #endif |
| 24995 | 4062 } |
| 4063 } | |
| 4064 | |
| 4065 | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4066 /* 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
|
4067 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
|
4068 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
|
4069 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4070 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
|
4071 face_attr_equal_p (v1, v2) |
|
56063
109c0a603543
(face_attr_equal_p): Declare parameters.
Andreas Schwab <schwab@suse.de>
parents:
55982
diff
changeset
|
4072 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
|
4073 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4074 /* 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
|
4075 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
|
4076 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
|
4077 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4078 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4079 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
|
4080 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4081 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4082 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
|
4083 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4084 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
|
4085 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
|
4086 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4087 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4088 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
|
4089 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4090 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
|
4091 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
|
4092 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4093 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4094 default: |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4095 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
|
4096 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4097 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4098 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4099 |
| 24995 | 4100 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
| 4101 all attributes are `equal'. Tries to be fast because this function | |
| 4102 is called quite often. */ | |
| 4103 | |
| 4104 static INLINE int | |
| 4105 lface_equal_p (v1, v2) | |
| 4106 Lisp_Object *v1, *v2; | |
| 4107 { | |
| 4108 int i, equal_p = 1; | |
| 4109 | |
| 4110 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
|
4111 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
|
4112 |
| 24995 | 4113 return equal_p; |
| 4114 } | |
| 4115 | |
| 4116 | |
| 4117 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
| 4118 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
|
4119 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
|
4120 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
|
4121 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
|
4122 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
|
4123 (face1, face2, frame) |
| 24995 | 4124 Lisp_Object face1, face2, frame; |
| 4125 { | |
| 4126 int equal_p; | |
| 4127 struct frame *f; | |
| 4128 Lisp_Object lface1, lface2; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4129 |
| 24995 | 4130 if (EQ (frame, Qt)) |
| 4131 f = NULL; | |
| 4132 else | |
| 4133 /* Don't use check_x_frame here because this function is called | |
| 4134 before X frames exist. At that time, if FRAME is nil, | |
| 4135 selected_frame will be used which is the frame dumped with | |
| 4136 Emacs. That frame is not an X frame. */ | |
| 4137 f = frame_or_selected_frame (frame, 2); | |
| 4138 | |
|
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
|
4139 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
|
4140 lface2 = lface_from_face_name (f, face2, 1); |
| 24995 | 4141 equal_p = lface_equal_p (XVECTOR (lface1)->contents, |
| 4142 XVECTOR (lface2)->contents); | |
| 4143 return equal_p ? Qt : Qnil; | |
| 4144 } | |
| 4145 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4146 |
| 24995 | 4147 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
| 4148 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
|
4149 doc: /* True if FACE has no attribute specified. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4150 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
|
4151 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
|
4152 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
|
4153 (face, frame) |
| 24995 | 4154 Lisp_Object face, frame; |
| 4155 { | |
| 4156 struct frame *f; | |
| 4157 Lisp_Object lface; | |
| 4158 int i; | |
| 4159 | |
| 4160 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4161 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4162 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4163 f = XFRAME (frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4164 |
| 24995 | 4165 if (EQ (frame, Qt)) |
| 4166 lface = lface_from_face_name (NULL, face, 1); | |
| 4167 else | |
| 4168 lface = lface_from_face_name (f, face, 1); | |
| 4169 | |
| 4170 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
|
4171 if (!UNSPECIFIEDP (AREF (lface, i))) |
| 24995 | 4172 break; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4173 |
| 24995 | 4174 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
| 4175 } | |
| 4176 | |
| 4177 | |
| 4178 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
|
4179 0, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4180 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
|
4181 For internal use only. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4182 (frame) |
| 24995 | 4183 Lisp_Object frame; |
| 4184 { | |
| 4185 struct frame *f = frame_or_selected_frame (frame, 0); | |
| 4186 return f->face_alist; | |
| 4187 } | |
| 4188 | |
| 4189 | |
| 4190 /* Return a hash code for Lisp string STRING with case ignored. Used | |
| 4191 below in computing a hash value for a Lisp face. */ | |
| 4192 | |
| 4193 static INLINE unsigned | |
| 4194 hash_string_case_insensitive (string) | |
| 4195 Lisp_Object string; | |
| 4196 { | |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
4197 const unsigned char *s; |
| 24995 | 4198 unsigned hash = 0; |
| 4199 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
|
4200 for (s = SDATA (string); *s; ++s) |
| 24995 | 4201 hash = (hash << 1) ^ tolower (*s); |
| 4202 return hash; | |
| 4203 } | |
| 4204 | |
| 4205 | |
| 4206 /* Return a hash code for face attribute vector V. */ | |
| 4207 | |
| 4208 static INLINE unsigned | |
| 4209 lface_hash (v) | |
| 4210 Lisp_Object *v; | |
| 4211 { | |
| 4212 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
| 4213 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) | |
| 4214 ^ 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
|
4215 ^ XHASH (v[LFACE_WEIGHT_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4216 ^ XHASH (v[LFACE_SLANT_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4217 ^ XHASH (v[LFACE_SWIDTH_INDEX]) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4218 ^ XHASH (v[LFACE_HEIGHT_INDEX])); |
| 24995 | 4219 } |
| 4220 | |
| 4221 | |
| 4222 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
| 4223 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
|
4224 family, point size, weight, width, slant, and font. Both |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4225 LFACE1 and LFACE2 must be fully-specified. */ |
| 24995 | 4226 |
| 4227 static INLINE int | |
| 4228 lface_same_font_attributes_p (lface1, lface2) | |
| 4229 Lisp_Object *lface1, *lface2; | |
| 4230 { | |
| 4231 xassert (lface_fully_specified_p (lface1) | |
| 4232 && lface_fully_specified_p (lface2)); | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4233 return (xstricmp (SDATA (lface1[LFACE_FAMILY_INDEX]), |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4234 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
| 31178 | 4235 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
| 24995 | 4236 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX]) |
| 4237 && EQ (lface1[LFACE_WEIGHT_INDEX], lface2[LFACE_WEIGHT_INDEX]) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4238 && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX]) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4239 && EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX]) |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4240 && (EQ (lface1[LFACE_FONTSET_INDEX], lface2[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4241 || (STRINGP (lface1[LFACE_FONTSET_INDEX]) |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4242 && STRINGP (lface2[LFACE_FONTSET_INDEX]) |
| 89483 | 4243 && ! xstricmp (SDATA (lface1[LFACE_FONTSET_INDEX]), |
| 4244 SDATA (lface2[LFACE_FONTSET_INDEX])))) | |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4245 ); |
| 24995 | 4246 } |
| 4247 | |
| 4248 | |
| 4249 | |
| 4250 /*********************************************************************** | |
| 4251 Realized Faces | |
| 4252 ***********************************************************************/ | |
| 4253 | |
| 4254 /* Allocate and return a new realized face for Lisp face attribute | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4255 vector ATTR. */ |
| 24995 | 4256 |
| 4257 static struct face * | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4258 make_realized_face (attr) |
| 24995 | 4259 Lisp_Object *attr; |
| 4260 { | |
| 4261 struct face *face = (struct face *) xmalloc (sizeof *face); | |
| 4262 bzero (face, sizeof *face); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4263 face->ascii_face = face; |
| 24995 | 4264 bcopy (attr, face->lface, sizeof face->lface); |
| 4265 return face; | |
| 4266 } | |
| 4267 | |
| 4268 | |
| 4269 /* Free realized face FACE, including its X resources. FACE may | |
| 4270 be null. */ | |
| 4271 | |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4272 void |
| 24995 | 4273 free_realized_face (f, face) |
| 4274 struct frame *f; | |
| 4275 struct face *face; | |
| 4276 { | |
| 4277 if (face) | |
| 4278 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4279 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4280 if (FRAME_WINDOW_P (f)) |
| 24995 | 4281 { |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4282 /* Free fontset of FACE if it is ASCII face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4283 if (face->fontset >= 0 && face == face->ascii_face) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4284 free_face_fontset (f, face); |
| 24995 | 4285 if (face->gc) |
| 4286 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4287 BLOCK_INPUT; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4288 if (face->font) |
| 90414 | 4289 font_done_for_face (f, face); |
| 24995 | 4290 x_free_gc (f, face->gc); |
| 4291 face->gc = 0; | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4292 UNBLOCK_INPUT; |
| 24995 | 4293 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4294 |
| 24995 | 4295 free_face_colors (f, face); |
| 4296 x_destroy_bitmap (f, face->stipple); | |
| 4297 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4298 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4299 |
| 4300 xfree (face); | |
| 4301 } | |
| 4302 } | |
| 4303 | |
| 4304 | |
| 4305 /* Prepare face FACE for subsequent display on frame F. This | |
| 4306 allocated GCs if they haven't been allocated yet or have been freed | |
| 4307 by clearing the face cache. */ | |
| 4308 | |
| 4309 void | |
| 4310 prepare_face_for_display (f, face) | |
| 4311 struct frame *f; | |
| 4312 struct face *face; | |
| 4313 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4314 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4315 xassert (FRAME_WINDOW_P (f)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4316 |
| 24995 | 4317 if (face->gc == 0) |
| 4318 { | |
| 4319 XGCValues xgcv; | |
| 4320 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
| 4321 | |
| 4322 xgcv.foreground = face->foreground; | |
| 4323 xgcv.background = face->background; | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4324 #ifdef HAVE_X_WINDOWS |
| 24995 | 4325 xgcv.graphics_exposures = False; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4326 #endif |
| 24995 | 4327 |
| 4328 BLOCK_INPUT; | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4329 #ifdef HAVE_X_WINDOWS |
| 24995 | 4330 if (face->stipple) |
| 4331 { | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
4332 xgcv.fill_style = FillOpaqueStippled; |
| 24995 | 4333 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
| 4334 mask |= GCFillStyle | GCStipple; | |
| 4335 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4336 #endif |
| 24995 | 4337 face->gc = x_create_gc (f, mask, &xgcv); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4338 if (face->font) |
| 90414 | 4339 font_prepare_for_face (f, face); |
| 24995 | 4340 UNBLOCK_INPUT; |
| 4341 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4342 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4343 } |
| 4344 | |
| 4345 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4346 /* Returns the `distance' between the colors X and Y. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4347 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4348 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4349 color_distance (x, y) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4350 XColor *x, *y; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4351 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4352 /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma. |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4353 Quoting from that paper: |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4354 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4355 This formula has results that are very close to L*u*v* (with the |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4356 modified lightness curve) and, more importantly, it is a more even |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4357 algorithm: it does not have a range of colours where it suddenly |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4358 gives far from optimal results. |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4359 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4360 See <http://www.compuphase.com/cmetric.htm> for more info. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4361 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4362 long r = (x->red - y->red) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4363 long g = (x->green - y->green) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4364 long b = (x->blue - y->blue) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4365 long r_mean = (x->red + y->red) >> 9; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4366 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4367 return |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4368 (((512 + r_mean) * r * r) >> 8) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4369 + 4 * g * g |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4370 + (((767 - r_mean) * b * b) >> 8); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4371 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4372 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4373 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4374 DEFUN ("color-distance", Fcolor_distance, Scolor_distance, 2, 3, 0, |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4375 doc: /* Return an integer distance between COLOR1 and COLOR2 on FRAME. |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4376 COLOR1 and COLOR2 may be either strings containing the color name, |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4377 or lists of the form (RED GREEN BLUE). |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4378 If FRAME is unspecified or nil, the current frame is used. */) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4379 (color1, color2, frame) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4380 Lisp_Object color1, color2, frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4381 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4382 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4383 XColor cdef1, cdef2; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4384 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4385 if (NILP (frame)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4386 frame = selected_frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4387 CHECK_LIVE_FRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4388 f = XFRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4389 |
|
75885
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4390 if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1)) |
|
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4391 && !(STRINGP (color1) && defined_color (f, SDATA (color1), &cdef1, 0))) |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4392 signal_error ("Invalid color", color1); |
|
75885
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4393 if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2)) |
|
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4394 && !(STRINGP (color2) && defined_color (f, SDATA (color2), &cdef2, 0))) |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4395 signal_error ("Invalid color", color2); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4396 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4397 return make_number (color_distance (&cdef1, &cdef2)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4398 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4399 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4400 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4401 /*********************************************************************** |
| 24995 | 4402 Face Cache |
| 4403 ***********************************************************************/ | |
| 4404 | |
| 4405 /* Return a new face cache for frame F. */ | |
| 4406 | |
| 4407 static struct face_cache * | |
| 4408 make_face_cache (f) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4409 struct frame *f; |
| 24995 | 4410 { |
| 4411 struct face_cache *c; | |
| 4412 int size; | |
| 4413 | |
| 4414 c = (struct face_cache *) xmalloc (sizeof *c); | |
| 4415 bzero (c, sizeof *c); | |
| 4416 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 4417 c->buckets = (struct face **) xmalloc (size); | |
| 4418 bzero (c->buckets, size); | |
| 4419 c->size = 50; | |
| 4420 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
| 4421 c->f = f; | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4422 c->menu_face_changed_p = menu_face_changed_default; |
| 24995 | 4423 return c; |
| 4424 } | |
| 4425 | |
| 4426 | |
| 4427 /* Clear out all graphics contexts for all realized faces, except for | |
| 4428 the basic faces. This should be done from time to time just to avoid | |
| 4429 keeping too many graphics contexts that are no longer needed. */ | |
| 4430 | |
| 4431 static void | |
| 4432 clear_face_gcs (c) | |
| 4433 struct face_cache *c; | |
| 4434 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4435 if (c && FRAME_WINDOW_P (c->f)) |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4436 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4437 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4438 int i; |
| 4439 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
| 4440 { | |
| 4441 struct face *face = c->faces_by_id[i]; | |
| 4442 if (face && face->gc) | |
| 4443 { | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4444 BLOCK_INPUT; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4445 if (face->font) |
| 90414 | 4446 font_done_for_face (c->f, face); |
| 24995 | 4447 x_free_gc (c->f, face->gc); |
| 4448 face->gc = 0; | |
|
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4449 UNBLOCK_INPUT; |
| 24995 | 4450 } |
| 4451 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4452 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4453 } |
| 4454 } | |
| 4455 | |
| 4456 | |
|
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4457 /* Free all realized faces in face cache C, including basic faces. |
|
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4458 C may be null. If faces are freed, make sure the frame's current |
| 24995 | 4459 matrix is marked invalid, so that a display caused by an expose |
| 4460 event doesn't try to use faces we destroyed. */ | |
| 4461 | |
| 4462 static void | |
| 4463 free_realized_faces (c) | |
| 4464 struct face_cache *c; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4465 { |
| 24995 | 4466 if (c && c->used) |
| 4467 { | |
| 4468 int i, size; | |
| 4469 struct frame *f = c->f; | |
| 4470 | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4471 /* We must block input here because we can't process X events |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4472 safely while only some faces are freed, or when the frame's |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4473 current matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4474 BLOCK_INPUT; |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4475 |
| 24995 | 4476 for (i = 0; i < c->used; ++i) |
| 4477 { | |
| 4478 free_realized_face (f, c->faces_by_id[i]); | |
| 4479 c->faces_by_id[i] = NULL; | |
| 4480 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4481 |
| 24995 | 4482 c->used = 0; |
| 4483 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 4484 bzero (c->buckets, size); | |
| 4485 | |
| 4486 /* Must do a thorough redisplay the next time. Mark current | |
| 4487 matrices as invalid because they will reference faces freed | |
| 4488 above. This function is also called when a frame is | |
| 4489 destroyed. In this case, the root window of F is nil. */ | |
| 4490 if (WINDOWP (f->root_window)) | |
| 4491 { | |
| 4492 clear_current_matrices (f); | |
| 4493 ++windows_or_buffers_changed; | |
| 4494 } | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4495 |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4496 UNBLOCK_INPUT; |
| 24995 | 4497 } |
| 4498 } | |
| 4499 | |
| 4500 | |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4501 /* Free all realized faces that are using FONTSET on frame F. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4502 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4503 void |
|
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4504 free_realized_faces_for_fontset (f, fontset) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4505 struct frame *f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4506 int fontset; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4507 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4508 struct face_cache *cache = FRAME_FACE_CACHE (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4509 struct face *face; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4510 int i; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4511 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4512 /* We must block input here because we can't process X events safely |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4513 while only some faces are freed, or when the frame's current |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4514 matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4515 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4516 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4517 for (i = 0; i < cache->used; i++) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4518 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4519 face = cache->faces_by_id[i]; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4520 if (face |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4521 && face->fontset == fontset) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4522 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4523 uncache_face (cache, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4524 free_realized_face (f, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4525 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4526 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4527 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4528 /* Must do a thorough redisplay the next time. Mark current |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4529 matrices as invalid because they will reference faces freed |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4530 above. This function is also called when a frame is destroyed. |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4531 In this case, the root window of F is nil. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4532 if (WINDOWP (f->root_window)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4533 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4534 clear_current_matrices (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4535 ++windows_or_buffers_changed; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4536 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4537 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4538 UNBLOCK_INPUT; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4539 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4540 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4541 |
| 24995 | 4542 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
| 4543 This is done after attributes of a named face have been changed, | |
| 4544 because we can't tell which realized faces depend on that face. */ | |
| 4545 | |
| 4546 void | |
| 4547 free_all_realized_faces (frame) | |
| 4548 Lisp_Object frame; | |
| 4549 { | |
| 4550 if (NILP (frame)) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4551 { |
| 24995 | 4552 Lisp_Object rest; |
| 4553 FOR_EACH_FRAME (rest, frame) | |
| 4554 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 4555 } | |
| 4556 else | |
| 4557 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 4558 } | |
| 4559 | |
| 4560 | |
| 4561 /* Free face cache C and faces in it, including their X resources. */ | |
| 4562 | |
| 4563 static void | |
| 4564 free_face_cache (c) | |
| 4565 struct face_cache *c; | |
| 4566 { | |
| 4567 if (c) | |
| 4568 { | |
| 4569 free_realized_faces (c); | |
| 4570 xfree (c->buckets); | |
| 4571 xfree (c->faces_by_id); | |
| 4572 xfree (c); | |
| 4573 } | |
| 4574 } | |
| 4575 | |
| 4576 | |
| 4577 /* Cache realized face FACE in face cache C. HASH is the hash value | |
| 88907 | 4578 of FACE. If FACE is for ASCII characters (i.e. FACE->ascii_face == |
| 4579 FACE), insert the new face to the beginning of the collision list | |
| 4580 of the face hash table of C. Otherwise, add the new face to the | |
| 4581 end of the collision list. This way, lookup_face can quickly find | |
| 4582 that a requested face is not cached. */ | |
| 24995 | 4583 |
| 4584 static void | |
| 4585 cache_face (c, face, hash) | |
| 4586 struct face_cache *c; | |
| 4587 struct face *face; | |
| 4588 unsigned hash; | |
| 4589 { | |
| 4590 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
| 4591 | |
| 4592 face->hash = hash; | |
| 4593 | |
| 88907 | 4594 if (face->ascii_face != face) |
| 24995 | 4595 { |
| 4596 struct face *last = c->buckets[i]; | |
| 4597 if (last) | |
| 4598 { | |
| 4599 while (last->next) | |
| 4600 last = last->next; | |
| 4601 last->next = face; | |
| 4602 face->prev = last; | |
| 4603 face->next = NULL; | |
| 4604 } | |
| 4605 else | |
| 4606 { | |
| 4607 c->buckets[i] = face; | |
| 4608 face->prev = face->next = NULL; | |
| 4609 } | |
| 4610 } | |
| 4611 else | |
| 4612 { | |
| 4613 face->prev = NULL; | |
| 4614 face->next = c->buckets[i]; | |
| 4615 if (face->next) | |
| 4616 face->next->prev = face; | |
| 4617 c->buckets[i] = face; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4618 } |
|
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4619 |
| 24995 | 4620 /* Find a free slot in C->faces_by_id and use the index of the free |
| 4621 slot as FACE->id. */ | |
| 4622 for (i = 0; i < c->used; ++i) | |
| 4623 if (c->faces_by_id[i] == NULL) | |
| 4624 break; | |
| 4625 face->id = i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4626 |
| 24995 | 4627 /* Maybe enlarge C->faces_by_id. */ |
|
53334
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4628 if (i == c->used) |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4629 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4630 if (c->used == c->size) |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4631 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4632 int new_size, sz; |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4633 new_size = min (2 * c->size, MAX_FACE_ID); |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4634 if (new_size == c->size) |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4635 abort (); /* Alternatives? ++kfs */ |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4636 sz = new_size * sizeof *c->faces_by_id; |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4637 c->faces_by_id = (struct face **) xrealloc (c->faces_by_id, sz); |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4638 c->size = new_size; |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4639 } |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4640 c->used++; |
| 24995 | 4641 } |
| 4642 | |
| 4643 #if GLYPH_DEBUG | |
| 4644 /* Check that FACE got a unique id. */ | |
| 4645 { | |
| 4646 int j, n; | |
| 4647 struct face *face; | |
| 4648 | |
| 4649 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
| 4650 for (face = c->buckets[j]; face; face = face->next) | |
| 4651 if (face->id == i) | |
| 4652 ++n; | |
| 4653 | |
| 4654 xassert (n == 1); | |
| 4655 } | |
| 4656 #endif /* GLYPH_DEBUG */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4657 |
| 24995 | 4658 c->faces_by_id[i] = face; |
| 4659 } | |
| 4660 | |
| 4661 | |
| 4662 /* Remove face FACE from cache C. */ | |
| 4663 | |
| 4664 static void | |
| 4665 uncache_face (c, face) | |
| 4666 struct face_cache *c; | |
| 4667 struct face *face; | |
| 4668 { | |
| 4669 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4670 |
| 24995 | 4671 if (face->prev) |
| 4672 face->prev->next = face->next; | |
| 4673 else | |
| 4674 c->buckets[i] = face->next; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4675 |
| 24995 | 4676 if (face->next) |
| 4677 face->next->prev = face->prev; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4678 |
| 24995 | 4679 c->faces_by_id[face->id] = NULL; |
| 4680 if (face->id == c->used) | |
| 4681 --c->used; | |
| 4682 } | |
| 4683 | |
| 4684 | |
| 4685 /* Look up a realized face with face attributes ATTR in the face cache | |
| 88907 | 4686 of frame F. The face will be used to display ASCII characters. |
| 4687 Value is the ID of the face found. If no suitable face is found, | |
| 4688 realize a new one. */ | |
| 24995 | 4689 |
| 4690 INLINE int | |
| 88907 | 4691 lookup_face (f, attr) |
| 24995 | 4692 struct frame *f; |
| 4693 Lisp_Object *attr; | |
| 4694 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4695 struct face_cache *cache = FRAME_FACE_CACHE (f); |
| 24995 | 4696 unsigned hash; |
| 4697 int i; | |
| 4698 struct face *face; | |
| 4699 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4700 xassert (cache != NULL); |
| 24995 | 4701 check_lface_attrs (attr); |
| 4702 | |
| 4703 /* Look up ATTR in the face cache. */ | |
| 4704 hash = lface_hash (attr); | |
| 4705 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4706 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4707 for (face = cache->buckets[i]; face; face = face->next) |
| 88907 | 4708 { |
| 4709 if (face->ascii_face != face) | |
| 4710 { | |
| 4711 /* There's no more ASCII face. */ | |
| 4712 face = NULL; | |
| 4713 break; | |
| 4714 } | |
| 4715 if (face->hash == hash | |
| 4716 && lface_equal_p (face->lface, attr)) | |
| 4717 break; | |
| 4718 } | |
| 24995 | 4719 |
| 4720 /* If not found, realize a new face. */ | |
| 4721 if (face == NULL) | |
| 88907 | 4722 face = realize_face (cache, attr, -1); |
| 24995 | 4723 |
| 4724 #if GLYPH_DEBUG | |
| 4725 xassert (face == FACE_FROM_ID (f, face->id)); | |
| 4726 #endif /* GLYPH_DEBUG */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4727 |
| 24995 | 4728 return face->id; |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4729 } |
| 24995 | 4730 |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4731 #ifdef HAVE_WINDOW_SYSTEM |
| 88907 | 4732 /* Look up a realized face that has the same attributes as BASE_FACE |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4733 except for the font in the face cache of frame F. If FONT-OBJECT |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4734 is not nil, it is an already opened font. If FONT-OBJECT is nil, |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4735 the face has no font. Value is the ID of the face found. If no |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4736 suitable face is found, realize a new one. */ |
| 24995 | 4737 |
| 4738 int | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4739 face_for_font (f, font_object, base_face) |
| 88907 | 4740 struct frame *f; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4741 Lisp_Object font_object; |
| 88907 | 4742 struct face *base_face; |
| 4743 { | |
| 4744 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
| 4745 unsigned hash; | |
| 4746 int i; | |
| 4747 struct face *face; | |
| 4748 | |
| 4749 xassert (cache != NULL); | |
| 4750 base_face = base_face->ascii_face; | |
| 4751 hash = lface_hash (base_face->lface); | |
| 4752 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
| 4753 | |
| 4754 for (face = cache->buckets[i]; face; face = face->next) | |
| 4755 { | |
| 4756 if (face->ascii_face == face) | |
| 4757 continue; | |
| 4758 if (face->ascii_face == base_face | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4759 && face->font == (NILP (font_object) ? NULL |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4760 : XFONT_OBJECT (font_object)) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4761 && lface_equal_p (face->lface, base_face->lface)) |
| 90414 | 4762 return face->id; |
| 4763 } | |
| 4764 | |
| 4765 /* If not found, realize a new face. */ | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4766 face = realize_non_ascii_face (f, font_object, base_face); |
| 90414 | 4767 return face->id; |
| 4768 } | |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4769 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4770 |
| 4771 /* Return the face id of the realized face for named face SYMBOL on | |
| 88907 | 4772 frame F suitable for displaying ASCII characters. Value is -1 if |
| 4773 the face couldn't be determined, which might happen if the default | |
| 4774 face isn't realized and cannot be realized. */ | |
| 24995 | 4775 |
| 4776 int | |
|
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
4777 lookup_named_face (f, symbol, signal_p) |
| 24995 | 4778 struct frame *f; |
| 4779 Lisp_Object symbol; | |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4780 int signal_p; |
| 24995 | 4781 { |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4782 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4783 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; |
| 24995 | 4784 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
| 4785 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4786 if (default_face == NULL) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4787 { |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4788 if (!realize_basic_faces (f)) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4789 return -1; |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4790 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
|
72170
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
4791 if (default_face == NULL) |
|
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
4792 abort (); /* realize_basic_faces must have set it up */ |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4793 } |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4794 |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4795 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p)) |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4796 return -1; |
|
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4797 |
| 24995 | 4798 bcopy (default_face->lface, attrs, sizeof attrs); |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4799 merge_face_vectors (f, symbol_attrs, attrs, 0); |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
4800 |
| 88907 | 4801 return lookup_face (f, attrs); |
| 24995 | 4802 } |
| 4803 | |
| 4804 | |
| 4805 /* Return the ID of the realized ASCII face of Lisp face with ID | |
| 4806 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
| 4807 | |
| 4808 int | |
| 4809 ascii_face_of_lisp_face (f, lface_id) | |
| 4810 struct frame *f; | |
| 4811 int lface_id; | |
| 4812 { | |
| 4813 int face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4814 |
| 24995 | 4815 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
| 4816 { | |
| 4817 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
|
4818 face_id = lookup_named_face (f, face_name, 1); |
| 24995 | 4819 } |
| 4820 else | |
| 4821 face_id = -1; | |
| 4822 | |
| 4823 return face_id; | |
| 4824 } | |
| 4825 | |
| 4826 | |
| 4827 /* Return a face for charset ASCII that is like the face with id | |
| 4828 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
| 4829 STEPS < 0 means larger. Value is the id of the face. */ | |
| 4830 | |
| 4831 int | |
| 4832 smaller_face (f, face_id, steps) | |
| 4833 struct frame *f; | |
| 4834 int face_id, steps; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4835 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4836 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4837 struct face *face; |
| 4838 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 4839 int pt, last_pt, last_height; | |
| 4840 int delta; | |
| 4841 int new_face_id; | |
| 4842 struct face *new_face; | |
| 4843 | |
| 4844 /* If not called for an X frame, just return the original face. */ | |
| 4845 if (FRAME_TERMCAP_P (f)) | |
| 4846 return face_id; | |
| 4847 | |
| 4848 /* Try in increments of 1/2 pt. */ | |
| 4849 delta = steps < 0 ? 5 : -5; | |
| 85262 | 4850 steps = eabs (steps); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4851 |
| 24995 | 4852 face = FACE_FROM_ID (f, face_id); |
| 4853 bcopy (face->lface, attrs, sizeof attrs); | |
| 4854 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
| 4855 new_face_id = face_id; | |
| 4856 last_height = FONT_HEIGHT (face->font); | |
| 4857 | |
| 4858 while (steps | |
| 4859 && pt + delta > 0 | |
| 4860 /* Give up if we cannot find a font within 10pt. */ | |
| 85262 | 4861 && eabs (last_pt - pt) < 100) |
| 24995 | 4862 { |
| 4863 /* Look up a face for a slightly smaller/larger font. */ | |
| 4864 pt += delta; | |
| 4865 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
| 88907 | 4866 new_face_id = lookup_face (f, attrs); |
| 24995 | 4867 new_face = FACE_FROM_ID (f, new_face_id); |
| 4868 | |
| 4869 /* 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
|
4870 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
|
4871 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
| 24995 | 4872 { |
| 4873 --steps; | |
| 4874 last_height = FONT_HEIGHT (new_face->font); | |
| 4875 last_pt = pt; | |
| 4876 } | |
| 4877 } | |
| 4878 | |
| 4879 return new_face_id; | |
| 4880 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4881 #else /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 4882 |
| 4883 return face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4884 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4885 #endif /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 4886 } |
| 4887 | |
| 4888 | |
| 4889 /* Return a face for charset ASCII that is like the face with id | |
| 4890 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
|
4891 |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
4892 int |
| 24995 | 4893 face_with_height (f, face_id, height) |
| 4894 struct frame *f; | |
| 4895 int face_id; | |
| 4896 int height; | |
| 4897 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4898 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4899 struct face *face; |
| 4900 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 4901 | |
| 4902 if (FRAME_TERMCAP_P (f) | |
| 4903 || height <= 0) | |
| 4904 return face_id; | |
| 4905 | |
| 4906 face = FACE_FROM_ID (f, face_id); | |
| 4907 bcopy (face->lface, attrs, sizeof attrs); | |
| 4908 attrs[LFACE_HEIGHT_INDEX] = make_number (height); | |
| 88907 | 4909 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
|
4910 #endif /* HAVE_WINDOW_SYSTEM */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4911 |
| 24995 | 4912 return face_id; |
| 4913 } | |
| 4914 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4915 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4916 /* Return the face id of the realized face for named face SYMBOL on |
| 88907 | 4917 frame F suitable for displaying ASCII characters, and use |
| 4918 attributes of the face FACE_ID for attributes that aren't | |
| 4919 completely specified by SYMBOL. This is like lookup_named_face, | |
| 4920 except that the default attributes come from FACE_ID, not from the | |
| 4921 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
|
4922 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4923 int |
|
90128
13796b0653c7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-29
Miles Bader <miles@gnu.org>
diff
changeset
|
4924 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
|
4925 struct frame *f; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4926 Lisp_Object symbol; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4927 int face_id; |
|
65713
ad24f42046b1
* xlwmenu.c (find_next_selectable):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
65347
diff
changeset
|
4928 int signal_p; |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4929 { |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4930 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
|
4931 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
|
4932 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
|
4933 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4934 if (!default_face) |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4935 abort (); |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4936 |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4937 get_lface_attributes (f, symbol, symbol_attrs, signal_p); |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4938 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
|
4939 merge_face_vectors (f, symbol_attrs, attrs, 0); |
| 88907 | 4940 return lookup_face (f, attrs); |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4941 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4942 |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4943 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
|
4944 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
|
4945 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
|
4946 (plist) |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4947 Lisp_Object plist; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4948 { |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4949 Lisp_Object lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4950 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
|
4951 Qunspecified); |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
4952 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
|
4953 1, 0); |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4954 return lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4955 } |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4956 |
| 24995 | 4957 |
| 4958 | |
| 4959 /*********************************************************************** | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4960 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
|
4961 ***********************************************************************/ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4962 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4963 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4964 /* 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
|
4965 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
|
4966 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
|
4967 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4968 #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
|
4969 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
4970 #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
|
4971 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4972 /* 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
|
4973 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
|
4974 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4975 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
|
4976 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
|
4977 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
|
4978 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4979 \(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
|
4980 \(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
|
4981 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4982 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
|
4983 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
|
4984 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
|
4985 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
|
4986 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
|
4987 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
4988 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
|
4989 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4990 /* 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
|
4991 face. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4992 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
|
4993 && 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
|
4994 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
|
4995 || (!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
|
4996 && 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
|
4997 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
|
4998 || (!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
|
4999 && 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
|
5000 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
|
5001 || (!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
|
5002 && 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
|
5003 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
|
5004 || (!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
|
5005 && 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
|
5006 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
|
5007 || (!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
|
5008 && 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
|
5009 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
|
5010 || (!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
|
5011 && 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
|
5012 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
|
5013 || (!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
|
5014 && 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
|
5015 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
|
5016 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5017 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5018 /* 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
|
5019 "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
|
5020 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5021 || !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
|
5022 || !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
|
5023 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5024 || !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
|
5025 { |
|
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5026 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
|
5027 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
|
5028 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
|
5029 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
|
5030 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5031 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
|
5032 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5033 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
|
5034 |
|
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5035 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
|
5036 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
|
5037 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5038 if (! face) |
|
63705
9e649a045c18
(x_supports_face_attributes_p): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
5039 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
|
5040 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5041 /* If the font is the same, then not supported. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5042 if (face->font == def_face->font) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5043 return 0; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5044 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
|
5045 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
|
5046 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5047 Lisp_Object s1, s2; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5048 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5049 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
|
5050 || face->font->driver->case_sensitive) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5051 return 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5052 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
|
5053 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
|
5054 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
|
5055 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
|
5056 return 1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5057 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5058 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
|
5059 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5060 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5061 /* 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
|
5062 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5063 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5064 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5065 #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
|
5066 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5067 /* 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
|
5068 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
|
5069 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5070 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
|
5071 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
|
5072 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
|
5073 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5074 \(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
|
5075 \(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
|
5076 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5077 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
|
5078 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
|
5079 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
|
5080 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
|
5081 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
|
5082 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5083 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
|
5084 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
|
5085 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
|
5086 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
|
5087 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
|
5088 { |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5089 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
|
5090 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
|
5091 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
|
5092 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
|
5093 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
|
5094 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
|
5095 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5096 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5097 /* 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
|
5098 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
|
5099 (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
|
5100 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
|
5101 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
|
5102 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
|
5103 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
|
5104 specifies. */ |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5105 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5106 || !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
|
5107 || !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
|
5108 || !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
|
5109 || !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
|
5110 || !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
|
5111 || !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
|
5112 || !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
|
5113 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5114 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5115 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5116 /* 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
|
5117 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5118 /* font weight (bold/dim) */ |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5119 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
|
5120 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
|
5121 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5122 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
|
5123 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5124 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
|
5125 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5126 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
|
5127 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
|
5128 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
|
5129 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5130 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
|
5131 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5132 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
|
5133 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
|
5134 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
|
5135 } |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5136 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
|
5137 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
|
5138 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5139 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5140 /* underlining */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5141 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
|
5142 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
|
5143 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 else |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5149 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
|
5150 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5151 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5152 /* inverse video */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5153 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
|
5154 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
|
5155 { |
|
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5156 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
|
5157 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
|
5158 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5159 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
|
5160 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5161 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5162 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5163 /* Color testing. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5164 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5165 /* 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
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5171 /* 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
|
5172 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
|
5173 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
|
5174 { |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5175 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
|
5176 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5177 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
|
5178 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
|
5179 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
|
5180 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
|
5181 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
|
5182 > 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
|
5183 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
|
5184 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5185 /* 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
|
5186 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5187 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
|
5188 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
|
5189 && (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
|
5190 <= 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
|
5191 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5192 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5193 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5194 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5195 /* 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
|
5196 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
|
5197 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
|
5198 { |
|
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5199 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
|
5200 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5201 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
|
5202 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
|
5203 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
|
5204 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
|
5205 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
|
5206 > 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
|
5207 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
|
5208 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5209 /* 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
|
5210 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5211 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
|
5212 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
|
5213 && (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
|
5214 <= 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
|
5215 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5216 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5217 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5218 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5219 /* 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
|
5220 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
|
5221 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
|
5222 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
|
5223 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
|
5224 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5225 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
|
5226 = (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
|
5227 - 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
|
5228 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
|
5229 || 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
|
5230 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5231 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5232 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5233 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5234 /* 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
|
5235 given colors. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5236 if (test_caps != 0 && |
| 83145 | 5237 ! 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
|
5238 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5239 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5240 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5241 /* 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
|
5242 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5243 } |
|
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 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
|
5247 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
|
5248 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
|
5249 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
|
5250 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
|
5251 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
|
5252 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5253 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
|
5254 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
|
5255 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
|
5256 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5257 \(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
|
5258 \(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
|
5259 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5260 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
|
5261 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
|
5262 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
|
5263 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
|
5264 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
|
5265 (attributes, display) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5266 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
|
5267 { |
|
74071
ea7f3c26d52b
(Fdisplay_supports_face_attributes_p): Initialize
Andreas Schwab <schwab@suse.de>
parents:
73509
diff
changeset
|
5268 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
|
5269 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
|
5270 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
|
5271 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
|
5272 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
|
5273 |
|
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5274 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
|
5275 /* 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
|
5276 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
|
5277 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
|
5278 return Qnil; |
|
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5279 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5280 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
|
5281 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
|
5282 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
|
5283 frame = display; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5284 else |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5285 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5286 /* 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
|
5287 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
|
5288 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5289 frame = Qnil; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5290 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
|
5291 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5292 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
|
5293 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
|
5294 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
|
5295 display))) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5296 break; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5297 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5298 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5299 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5300 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
|
5301 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
|
5302 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5303 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
|
5304 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
|
5305 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
|
5306 |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5307 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
|
5308 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
|
5309 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5310 if (! realize_basic_faces (f)) |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5311 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
|
5312 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
|
5313 if (def_face == NULL) |
|
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
5314 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
|
5315 } |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5316 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5317 /* 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
|
5318 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
|
5319 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
|
5320 #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
|
5321 else |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5322 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
|
5323 #endif |
|
55901
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 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
|
5326 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5327 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5328 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5329 /*********************************************************************** |
| 24995 | 5330 Font selection |
| 5331 ***********************************************************************/ | |
| 5332 | |
| 89483 | 5333 DEFUN ("internal-set-font-selection-order", |
| 24995 | 5334 Finternal_set_font_selection_order, |
| 5335 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
|
5336 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
|
5337 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
|
5338 `:height', `:weight', and `:slant'. Face attributes appearing |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5339 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
|
5340 `: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
|
5341 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
|
5342 Value is ORDER. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5343 (order) |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5344 Lisp_Object order; |
| 24995 | 5345 { |
| 5346 Lisp_Object list; | |
| 5347 int i; | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5348 int indices[DIM (font_sort_order)]; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5349 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5350 CHECK_LIST (order); |
| 24995 | 5351 bzero (indices, sizeof indices); |
| 5352 i = 0; | |
| 5353 | |
| 5354 for (list = order; | |
| 5355 CONSP (list) && i < DIM (indices); | |
| 5356 list = XCDR (list), ++i) | |
| 5357 { | |
| 5358 Lisp_Object attr = XCAR (list); | |
| 5359 int xlfd; | |
| 5360 | |
| 5361 if (EQ (attr, QCwidth)) | |
| 5362 xlfd = XLFD_SWIDTH; | |
| 5363 else if (EQ (attr, QCheight)) | |
| 5364 xlfd = XLFD_POINT_SIZE; | |
| 5365 else if (EQ (attr, QCweight)) | |
| 5366 xlfd = XLFD_WEIGHT; | |
| 5367 else if (EQ (attr, QCslant)) | |
| 5368 xlfd = XLFD_SLANT; | |
| 5369 else | |
| 5370 break; | |
| 5371 | |
| 5372 if (indices[i] != 0) | |
| 5373 break; | |
| 5374 indices[i] = xlfd; | |
| 5375 } | |
| 5376 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5377 if (!NILP (list) || i != DIM (indices)) |
| 24995 | 5378 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
|
5379 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
|
5380 if (indices[i] == 0) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5381 signal_error ("Invalid font sort order", order); |
| 24995 | 5382 |
| 5383 if (bcmp (indices, font_sort_order, sizeof indices) != 0) | |
| 5384 { | |
| 5385 bcopy (indices, font_sort_order, sizeof font_sort_order); | |
| 5386 free_all_realized_faces (Qnil); | |
| 5387 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5388 |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5389 font_update_sort_order (font_sort_order); |
| 90414 | 5390 |
| 24995 | 5391 return Qnil; |
| 5392 } | |
| 5393 | |
| 5394 | |
| 5395 DEFUN ("internal-set-alternative-font-family-alist", | |
| 5396 Finternal_set_alternative_font_family_alist, | |
| 5397 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
|
5398 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
|
5399 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5400 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
|
5401 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
|
5402 (alist) |
| 24995 | 5403 Lisp_Object alist; |
| 5404 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5405 CHECK_LIST (alist); |
| 24995 | 5406 Vface_alternative_font_family_alist = alist; |
| 5407 free_all_realized_faces (Qnil); | |
| 5408 return alist; | |
| 5409 } | |
| 5410 | |
| 5411 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5412 DEFUN ("internal-set-alternative-font-registry-alist", |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5413 Finternal_set_alternative_font_registry_alist, |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5414 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
|
5415 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
|
5416 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5417 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
|
5418 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
|
5419 (alist) |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5420 Lisp_Object alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5421 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5422 CHECK_LIST (alist); |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5423 Vface_alternative_font_registry_alist = alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5424 free_all_realized_faces (Qnil); |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5425 return alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5426 } |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5427 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5428 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5429 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 5430 |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5431 /* 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
|
5432 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5433 #define FONT_POINT_SIZE_QUANTUM 5 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5434 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5435 /* 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
|
5436 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
|
5437 attribute of ATTRS doesn't name a fontset. */ |
| 24995 | 5438 |
| 5439 static int | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5440 face_fontset (attrs) |
| 24995 | 5441 Lisp_Object *attrs; |
| 5442 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5443 Lisp_Object name; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5444 |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
5445 name = attrs[LFACE_FONTSET_INDEX]; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5446 if (!STRINGP (name)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5447 return -1; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5448 return fs_query_fontset (name, 0); |
| 24995 | 5449 } |
| 5450 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5451 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5452 |
| 5453 | |
| 5454 | |
| 5455 /*********************************************************************** | |
| 5456 Face Realization | |
| 5457 ***********************************************************************/ | |
| 5458 | |
| 5459 /* Realize basic faces on frame F. Value is zero if frame parameters | |
| 5460 of F don't contain enough information needed to realize the default | |
| 5461 face. */ | |
| 5462 | |
| 5463 static int | |
| 5464 realize_basic_faces (f) | |
| 2342 | 5465 struct frame *f; |
| 24995 | 5466 { |
| 5467 int success_p = 0; | |
|
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
5468 int count = SPECPDL_INDEX (); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5469 |
|
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
5470 /* 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
|
5471 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
|
5472 BLOCK_INPUT; |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5473 specbind (Qscalable_fonts_allowed, Qt); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5474 |
| 24995 | 5475 if (realize_default_face (f)) |
| 5476 { | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
5477 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
|
5478 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
|
5479 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
| 41129 | 5480 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
| 25546 | 5481 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
|
5482 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
|
5483 realize_named_face (f, Qborder, BORDER_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5484 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5485 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
|
5486 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
|
5487 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
|
5488 |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5489 /* 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
|
5490 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
|
5491 { |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5492 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
|
5493 #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
|
5494 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
|
5495 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
|
5496 #endif |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
5497 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5498 |
| 24995 | 5499 success_p = 1; |
| 5500 } | |
| 5501 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5502 unbind_to (count, Qnil); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5503 UNBLOCK_INPUT; |
| 24995 | 5504 return success_p; |
| 5505 } | |
| 5506 | |
| 5507 | |
| 5508 /* Realize the default face on frame F. If the face is not fully | |
| 5509 specified, make it fully-specified. Attributes of the default face | |
| 5510 that are not explicitly specified are taken from frame parameters. */ | |
| 5511 | |
| 5512 static int | |
| 5513 realize_default_face (f) | |
| 5514 struct frame *f; | |
| 5515 { | |
| 5516 struct face_cache *c = FRAME_FACE_CACHE (f); | |
| 5517 Lisp_Object lface; | |
| 5518 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 5519 struct face *face; | |
| 5520 | |
| 5521 /* If the `default' face is not yet known, create it. */ | |
| 5522 lface = lface_from_face_name (f, Qdefault, 0); | |
| 5523 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
|
5524 { |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5525 Lisp_Object frame; |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5526 XSETFRAME (frame, f); |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5527 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
|
5528 } |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5529 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5530 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5531 if (FRAME_WINDOW_P (f)) |
| 24995 | 5532 { |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5533 Lisp_Object font_object; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5534 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5535 XSETFONT (font_object, FRAME_FONT (f)); |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5536 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
|
5537 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
|
5538 f->default_face_done_p = 1; |
| 24995 | 5539 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5540 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5541 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5542 if (!FRAME_WINDOW_P (f)) |
| 24995 | 5543 { |
| 5544 LFACE_FAMILY (lface) = build_string ("default"); | |
| 5545 LFACE_SWIDTH (lface) = Qnormal; | |
| 5546 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
|
5547 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
|
5548 LFACE_WEIGHT (lface) = Qnormal; |
|
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
5549 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
|
5550 LFACE_SLANT (lface) = Qnormal; |
| 24995 | 5551 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5552 |
| 24995 | 5553 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
| 5554 LFACE_UNDERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5555 |
| 24995 | 5556 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
| 5557 LFACE_OVERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5558 |
| 24995 | 5559 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
| 5560 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5561 |
| 24995 | 5562 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
| 5563 LFACE_BOX (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5564 |
| 24995 | 5565 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
| 5566 LFACE_INVERSE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5567 |
| 24995 | 5568 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
| 5569 { | |
| 5570 /* This function is called so early that colors are not yet | |
| 5571 set in the frame parameter list. */ | |
| 5572 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
|
5573 |
| 24995 | 5574 if (CONSP (color) && STRINGP (XCDR (color))) |
| 5575 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
|
5576 else if (FRAME_WINDOW_P (f)) |
| 24995 | 5577 return 0; |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5578 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
|
5579 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
|
5580 else |
| 24995 | 5581 abort (); |
| 5582 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5583 |
| 24995 | 5584 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
| 5585 { | |
| 5586 /* This function is called so early that colors are not yet | |
| 5587 set in the frame parameter list. */ | |
| 5588 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
| 5589 if (CONSP (color) && STRINGP (XCDR (color))) | |
| 5590 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
|
5591 else if (FRAME_WINDOW_P (f)) |
| 24995 | 5592 return 0; |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5593 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
|
5594 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
|
5595 else |
| 24995 | 5596 abort (); |
| 5597 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5598 |
| 24995 | 5599 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
| 5600 LFACE_STIPPLE (lface) = Qnil; | |
| 5601 | |
| 5602 /* Realize the face; it must be fully-specified now. */ | |
| 5603 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
| 5604 check_lface (lface); | |
| 5605 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | |
| 88907 | 5606 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
|
5607 |
|
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5608 #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
|
5609 #ifdef HAVE_X_WINDOWS |
|
83519
717426715b03
Fix stupid crash during startup.
Karoly Lorentey <lorentey@elte.hu>
parents:
83518
diff
changeset
|
5610 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
|
5611 { |
|
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5612 /* 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
|
5613 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
|
5614 if (!face->font) |
|
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5615 return 0; |
|
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5616 |
|
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5617 /* 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
|
5618 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
|
5619 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
|
5620 font. */ |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5621 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
|
5622 } |
|
70566
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5623 #endif /* HAVE_X_WINDOWS */ |
|
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5624 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5625 return 1; |
| 5626 } | |
| 5627 | |
| 5628 | |
| 5629 /* Realize basic faces other than the default face in face cache C. | |
| 5630 SYMBOL is the face name, ID is the face id the realized face must | |
| 5631 have. The default face must have been realized already. */ | |
| 5632 | |
| 5633 static void | |
| 5634 realize_named_face (f, symbol, id) | |
| 5635 struct frame *f; | |
| 5636 Lisp_Object symbol; | |
| 5637 int id; | |
| 5638 { | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5639 struct face_cache *c = FRAME_FACE_CACHE (f); |
| 24995 | 5640 Lisp_Object lface = lface_from_face_name (f, symbol, 0); |
| 5641 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
|
5642 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
|
5643 struct face *new_face; |
| 24995 | 5644 |
| 5645 /* The default face must exist and be fully specified. */ | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5646 get_lface_attributes (f, Qdefault, attrs, 1); |
| 24995 | 5647 check_lface_attrs (attrs); |
| 5648 xassert (lface_fully_specified_p (attrs)); | |
| 5649 | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5650 /* If SYMBOL isn't know as a face, create it. */ |
| 24995 | 5651 if (NILP (lface)) |
| 5652 { | |
| 5653 Lisp_Object frame; | |
| 5654 XSETFRAME (frame, f); | |
| 5655 lface = Finternal_make_lisp_face (symbol, frame); | |
| 5656 } | |
| 5657 | |
| 5658 /* Merge SYMBOL's face with the default face. */ | |
|
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5659 get_lface_attributes (f, symbol, symbol_attrs, 1); |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5660 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
|
5661 |
|
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5662 /* 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
|
5663 new_face = realize_face (c, attrs, id); |
| 24995 | 5664 } |
| 5665 | |
| 5666 | |
| 5667 /* Realize the fully-specified face with attributes ATTRS in face | |
| 88907 | 5668 cache CACHE for ASCII characters. If FORMER_FACE_ID is |
| 5669 non-negative, it is an ID of face to remove before caching the new | |
| 5670 face. Value is a pointer to the newly created realized face. */ | |
| 24995 | 5671 |
| 5672 static struct face * | |
| 88907 | 5673 realize_face (cache, attrs, former_face_id) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5674 struct face_cache *cache; |
| 24995 | 5675 Lisp_Object *attrs; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5676 int former_face_id; |
| 24995 | 5677 { |
| 5678 struct face *face; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5679 |
| 24995 | 5680 /* LFACE must be fully specified. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5681 xassert (cache != NULL); |
| 24995 | 5682 check_lface_attrs (attrs); |
| 5683 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5684 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
|
5685 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5686 /* Remove the former face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5687 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
|
5688 uncache_face (cache, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5689 free_realized_face (cache->f, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5690 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5691 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5692 if (FRAME_WINDOW_P (cache->f)) |
| 88907 | 5693 face = realize_x_face (cache, attrs); |
| 35443 | 5694 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) |
| 88907 | 5695 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
|
5696 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
|
5697 { |
|
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5698 /* Create a dummy face. */ |
|
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5699 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
|
5700 } |
| 24995 | 5701 else |
| 5702 abort (); | |
| 5703 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5704 /* Insert the new face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5705 cache_face (cache, face, lface_hash (attrs)); |
| 88907 | 5706 return face; |
| 5707 } | |
| 5708 | |
| 5709 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5710 #ifdef HAVE_WINDOW_SYSTEM |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5711 /* 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
|
5712 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
|
5713 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
|
5714 no-font. */ |
| 88907 | 5715 |
| 5716 static struct face * | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5717 realize_non_ascii_face (f, font_object, base_face) |
| 88907 | 5718 struct frame *f; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5719 Lisp_Object font_object; |
| 88907 | 5720 struct face *base_face; |
| 5721 { | |
| 5722 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
| 89483 | 5723 struct face *face; |
| 88907 | 5724 |
| 5725 face = (struct face *) xmalloc (sizeof *face); | |
| 5726 *face = *base_face; | |
| 5727 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
|
5728 face->extra = NULL; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5729 face->overstrike |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5730 = (! NILP (font_object) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5731 && 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
|
5732 && FONT_WEIGHT_NUMERIC (font_object) <= 100); |
| 88907 | 5733 |
| 5734 /* Don't try to free the colors copied bitwise from BASE_FACE. */ | |
| 5735 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
|
5736 face->font = NILP (font_object) ? NULL : XFONT_OBJECT (font_object); |
| 88907 | 5737 face->gc = 0; |
| 5738 | |
| 5739 cache_face (cache, face, face->hash); | |
| 5740 | |
| 24995 | 5741 return face; |
| 5742 } | |
|
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
5743 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5744 |
| 5745 | |
| 5746 /* Realize the fully-specified face with attributes ATTRS in face | |
| 88907 | 5747 cache CACHE for ASCII characters. Do it for X frame CACHE->f. If |
| 5748 the new face doesn't share font with the default face, a fontname | |
| 5749 is allocated from the heap and set in `font_name' of the new face, | |
| 5750 but it is not yet loaded here. Value is a pointer to the newly | |
| 5751 created realized face. */ | |
| 24995 | 5752 |
| 5753 static struct face * | |
| 88907 | 5754 realize_x_face (cache, attrs) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5755 struct face_cache *cache; |
| 24995 | 5756 Lisp_Object *attrs; |
| 5757 { | |
|
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5758 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
|
5759 #ifdef HAVE_WINDOW_SYSTEM |
|
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5760 struct face *default_face; |
|
26875
d6aa11f2a4af
(choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents:
26759
diff
changeset
|
5761 struct frame *f; |
| 24995 | 5762 Lisp_Object stipple, overline, strike_through, box; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5763 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5764 xassert (FRAME_WINDOW_P (cache->f)); |
| 24995 | 5765 |
| 5766 /* Allocate a new realized face. */ | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5767 face = make_realized_face (attrs); |
| 88907 | 5768 face->ascii_face = face; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5769 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5770 f = cache->f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5771 |
| 24995 | 5772 /* Determine the font to use. Most of the time, the font will be |
| 5773 the same as the font of the default face, so try that first. */ | |
| 5774 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 5775 if (default_face | |
| 5776 && lface_same_font_attributes_p (default_face->lface, attrs)) | |
| 5777 { | |
| 5778 face->font = default_face->font; | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5779 face->fontset = make_fontset_for_ascii_face (f, -1, face); |
| 24995 | 5780 } |
| 5781 else | |
| 5782 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5783 /* 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
|
5784 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
|
5785 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
|
5786 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
|
5787 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
|
5788 are constructed from ATTRS. */ |
|
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
5789 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
|
5790 |
| 88907 | 5791 /* If we are realizing the default face, ATTRS should specify a |
| 5792 fontset. In other words, if FONTSET is -1, we are not | |
| 5793 realizing the default face, thus the default face should have | |
| 5794 already been realized. */ | |
| 5795 if (fontset == -1) | |
|
30211
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
5796 fontset = default_face->fontset; |
| 88907 | 5797 if (fontset == -1) |
| 5798 abort (); | |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5799 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
|
5800 attrs[LFACE_FONT_INDEX] |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5801 = 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
|
5802 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
|
5803 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5804 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
|
5805 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
|
5806 } |
| 90414 | 5807 else |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5808 { |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5809 face->font = NULL; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5810 face->fontset = -1; |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5811 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5812 } |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5813 |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5814 if (face->font |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5815 && 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
|
5816 && 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
|
5817 face->overstrike = 1; |
| 24995 | 5818 |
| 5819 /* Load colors, and set remaining attributes. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5820 |
| 24995 | 5821 load_face_colors (f, face, attrs); |
| 5822 | |
| 5823 /* Set up box. */ | |
| 5824 box = attrs[LFACE_BOX_INDEX]; | |
| 5825 if (STRINGP (box)) | |
| 5826 { | |
| 5827 /* A simple box of line width 1 drawn in color given by | |
| 5828 the string. */ | |
| 5829 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX], | |
| 5830 LFACE_BOX_INDEX); | |
| 5831 face->box = FACE_SIMPLE_BOX; | |
| 5832 face->box_line_width = 1; | |
| 5833 } | |
| 5834 else if (INTEGERP (box)) | |
| 5835 { | |
| 5836 /* Simple box of specified line width in foreground color of the | |
| 5837 face. */ | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5838 xassert (XINT (box) != 0); |
| 24995 | 5839 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
|
5840 face->box_line_width = XINT (box); |
| 24995 | 5841 face->box_color = face->foreground; |
| 5842 face->box_color_defaulted_p = 1; | |
| 5843 } | |
| 5844 else if (CONSP (box)) | |
| 5845 { | |
| 5846 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW | |
| 5847 being one of `raised' or `sunken'. */ | |
| 5848 face->box = FACE_SIMPLE_BOX; | |
| 5849 face->box_color = face->foreground; | |
| 5850 face->box_color_defaulted_p = 1; | |
| 5851 face->box_line_width = 1; | |
| 5852 | |
| 5853 while (CONSP (box)) | |
| 5854 { | |
| 5855 Lisp_Object keyword, value; | |
| 5856 | |
| 5857 keyword = XCAR (box); | |
| 5858 box = XCDR (box); | |
| 5859 | |
| 5860 if (!CONSP (box)) | |
| 5861 break; | |
| 5862 value = XCAR (box); | |
| 5863 box = XCDR (box); | |
| 5864 | |
| 5865 if (EQ (keyword, QCline_width)) | |
| 5866 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5867 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
|
5868 face->box_line_width = XINT (value); |
| 24995 | 5869 } |
| 5870 else if (EQ (keyword, QCcolor)) | |
| 5871 { | |
| 5872 if (STRINGP (value)) | |
| 5873 { | |
| 5874 face->box_color = load_color (f, face, value, | |
| 5875 LFACE_BOX_INDEX); | |
| 5876 face->use_box_color_for_shadows_p = 1; | |
| 5877 } | |
| 5878 } | |
| 5879 else if (EQ (keyword, QCstyle)) | |
| 5880 { | |
| 5881 if (EQ (value, Qreleased_button)) | |
| 5882 face->box = FACE_RAISED_BOX; | |
| 5883 else if (EQ (value, Qpressed_button)) | |
| 5884 face->box = FACE_SUNKEN_BOX; | |
| 5885 } | |
| 5886 } | |
| 5887 } | |
| 5888 | |
| 5889 /* Text underline, overline, strike-through. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5890 |
| 24995 | 5891 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt)) |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5892 { |
| 24995 | 5893 /* Use default color (same as foreground color). */ |
| 5894 face->underline_p = 1; | |
| 5895 face->underline_defaulted_p = 1; | |
| 5896 face->underline_color = 0; | |
| 5897 } | |
| 5898 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 5899 { | |
| 5900 /* Use specified color. */ | |
| 5901 face->underline_p = 1; | |
| 5902 face->underline_defaulted_p = 0; | |
| 5903 face->underline_color | |
| 5904 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX], | |
| 5905 LFACE_UNDERLINE_INDEX); | |
| 5906 } | |
| 5907 else if (NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 5908 { | |
| 5909 face->underline_p = 0; | |
| 5910 face->underline_defaulted_p = 0; | |
| 5911 face->underline_color = 0; | |
| 5912 } | |
| 5913 | |
| 5914 overline = attrs[LFACE_OVERLINE_INDEX]; | |
| 5915 if (STRINGP (overline)) | |
| 5916 { | |
| 5917 face->overline_color | |
| 5918 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX], | |
| 5919 LFACE_OVERLINE_INDEX); | |
| 5920 face->overline_p = 1; | |
| 5921 } | |
| 5922 else if (EQ (overline, Qt)) | |
| 5923 { | |
| 5924 face->overline_color = face->foreground; | |
| 5925 face->overline_color_defaulted_p = 1; | |
| 5926 face->overline_p = 1; | |
| 5927 } | |
| 5928 | |
| 5929 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX]; | |
| 5930 if (STRINGP (strike_through)) | |
| 5931 { | |
| 5932 face->strike_through_color | |
| 5933 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX], | |
| 5934 LFACE_STRIKE_THROUGH_INDEX); | |
| 5935 face->strike_through_p = 1; | |
| 5936 } | |
| 5937 else if (EQ (strike_through, Qt)) | |
| 5938 { | |
| 5939 face->strike_through_color = face->foreground; | |
| 5940 face->strike_through_color_defaulted_p = 1; | |
| 5941 face->strike_through_p = 1; | |
| 5942 } | |
| 5943 | |
| 5944 stipple = attrs[LFACE_STIPPLE_INDEX]; | |
| 5945 if (!NILP (stipple)) | |
| 5946 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
|
5947 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5948 |
| 5949 return face; | |
| 5950 } | |
| 5951 | |
| 5952 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5953 /* 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
|
5954 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
|
5955 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
|
5956 default foreground/background colors. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5957 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5958 static void |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5959 map_tty_color (f, face, idx, defaulted) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5960 struct frame *f; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5961 struct face *face; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5962 enum lface_attribute_index idx; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5963 int *defaulted; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5964 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5965 Lisp_Object frame, color, def; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5966 int foreground_p = idx == LFACE_FOREGROUND_INDEX; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5967 unsigned long default_pixel, default_other_pixel, pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5968 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5969 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
|
5970 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5971 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5972 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5973 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5974 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5975 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5976 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5977 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5978 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5979 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5980 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5981 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5982 XSETFRAME (frame, f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5983 color = face->lface[idx]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5984 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5985 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
|
5986 && SCHARS (color) |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5987 && CONSP (Vtty_defined_color_alist) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5988 && (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
|
5989 CONSP (def))) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5990 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5991 /* 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
|
5992 (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
|
5993 pixel = XINT (XCAR (XCDR (def))); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5994 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5995 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5996 if (pixel == default_pixel && STRINGP (color)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5997 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5998 pixel = load_color (f, face, color, idx); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5999 |
|
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6000 #ifdef MSDOS |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6001 /* 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
|
6002 use the foreground color defined by the frame. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6003 if (FRAME_MSDOS_P (f)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6004 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6005 if (pixel == default_pixel |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6006 || pixel == FACE_TTY_DEFAULT_COLOR) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6007 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6008 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6009 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6010 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6011 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6012 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6013 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6014 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6015 else if (pixel == default_other_pixel) |
|
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 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6018 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6019 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6020 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6021 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6022 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6023 } |
|
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6024 } |
|
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6025 #endif /* MSDOS */ |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6026 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6027 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6028 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6029 face->foreground = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6030 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6031 face->background = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6032 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6033 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6034 |
| 24995 | 6035 /* Realize the fully-specified face with attributes ATTRS in face |
| 88907 | 6036 cache CACHE for ASCII characters. Do it for TTY frame CACHE->f. |
| 6037 Value is a pointer to the newly created realized face. */ | |
| 24995 | 6038 |
| 6039 static struct face * | |
| 88907 | 6040 realize_tty_face (cache, attrs) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6041 struct face_cache *cache; |
| 24995 | 6042 Lisp_Object *attrs; |
| 6043 { | |
| 6044 struct face *face; | |
| 6045 int weight, slant; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6046 int face_colors_defaulted = 0; |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6047 struct frame *f = cache->f; |
| 24995 | 6048 |
| 6049 /* Frame must be a termcap frame. */ | |
| 35443 | 6050 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
|
6051 |
| 24995 | 6052 /* Allocate a new realized face. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6053 face = make_realized_face (attrs); |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6054 #if 0 |
| 35443 | 6055 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
|
6056 #endif |
| 24995 | 6057 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6058 /* Map face attributes to TTY appearances. We map slant to |
| 24995 | 6059 dimmed text because we want italic text to appear differently |
| 6060 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
|
6061 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
|
6062 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
|
6063 if (weight > 100) |
| 24995 | 6064 face->tty_bold_p = 1; |
|
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6065 if (weight < 100 || slant != 100) |
| 24995 | 6066 face->tty_dim_p = 1; |
| 6067 if (!NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 6068 face->tty_underline_p = 1; | |
| 6069 if (!NILP (attrs[LFACE_INVERSE_INDEX])) | |
| 6070 face->tty_reverse_p = 1; | |
| 6071 | |
| 6072 /* Map color names to color indices. */ | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6073 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
|
6074 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
|
6075 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6076 /* 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
|
6077 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
|
6078 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
|
6079 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
|
6080 { |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6081 unsigned long tem = face->foreground; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6082 face->foreground = face->background; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6083 face->background = tem; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6084 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6085 |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6086 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
|
6087 && face->tty_bold_p |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6088 && 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
|
6089 && 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
|
6090 face->tty_bold_p = 0; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6091 |
| 24995 | 6092 return face; |
| 6093 } | |
| 6094 | |
| 6095 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6096 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
|
6097 Ftty_suppress_bold_inverse_default_colors, |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6098 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
|
6099 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
|
6100 SUPPRESS non-nil means suppress it. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6101 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
|
6102 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
|
6103 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
|
6104 is non-nil. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6105 (suppress) |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6106 Lisp_Object suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6107 { |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6108 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
|
6109 ++face_change_count; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6110 return suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6111 } |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6112 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6113 |
| 24995 | 6114 |
| 6115 /*********************************************************************** | |
| 6116 Computing Faces | |
| 6117 ***********************************************************************/ | |
| 6118 | |
| 6119 /* Return the ID of the face to use to display character CH with face | |
| 6120 property PROP on frame F in current_buffer. */ | |
| 6121 | |
| 6122 int | |
| 6123 compute_char_face (f, ch, prop) | |
| 6124 struct frame *f; | |
| 6125 int ch; | |
| 6126 Lisp_Object prop; | |
| 6127 { | |
| 6128 int face_id; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6129 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6130 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
|
6131 ch = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6132 |
| 24995 | 6133 if (NILP (prop)) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6134 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6135 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
|
6136 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
|
6137 } |
| 24995 | 6138 else |
| 6139 { | |
| 6140 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6141 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 6142 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
|
6143 merge_face_ref (f, prop, attrs, 1, 0); |
| 88907 | 6144 face_id = lookup_face (f, attrs); |
| 24995 | 6145 } |
| 6146 | |
| 6147 return face_id; | |
| 6148 } | |
| 6149 | |
| 6150 /* Return the face ID associated with buffer position POS for | |
| 6151 displaying ASCII characters. Return in *ENDPTR the position at | |
| 6152 which a different face is needed, as far as text properties and | |
| 6153 overlays are concerned. W is a window displaying current_buffer. | |
| 6154 | |
| 6155 REGION_BEG, REGION_END delimit the region, so it can be | |
| 6156 highlighted. | |
| 6157 | |
| 6158 LIMIT is a position not to scan beyond. That is to limit the time | |
| 6159 this function can take. | |
| 6160 | |
| 6161 If MOUSE is non-zero, use the character's mouse-face, not its face. | |
| 6162 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6163 The face returned is suitable for displaying ASCII characters. */ |
| 24995 | 6164 |
| 6165 int | |
| 6166 face_at_buffer_position (w, pos, region_beg, region_end, | |
| 6167 endptr, limit, mouse) | |
| 2391 | 6168 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
|
6169 EMACS_INT pos; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6170 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
|
6171 EMACS_INT *endptr; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6172 EMACS_INT limit; |
|
6615
96ddf85642d1
(compute_char_face): New arg MOUSE.
Richard M. Stallman <rms@gnu.org>
parents:
5858
diff
changeset
|
6173 int mouse; |
| 2342 | 6174 { |
| 24995 | 6175 struct frame *f = XFRAME (w->frame); |
| 6176 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
|
6177 Lisp_Object prop, position; |
| 24995 | 6178 int i, noverlays; |
| 2342 | 6179 Lisp_Object *overlay_vec; |
| 2391 | 6180 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
|
6181 EMACS_INT endpos; |
| 24995 | 6182 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
| 6183 Lisp_Object limit1, end; | |
| 6184 struct face *default_face; | |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6185 |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6186 /* 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
|
6187 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
|
6188 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
| 2391 | 6189 |
|
9284
a969e0eefaf5
(compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9186
diff
changeset
|
6190 XSETFRAME (frame, f); |
| 24995 | 6191 XSETFASTINT (position, pos); |
| 2342 | 6192 |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6193 endpos = ZV; |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6194 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
|
6195 endpos = region_beg; |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6196 |
| 24995 | 6197 /* Get the `face' or `mouse_face' text property at POS, and |
| 6198 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
|
6199 prop = Fget_text_property (position, propname, w->buffer); |
| 24995 | 6200 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
| 6201 end = Fnext_single_property_change (position, propname, w->buffer, limit1); | |
| 6202 if (INTEGERP (end)) | |
| 6203 endpos = XINT (end); | |
| 6204 | |
| 6205 /* 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
|
6206 { |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
6207 EMACS_INT next_overlay; |
|
55654
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6208 |
|
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6209 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
|
6210 if (next_overlay < endpos) |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6211 endpos = next_overlay; |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6212 } |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6213 |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6214 *endptr = endpos; |
| 2342 | 6215 |
| 24995 | 6216 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6217 |
| 24995 | 6218 /* Optimize common cases where we can use the default face. */ |
| 6219 if (noverlays == 0 | |
| 6220 && NILP (prop) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6221 && !(pos >= region_beg && pos < region_end)) |
| 24995 | 6222 return DEFAULT_FACE_ID; |
| 6223 | |
| 6224 /* Begin with attributes from the default face. */ | |
| 6225 bcopy (default_face->lface, attrs, sizeof attrs); | |
| 6226 | |
| 6227 /* Merge in attributes specified via text properties. */ | |
| 6228 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
|
6229 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 6230 |
| 6231 /* 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
|
6232 noverlays = sort_overlays (overlay_vec, noverlays, w); |
| 2342 | 6233 for (i = 0; i < noverlays; i++) |
| 6234 { | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6235 Lisp_Object oend; |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6236 int oendpos; |
|
9186
45bac5feb065
(compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents:
9184
diff
changeset
|
6237 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6238 prop = Foverlay_get (overlay_vec[i], propname); |
| 24995 | 6239 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
|
6240 merge_face_ref (f, prop, attrs, 1, 0); |
| 2342 | 6241 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6242 oend = OVERLAY_END (overlay_vec[i]); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6243 oendpos = OVERLAY_POSITION (oend); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6244 if (oendpos < endpos) |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6245 endpos = oendpos; |
| 2342 | 6246 } |
| 6247 | |
| 24995 | 6248 /* 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
|
6249 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
|
6250 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
6251 merge_named_face (f, Qregion, attrs, 0); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6252 |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6253 if (region_end < endpos) |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6254 endpos = region_end; |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6255 } |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6256 |
| 2342 | 6257 *endptr = endpos; |
| 6258 | |
| 24995 | 6259 /* 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
|
6260 or realize a new one for ASCII characters. */ |
| 88907 | 6261 return lookup_face (f, attrs); |
| 2342 | 6262 } |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6263 |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6264 /* 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
|
6265 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
|
6266 |
|
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6267 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
|
6268 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
|
6269 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6270 int |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6271 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
|
6272 endptr, limit, mouse, overlay) |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6273 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
|
6274 EMACS_INT pos; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6275 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
|
6276 EMACS_INT *endptr; |
|
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6277 EMACS_INT limit; |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6278 int mouse; |
|
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6279 Lisp_Object overlay; |
|
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6280 { |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6281 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
|
6282 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
|
6283 Lisp_Object prop, position; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6284 Lisp_Object frame; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6285 int endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6286 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
|
6287 Lisp_Object limit1, end; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6288 struct face *default_face; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6289 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6290 /* 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
|
6291 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
|
6292 /* 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
|
6293 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6294 XSETFRAME (frame, f); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6295 XSETFASTINT (position, pos); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6296 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6297 endpos = ZV; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6298 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
|
6299 endpos = region_beg; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6300 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6301 /* 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
|
6302 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
|
6303 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
|
6304 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
|
6305 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
|
6306 if (INTEGERP (end)) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6307 endpos = XINT (end); |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6308 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6309 *endptr = endpos; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6310 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6311 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
|
6312 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6313 /* 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
|
6314 if (NILP (prop) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6315 && !(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
|
6316 return DEFAULT_FACE_ID; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6317 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6318 /* 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
|
6319 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
|
6320 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6321 /* 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
|
6322 if (!NILP (prop)) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6323 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
|
6324 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6325 /* 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
|
6326 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
|
6327 { |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6328 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
|
6329 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6330 if (region_end < endpos) |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6331 endpos = region_end; |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6332 } |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6333 |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6334 *endptr = endpos; |
|
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 /* 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
|
6337 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
|
6338 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
|
6339 } |
|
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6340 |
| 24995 | 6341 |
| 6342 /* 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
|
6343 window W, for ASCII characters. |
| 24995 | 6344 |
| 6345 If STRING is an overlay string, it comes from position BUFPOS in | |
| 6346 current_buffer, otherwise BUFPOS is zero to indicate that STRING is | |
| 6347 not an overlay string. W must display the current buffer. | |
| 6348 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
|
6349 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
|
6350 |
|
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
6351 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
|
6352 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
|
6353 |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6354 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
|
6355 |
| 24995 | 6356 Set *ENDPTR to the next position where to check for faces in |
| 6357 STRING; -1 if the face is constant from POS to the end of the | |
| 6358 string. | |
| 6359 | |
| 6360 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
|
6361 for displaying ASCII characters. */ |
| 24995 | 6362 |
| 6363 int | |
| 6364 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
|
6365 region_end, endptr, base_face_id, mouse_p) |
| 24995 | 6366 struct window *w; |
| 6367 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
|
6368 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
|
6369 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
|
6370 EMACS_INT *endptr; |
| 24995 | 6371 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
|
6372 int mouse_p; |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6373 { |
| 24995 | 6374 Lisp_Object prop, position, end, limit; |
| 6375 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
| 6376 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6377 struct face *base_face; | |
| 6378 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
|
6379 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface; |
| 24995 | 6380 |
| 6381 /* Get the value of the face property at the current position within | |
| 6382 STRING. Value is nil if there is no face property. */ | |
| 6383 XSETFASTINT (position, pos); | |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6384 prop = Fget_text_property (position, prop_name, string); |
| 24995 | 6385 |
| 6386 /* Get the next position at which to check for faces. Value of end | |
| 6387 is nil if face is constant all the way to the end of the string. | |
| 6388 Otherwise it is a string position where to check faces next. | |
| 6389 Limit is the maximum position up to which to check for property | |
| 6390 changes in Fnext_single_property_change. Strings are usually | |
| 6391 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
|
6392 XSETFASTINT (limit, SCHARS (string)); |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6393 end = Fnext_single_property_change (position, prop_name, string, limit); |
| 24995 | 6394 if (INTEGERP (end)) |
| 6395 *endptr = XFASTINT (end); | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6396 else |
| 24995 | 6397 *endptr = -1; |
| 6398 | |
| 6399 base_face = FACE_FROM_ID (f, base_face_id); | |
| 6400 xassert (base_face); | |
| 6401 | |
| 6402 /* Optimize the default case that there is no face property and we | |
| 6403 are not in the region. */ | |
| 6404 if (NILP (prop) | |
| 6405 && (base_face_id != DEFAULT_FACE_ID | |
| 6406 /* BUFPOS <= 0 means STRING is not an overlay string, so | |
| 6407 that the region doesn't have to be taken into account. */ | |
| 6408 || bufpos <= 0 | |
| 6409 || bufpos < region_beg | |
| 6410 || bufpos >= region_end) | |
| 6411 && (multibyte_p | |
| 6412 /* We can't realize faces for different charsets differently | |
| 6413 if we don't have fonts, so we can stop here if not working | |
| 6414 on a window-system frame. */ | |
| 6415 || !FRAME_WINDOW_P (f) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6416 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0))) |
| 24995 | 6417 return base_face->id; |
| 6418 | |
| 6419 /* Begin with attributes from the base face. */ | |
| 6420 bcopy (base_face->lface, attrs, sizeof attrs); | |
| 6421 | |
| 6422 /* Merge in attributes specified via text properties. */ | |
| 6423 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
|
6424 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 6425 |
| 6426 /* If in the region, merge in the region face. */ | |
| 6427 if (bufpos | |
| 6428 && bufpos >= region_beg | |
| 6429 && 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
|
6430 merge_named_face (f, Qregion, attrs, 0); |
| 24995 | 6431 |
| 6432 /* 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
|
6433 or realize a new one for ASCII characters. */ |
| 88907 | 6434 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
|
6435 } |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6436 |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6437 |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6438 /* 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
|
6439 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6440 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
|
6441 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6442 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
|
6443 |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6444 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
|
6445 |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6446 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
|
6447 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6448 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
|
6449 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6450 Return new face id. |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6451 */ |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6452 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6453 int |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6454 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
|
6455 struct frame *f; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6456 Lisp_Object face_name; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6457 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
|
6458 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6459 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
|
6460 struct face *base_face; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6461 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6462 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
|
6463 if (!base_face) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6464 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6465 |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6466 if (EQ (face_name, Qt)) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6467 { |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6468 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
|
6469 return base_face_id; |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6470 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
|
6471 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
|
6472 if (face_id >= 0) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6473 return face_id; |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6474 return base_face_id; |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6475 } |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6476 |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6477 /* 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
|
6478 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
|
6479 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6480 if (!NILP (face_name)) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6481 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6482 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
|
6483 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6484 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6485 else |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6486 { |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6487 struct face *face; |
|
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6488 if (face_id < 0) |
|
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6489 return base_face_id; |
|
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6490 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
|
6491 if (!face) |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6492 return base_face_id; |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6493 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
|
6494 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6495 |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6496 /* 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
|
6497 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
|
6498 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
|
6499 } |
|
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6500 |
| 2336 | 6501 |
| 24995 | 6502 /*********************************************************************** |
| 6503 Tests | |
| 6504 ***********************************************************************/ | |
| 6505 | |
| 6506 #if GLYPH_DEBUG | |
| 6507 | |
| 6508 /* Print the contents of the realized face FACE to stderr. */ | |
| 6509 | |
| 6510 static void | |
| 6511 dump_realized_face (face) | |
| 6512 struct face *face; | |
| 2336 | 6513 { |
| 24995 | 6514 fprintf (stderr, "ID: %d\n", face->id); |
| 6515 #ifdef HAVE_X_WINDOWS | |
|
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
6516 fprintf (stderr, "gc: %ld\n", (long) face->gc); |
| 24995 | 6517 #endif |
| 6518 fprintf (stderr, "foreground: 0x%lx (%s)\n", | |
| 6519 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
|
6520 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
| 24995 | 6521 fprintf (stderr, "background: 0x%lx (%s)\n", |
| 6522 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
|
6523 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
|
6524 if (face->font) |
|
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6525 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
|
6526 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
|
6527 SDATA (face->lface[LFACE_FAMILY_INDEX])); |
| 24995 | 6528 #ifdef HAVE_X_WINDOWS |
| 6529 fprintf (stderr, "font = %p\n", face->font); | |
| 6530 #endif | |
| 6531 fprintf (stderr, "fontset: %d\n", face->fontset); | |
| 6532 fprintf (stderr, "underline: %d (%s)\n", | |
| 6533 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
|
6534 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))); |
| 24995 | 6535 fprintf (stderr, "hash: %d\n", face->hash); |
| 6536 } | |
| 6537 | |
| 6538 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6539 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
|
6540 (n) |
| 24995 | 6541 Lisp_Object n; |
| 6542 { | |
| 6543 if (NILP (n)) | |
| 2336 | 6544 { |
| 24995 | 6545 int i; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6546 |
| 24995 | 6547 fprintf (stderr, "font selection order: "); |
| 6548 for (i = 0; i < DIM (font_sort_order); ++i) | |
| 6549 fprintf (stderr, "%d ", font_sort_order[i]); | |
| 6550 fprintf (stderr, "\n"); | |
| 6551 | |
| 6552 fprintf (stderr, "alternative fonts: "); | |
| 6553 debug_print (Vface_alternative_font_family_alist); | |
| 6554 fprintf (stderr, "\n"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6555 |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6556 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i) |
| 24995 | 6557 Fdump_face (make_number (i)); |
| 2336 | 6558 } |
| 24995 | 6559 else |
| 6560 { | |
| 6561 struct face *face; | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6562 CHECK_NUMBER (n); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6563 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n)); |
| 24995 | 6564 if (face == NULL) |
| 6565 error ("Not a valid face"); | |
| 6566 dump_realized_face (face); | |
| 6567 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6568 |
| 2336 | 6569 return Qnil; |
| 6570 } | |
| 6571 | |
| 6572 | |
| 24995 | 6573 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
|
6574 0, 0, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6575 () |
| 2336 | 6576 { |
| 24995 | 6577 fprintf (stderr, "number of colors = %d\n", ncolors_allocated); |
| 6578 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated); | |
| 6579 fprintf (stderr, "number of GCs = %d\n", ngcs); | |
| 2336 | 6580 return Qnil; |
| 6581 } | |
| 24995 | 6582 |
| 6583 #endif /* GLYPH_DEBUG != 0 */ | |
| 6584 | |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6585 |
|
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6586 |
| 24995 | 6587 /*********************************************************************** |
| 6588 Initialization | |
| 6589 ***********************************************************************/ | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
6590 |
| 2336 | 6591 void |
| 2391 | 6592 syms_of_xfaces () |
| 2336 | 6593 { |
| 2391 | 6594 Qface = intern ("face"); |
| 6595 staticpro (&Qface); | |
| 57107 | 6596 Qface_no_inherit = intern ("face-no-inherit"); |
| 6597 staticpro (&Qface_no_inherit); | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6598 Qbitmap_spec_p = intern ("bitmap-spec-p"); |
|
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6599 staticpro (&Qbitmap_spec_p); |
|
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
6600 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
|
6601 staticpro (&Qframe_set_background_mode); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6602 |
| 24995 | 6603 /* Lisp face attribute keywords. */ |
| 6604 QCfamily = intern (":family"); | |
| 6605 staticpro (&QCfamily); | |
| 6606 QCheight = intern (":height"); | |
| 6607 staticpro (&QCheight); | |
| 6608 QCweight = intern (":weight"); | |
| 6609 staticpro (&QCweight); | |
| 6610 QCslant = intern (":slant"); | |
| 6611 staticpro (&QCslant); | |
| 6612 QCunderline = intern (":underline"); | |
| 6613 staticpro (&QCunderline); | |
| 6614 QCinverse_video = intern (":inverse-video"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6615 staticpro (&QCinverse_video); |
| 24995 | 6616 QCreverse_video = intern (":reverse-video"); |
| 6617 staticpro (&QCreverse_video); | |
| 6618 QCforeground = intern (":foreground"); | |
| 6619 staticpro (&QCforeground); | |
| 6620 QCbackground = intern (":background"); | |
| 6621 staticpro (&QCbackground); | |
|
77903
9a64509cb354
(syms_of_xfaces): Delete stray semicolon.
Chong Yidong <cyd@stupidchicken.com>
parents:
75885
diff
changeset
|
6622 QCstipple = intern (":stipple"); |
| 24995 | 6623 staticpro (&QCstipple); |
| 6624 QCwidth = intern (":width"); | |
| 6625 staticpro (&QCwidth); | |
| 6626 QCfont = intern (":font"); | |
| 6627 staticpro (&QCfont); | |
|
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6628 QCfontset = intern (":fontset"); |
|
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6629 staticpro (&QCfontset); |
| 24995 | 6630 QCbold = intern (":bold"); |
| 6631 staticpro (&QCbold); | |
| 6632 QCitalic = intern (":italic"); | |
| 6633 staticpro (&QCitalic); | |
| 6634 QCoverline = intern (":overline"); | |
| 6635 staticpro (&QCoverline); | |
| 6636 QCstrike_through = intern (":strike-through"); | |
| 6637 staticpro (&QCstrike_through); | |
| 6638 QCbox = intern (":box"); | |
| 6639 staticpro (&QCbox); | |
| 31178 | 6640 QCinherit = intern (":inherit"); |
| 6641 staticpro (&QCinherit); | |
| 24995 | 6642 |
| 6643 /* Symbols used for Lisp face attribute values. */ | |
| 6644 QCcolor = intern (":color"); | |
| 6645 staticpro (&QCcolor); | |
| 6646 QCline_width = intern (":line-width"); | |
| 6647 staticpro (&QCline_width); | |
| 6648 QCstyle = intern (":style"); | |
| 6649 staticpro (&QCstyle); | |
| 6650 Qreleased_button = intern ("released-button"); | |
| 6651 staticpro (&Qreleased_button); | |
| 6652 Qpressed_button = intern ("pressed-button"); | |
| 6653 staticpro (&Qpressed_button); | |
| 6654 Qnormal = intern ("normal"); | |
| 6655 staticpro (&Qnormal); | |
| 6656 Qultra_light = intern ("ultra-light"); | |
| 6657 staticpro (&Qultra_light); | |
| 6658 Qextra_light = intern ("extra-light"); | |
| 6659 staticpro (&Qextra_light); | |
| 6660 Qlight = intern ("light"); | |
| 6661 staticpro (&Qlight); | |
| 6662 Qsemi_light = intern ("semi-light"); | |
| 6663 staticpro (&Qsemi_light); | |
| 6664 Qsemi_bold = intern ("semi-bold"); | |
| 6665 staticpro (&Qsemi_bold); | |
| 6666 Qbold = intern ("bold"); | |
| 6667 staticpro (&Qbold); | |
| 6668 Qextra_bold = intern ("extra-bold"); | |
| 6669 staticpro (&Qextra_bold); | |
| 6670 Qultra_bold = intern ("ultra-bold"); | |
| 6671 staticpro (&Qultra_bold); | |
| 6672 Qoblique = intern ("oblique"); | |
| 6673 staticpro (&Qoblique); | |
| 6674 Qitalic = intern ("italic"); | |
| 6675 staticpro (&Qitalic); | |
| 6676 Qreverse_oblique = intern ("reverse-oblique"); | |
| 6677 staticpro (&Qreverse_oblique); | |
| 6678 Qreverse_italic = intern ("reverse-italic"); | |
| 6679 staticpro (&Qreverse_italic); | |
| 6680 Qultra_condensed = intern ("ultra-condensed"); | |
| 6681 staticpro (&Qultra_condensed); | |
| 6682 Qextra_condensed = intern ("extra-condensed"); | |
| 6683 staticpro (&Qextra_condensed); | |
| 6684 Qcondensed = intern ("condensed"); | |
| 6685 staticpro (&Qcondensed); | |
| 6686 Qsemi_condensed = intern ("semi-condensed"); | |
| 6687 staticpro (&Qsemi_condensed); | |
| 6688 Qsemi_expanded = intern ("semi-expanded"); | |
| 6689 staticpro (&Qsemi_expanded); | |
| 6690 Qexpanded = intern ("expanded"); | |
| 6691 staticpro (&Qexpanded); | |
| 6692 Qextra_expanded = intern ("extra-expanded"); | |
| 6693 staticpro (&Qextra_expanded); | |
| 6694 Qultra_expanded = intern ("ultra-expanded"); | |
| 6695 staticpro (&Qultra_expanded); | |
| 6696 Qbackground_color = intern ("background-color"); | |
| 6697 staticpro (&Qbackground_color); | |
| 6698 Qforeground_color = intern ("foreground-color"); | |
| 6699 staticpro (&Qforeground_color); | |
| 6700 Qunspecified = intern ("unspecified"); | |
| 6701 staticpro (&Qunspecified); | |
|
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6702 Qignore_defface = intern (":ignore-defface"); |
|
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6703 staticpro (&Qignore_defface); |
| 24995 | 6704 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6705 Qface_alias = intern ("face-alias"); |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6706 staticpro (&Qface_alias); |
| 24995 | 6707 Qdefault = intern ("default"); |
| 6708 staticpro (&Qdefault); | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
6709 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
|
6710 staticpro (&Qtool_bar); |
| 24995 | 6711 Qregion = intern ("region"); |
| 6712 staticpro (&Qregion); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6713 Qfringe = intern ("fringe"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6714 staticpro (&Qfringe); |
| 25546 | 6715 Qheader_line = intern ("header-line"); |
| 6716 staticpro (&Qheader_line); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6717 Qscroll_bar = intern ("scroll-bar"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6718 staticpro (&Qscroll_bar); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6719 Qmenu = intern ("menu"); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6720 staticpro (&Qmenu); |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6721 Qcursor = intern ("cursor"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6722 staticpro (&Qcursor); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6723 Qborder = intern ("border"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6724 staticpro (&Qborder); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6725 Qmouse = intern ("mouse"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6726 staticpro (&Qmouse); |
|
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
6727 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
|
6728 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
|
6729 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
|
6730 staticpro (&Qvertical_border); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6731 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
|
6732 staticpro (&Qtty_color_desc); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6733 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
|
6734 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
|
6735 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
|
6736 staticpro (&Qtty_color_by_index); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6737 Qtty_color_alist = intern ("tty-color-alist"); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6738 staticpro (&Qtty_color_alist); |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6739 Qscalable_fonts_allowed = intern ("scalable-fonts-allowed"); |
|
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6740 staticpro (&Qscalable_fonts_allowed); |
| 24995 | 6741 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6742 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil); |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6743 staticpro (&Vparam_value_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6744 Vface_alternative_font_family_alist = Qnil; |
|
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6745 staticpro (&Vface_alternative_font_family_alist); |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6746 Vface_alternative_font_registry_alist = Qnil; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6747 staticpro (&Vface_alternative_font_registry_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6748 |
| 24995 | 6749 defsubr (&Sinternal_make_lisp_face); |
| 6750 defsubr (&Sinternal_lisp_face_p); | |
| 6751 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
|
6752 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 6753 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
|
6754 #endif |
|
27120
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6755 defsubr (&Scolor_gray_p); |
|
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6756 defsubr (&Scolor_supported_p); |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6757 defsubr (&Sface_attribute_relative_p); |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6758 defsubr (&Smerge_face_attribute); |
| 24995 | 6759 defsubr (&Sinternal_get_lisp_face_attribute); |
| 6760 defsubr (&Sinternal_lisp_face_attribute_values); | |
| 6761 defsubr (&Sinternal_lisp_face_equal_p); | |
| 6762 defsubr (&Sinternal_lisp_face_empty_p); | |
| 6763 defsubr (&Sinternal_copy_lisp_face); | |
| 6764 defsubr (&Sinternal_merge_in_global_face); | |
| 6765 defsubr (&Sface_font); | |
| 6766 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
|
6767 defsubr (&Sdisplay_supports_face_attributes_p); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6768 defsubr (&Scolor_distance); |
| 24995 | 6769 defsubr (&Sinternal_set_font_selection_order); |
| 6770 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
|
6771 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
|
6772 defsubr (&Sface_attributes_as_vector); |
| 24995 | 6773 #if GLYPH_DEBUG |
| 6774 defsubr (&Sdump_face); | |
| 6775 defsubr (&Sshow_face_resources); | |
| 6776 #endif /* GLYPH_DEBUG */ | |
| 6777 defsubr (&Sclear_face_cache); | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6778 defsubr (&Stty_suppress_bold_inverse_default_colors); |
| 24995 | 6779 |
|
29711
913fab478495
(syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents:
29599
diff
changeset
|
6780 #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
|
6781 defsubr (&Sdump_colors); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6782 #endif |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6783 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6784 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
|
6785 doc: /* *Limit for font matching. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6786 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
|
6787 that number of fonts when searching for a matching font. */); |
| 25270 | 6788 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
| 6789 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6790 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
|
6791 doc: /* List of global face definitions (for internal use only.) */); |
| 24995 | 6792 Vface_new_frame_defaults = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6793 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6794 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
|
6795 doc: /* *Default stipple pattern used on monochrome displays. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6796 This stipple pattern is used on monochrome displays |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6797 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
|
6798 See `set-face-stipple' for possible values for this variable. */); |
| 24995 | 6799 Vface_default_stipple = build_string ("gray3"); |
| 6800 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6801 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
|
6802 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
|
6803 Vtty_defined_color_alist = Qnil; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6804 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6805 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
|
6806 doc: /* Allowed scalable fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6807 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
|
6808 A value of t means allow any scalable font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6809 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
|
6810 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
|
6811 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
|
6812 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
|
6813 Vscalable_fonts_allowed = Qnil; |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6814 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6815 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
|
6816 doc: /* List of ignored fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6817 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
|
6818 ignore. */); |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6819 Vface_ignored_fonts = Qnil; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6820 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6821 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
|
6822 doc: /* Alist of fonts vs the rescaling factors. |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6823 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
|
6824 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
|
6825 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
|
6826 \(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
|
6827 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
|
6828 Vface_font_rescale_alist = Qnil; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6829 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6830 #ifdef HAVE_WINDOW_SYSTEM |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6831 defsubr (&Sbitmap_spec_p); |
| 24995 | 6832 defsubr (&Sx_list_fonts); |
| 6833 defsubr (&Sinternal_face_x_get_resource); | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6834 defsubr (&Sx_family_fonts); |
| 24995 | 6835 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
|
6836 #endif /* HAVE_WINDOW_SYSTEM */ |
| 2336 | 6837 } |
| 52401 | 6838 |
| 6839 /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 | |
| 6840 (do not change this comment) */ |
