Mercurial > emacs
annotate src/xfaces.c @ 58658:8564d764ff4d
Add a provide statement.
(calc-Need-calc-help): Remove it.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Tue, 30 Nov 2004 17:11:37 +0000 |
| parents | b1e7465ce5fc |
| children | 9bde7721ad0f 549734260e34 f2ebccfa87d4 |
| rev | line source |
|---|---|
| 24995 | 1 /* xfaces.c -- "Face" primitives. |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004 |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
3 Free Software Foundation. |
| 2342 | 4 |
| 2336 | 5 This file is part of GNU Emacs. |
| 6 | |
| 7 GNU Emacs is free software; you can redistribute it and/or modify | |
| 8 it under the terms of the GNU General Public License as published by | |
| 2342 | 9 the Free Software Foundation; either version 2, or (at your option) |
| 2336 | 10 any later version. |
| 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 | |
| 18 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14090
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14090
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
| 2336 | 21 |
| 24995 | 22 /* New face implementation by Gerd Moellmann <gerd@gnu.org>. */ |
| 23 | |
| 24 /* Faces. | |
| 25 | |
| 26 When using Emacs with X, the display style of characters can be | |
| 27 changed by defining `faces'. Each face can specify the following | |
| 28 display attributes: | |
| 29 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
30 1. Font family name. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
31 |
| 24995 | 32 2. Relative proportionate width, aka character set width or set |
| 33 width (swidth), e.g. `semi-compressed'. | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
34 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
35 3. Font height in 1/10pt. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
36 |
| 24995 | 37 4. Font weight, e.g. `bold'. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
38 |
| 24995 | 39 5. Font slant, e.g. `italic'. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
40 |
| 24995 | 41 6. Foreground color. |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
42 |
| 24995 | 43 7. Background color. |
| 44 | |
| 45 8. Whether or not characters should be underlined, and in what color. | |
| 46 | |
| 47 9. Whether or not characters should be displayed in inverse video. | |
| 48 | |
| 49 10. A background stipple, a bitmap. | |
| 50 | |
| 51 11. Whether or not characters should be overlined, and in what color. | |
| 52 | |
| 53 12. Whether or not characters should be strike-through, and in what | |
| 54 color. | |
| 55 | |
| 56 13. Whether or not a box should be drawn around characters, the box | |
| 57 type, and, for simple boxes, in what color. | |
| 58 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
59 14. Font or fontset pattern, or nil. This is a special attribute. |
| 36946 | 60 When this attribute is specified, the face uses a font opened by |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
61 that pattern as is. In addition, all the other font-related |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
62 attributes (1st thru 5th) are generated from the opened font name. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
63 On the other hand, if one of the other font-related attributes are |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
64 specified, this attribute is set to nil. In that case, the face |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
65 doesn't inherit this attribute from the `default' face, and uses a |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
66 font determined by the other attributes (those may be inherited |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
67 from the `default' face). |
|
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 |
| 24995 | 75 Faces are frame-local by nature because Emacs allows to define the |
| 76 same named face (face names are symbols) differently for different | |
| 77 frames. Each frame has an alist of face definitions for all named | |
| 78 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
|
79 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
|
80 attributes mentioned above. |
| 24995 | 81 |
| 82 There is also a global face alist `Vface_new_frame_defaults'. Face | |
| 83 definitions from this list are used to initialize faces of newly | |
| 84 created frames. | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
85 |
| 24995 | 86 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
|
87 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
|
88 the 14th are called `fully-specified'. |
| 24995 | 89 |
| 90 | |
| 91 Face merging. | |
| 92 | |
| 93 The display style of a given character in the text is determined by | |
| 94 combining several faces. This process is called `face merging'. | |
| 95 Any aspect of the display style that isn't specified by overlays or | |
| 96 text properties is taken from the `default' face. Since it is made | |
| 97 sure that the default face is always fully-specified, face merging | |
| 98 always results in a fully-specified face. | |
| 99 | |
| 100 | |
| 101 Face realization. | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
102 |
| 24995 | 103 After all face attributes for a character have been determined by |
| 104 merging faces of that character, that face is `realized'. The | |
| 105 realization process maps face attributes to what is physically | |
| 106 available on the system where Emacs runs. The result is a | |
| 107 `realized face' in form of a struct face which is stored in the | |
| 108 face cache of the frame on which it was realized. | |
| 109 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
110 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
|
111 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
|
112 other words, for characters that have different font |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
113 specifications, different realized faces are needed to display |
| 24995 | 114 them. |
| 115 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
116 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
|
117 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
|
118 characters share the same font in a fontset. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
119 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
120 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
|
121 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
|
122 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
|
123 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
|
124 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
|
125 |
| 36946 | 126 Thus, all realized face have a realized fontset. |
| 24995 | 127 |
| 128 | |
| 129 Unibyte text. | |
| 130 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
131 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
|
132 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
|
133 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
|
134 and raw 8-bit characters. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
135 |
| 24995 | 136 |
| 137 Font selection. | |
| 138 | |
| 139 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
|
140 given (character, face) combination. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
141 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
142 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
|
143 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
|
144 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
|
145 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
|
146 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
|
147 default fontset determines a pattern for multibyte characters. |
| 24995 | 148 |
| 149 Available fonts on the system on which Emacs runs are then matched | |
| 150 against the font pattern. The result of font selection is the best | |
| 151 match for the given face attributes in this font list. | |
| 152 | |
| 153 Font selection can be influenced by the user. | |
| 154 | |
| 155 1. The user can specify the relative importance he gives the face | |
| 156 attributes width, height, weight, and slant by setting | |
| 157 face-font-selection-order (faces.el) to a list of face attribute | |
| 158 names. The default is '(:width :height :weight :slant), and means | |
| 159 that font selection first tries to find a good match for the font | |
| 160 width specified by a face, then---within fonts with that | |
| 161 width---tries to find a best match for the specified font height, | |
| 162 etc. | |
| 163 | |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
164 2. Setting face-font-family-alternatives allows the user to |
| 24995 | 165 specify alternative font families to try if a family specified by a |
| 166 face doesn't exist. | |
| 167 | |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
168 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
|
169 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
|
170 specifying a registry. |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
171 |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
172 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
|
173 fonts. |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
174 |
| 24995 | 175 |
| 36946 | 176 Character composition. |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
177 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
178 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
|
179 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
|
180 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
|
181 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
|
182 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
|
183 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
|
184 the same. |
| 24995 | 185 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
186 |
| 24995 | 187 Initialization of basic faces. |
| 188 | |
| 189 The faces `default', `modeline' are considered `basic faces'. | |
| 190 When redisplay happens the first time for a newly created frame, | |
| 191 basic faces are realized for CHARSET_ASCII. Frame parameters are | |
| 192 used to fill in unspecified attributes of the default face. */ | |
| 193 | |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25890
diff
changeset
|
194 #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
|
195 #include <stdio.h> |
| 2336 | 196 #include <sys/types.h> |
| 197 #include <sys/stat.h> | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
198 |
| 2336 | 199 #include "lisp.h" |
| 17047 | 200 #include "charset.h" |
|
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
201 #include "keyboard.h" |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
202 #include "frame.h" |
|
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
203 |
|
29897
cd1bb44e646d
Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.
Dave Love <fx@gnu.org>
parents:
29768
diff
changeset
|
204 #ifdef HAVE_WINDOW_SYSTEM |
|
cd1bb44e646d
Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.
Dave Love <fx@gnu.org>
parents:
29768
diff
changeset
|
205 #include "fontset.h" |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
206 #endif /* HAVE_WINDOW_SYSTEM */ |
|
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
207 |
| 9572 | 208 #ifdef HAVE_X_WINDOWS |
| 2336 | 209 #include "xterm.h" |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
210 #ifdef USE_MOTIF |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
211 #include <Xm/Xm.h> |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
212 #include <Xm/XmStrDefs.h> |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
213 #endif /* USE_MOTIF */ |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
214 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 215 |
| 9572 | 216 #ifdef MSDOS |
| 217 #include "dosfns.h" | |
| 218 #endif | |
| 24995 | 219 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
220 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
221 #include "w32term.h" |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
222 #include "fontset.h" |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
223 /* 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
|
224 code with #ifdef blocks. */ |
|
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
225 #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
|
226 #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
|
227 #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
|
228 #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
|
229 #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
|
230 #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
|
231 #define GCGraphicsExposures 0 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
232 #endif /* WINDOWSNT */ |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
233 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
234 #ifdef MAC_OS |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
235 #include "macterm.h" |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
236 #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
|
237 #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
|
238 #endif /* MAC_OS */ |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
239 |
| 2336 | 240 #include "buffer.h" |
| 2391 | 241 #include "dispextern.h" |
| 2438 | 242 #include "blockinput.h" |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
243 #include "window.h" |
| 8848 | 244 #include "intervals.h" |
| 2336 | 245 |
| 9572 | 246 #ifdef HAVE_X_WINDOWS |
| 24995 | 247 |
| 248 /* 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
|
249 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
|
250 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
|
251 #included. */ |
| 24995 | 252 |
|
3436
291f28da7ea1
Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents:
3401
diff
changeset
|
253 #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
|
254 #include <time.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
255 #undef USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
256 #include <X11/Xos.h> |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
257 #define USG |
|
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
258 #define __TIMEVAL__ |
| 24995 | 259 #else /* not XOS_NEEDS_TIME_H */ |
| 2336 | 260 #include <X11/Xos.h> |
| 24995 | 261 #endif /* not XOS_NEEDS_TIME_H */ |
| 262 | |
| 9572 | 263 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 264 |
| 265 #include <ctype.h> | |
| 266 | |
| 267 #define abs(X) ((X) < 0 ? -(X) : (X)) | |
| 268 | |
| 34882 | 269 /* Number of pt per inch (from the TeXbook). */ |
| 270 | |
| 271 #define PT_PER_INCH 72.27 | |
| 272 | |
| 24995 | 273 /* Non-zero if face attribute ATTR is unspecified. */ |
| 274 | |
| 275 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) | |
| 276 | |
| 277 /* Value is the number of elements of VECTOR. */ | |
| 278 | |
| 279 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) | |
| 280 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
281 /* Make a copy of string S on the stack using alloca. Value is a pointer |
| 24995 | 282 to the copy. */ |
| 283 | |
| 284 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S)) | |
| 285 | |
| 286 /* Make a copy of the contents of Lisp string S on the stack using | |
| 287 alloca. Value is a pointer to the copy. */ | |
| 288 | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
289 #define LSTRDUPA(S) STRDUPA (SDATA ((S))) |
| 24995 | 290 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
291 /* Size of hash table of realized faces in face caches (should be a |
| 24995 | 292 prime number). */ |
| 293 | |
| 294 #define FACE_CACHE_BUCKETS_SIZE 1001 | |
| 295 | |
| 296 /* Keyword symbols used for face attribute names. */ | |
| 297 | |
| 298 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; | |
| 299 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; | |
| 300 Lisp_Object QCwidth, QCfont, QCbold, QCitalic; | |
| 301 Lisp_Object QCreverse_video; | |
| 31178 | 302 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; |
| 24995 | 303 |
| 304 /* Symbols used for attribute values. */ | |
| 305 | |
| 306 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
| 307 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
| 308 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
| 309 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
| 310 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
| 311 Lisp_Object Qultra_expanded; | |
| 312 Lisp_Object Qreleased_button, Qpressed_button; | |
| 313 Lisp_Object QCstyle, QCcolor, QCline_width; | |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
314 Lisp_Object Qunspecified; |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
315 |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
316 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
| 24995 | 317 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
318 /* The name of the function to call when the background of the frame |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
319 has changed, frame_update_face_colors. */ |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
320 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
321 Lisp_Object Qframe_update_face_colors; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
322 |
| 24995 | 323 /* Names of basic faces. */ |
| 324 | |
|
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
325 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
|
326 Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; |
|
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
327 Lisp_Object Qmode_line_inactive; |
|
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
328 extern Lisp_Object Qmode_line; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
329 |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
330 /* 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
|
331 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
|
332 the aliased face. */ |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
333 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
334 Lisp_Object Qface_alias; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
335 |
| 24995 | 336 /* Default stipple pattern used on monochrome displays. This stipple |
| 337 pattern is used on monochrome displays instead of shades of gray | |
| 338 for a face background color. See `set-face-stipple' for possible | |
| 339 values for this variable. */ | |
| 340 | |
| 341 Lisp_Object Vface_default_stipple; | |
| 342 | |
| 343 /* Alist of alternative font families. Each element is of the form | |
| 344 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
| 345 try FAMILY1, then FAMILY2, ... */ | |
| 346 | |
| 347 Lisp_Object Vface_alternative_font_family_alist; | |
| 348 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
349 /* 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
|
350 (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
|
351 loaded, try REGISTRY1, then REGISTRY2, ... */ |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
352 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
353 Lisp_Object Vface_alternative_font_registry_alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
354 |
| 24995 | 355 /* Allowed scalable fonts. A value of nil means don't allow any |
| 356 scalable fonts. A value of t means allow the use of any scalable | |
| 357 font. Otherwise, value must be a list of regular expressions. A | |
| 358 font may be scaled if its name matches a regular expression in the | |
| 359 list. */ | |
| 360 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
361 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
| 24995 | 362 |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
363 /* 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
|
364 |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
365 Lisp_Object Vface_ignored_fonts; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
366 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
367 /* 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
|
368 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
369 Lisp_Object Vface_font_rescale_alist; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
370 |
| 25270 | 371 /* Maximum number of fonts to consider in font_list. If not an |
| 372 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
| 373 | |
| 374 Lisp_Object Vfont_list_limit; | |
| 375 #define DEFAULT_FONT_LIST_LIMIT 100 | |
| 376 | |
| 24995 | 377 /* The symbols `foreground-color' and `background-color' which can be |
| 378 used as part of a `face' property. This is for compatibility with | |
| 379 Emacs 20.2. */ | |
| 380 | |
| 381 Lisp_Object Qforeground_color, Qbackground_color; | |
| 382 | |
| 383 /* The symbols `face' and `mouse-face' used as text properties. */ | |
| 2342 | 384 |
|
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
385 Lisp_Object Qface; |
| 24995 | 386 extern Lisp_Object Qmouse_face; |
| 387 | |
| 57107 | 388 /* Property for basic faces which other faces cannot inherit. */ |
| 389 | |
| 390 Lisp_Object Qface_no_inherit; | |
| 391 | |
| 24995 | 392 /* Error symbol for wrong_type_argument in load_pixmap. */ |
| 393 | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
394 Lisp_Object Qbitmap_spec_p; |
| 2391 | 395 |
| 24995 | 396 /* Alist of global face definitions. Each element is of the form |
| 397 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
| 398 is a Lisp vector of face attributes. These faces are used | |
| 399 to initialize faces for new frames. */ | |
| 400 | |
| 401 Lisp_Object Vface_new_frame_defaults; | |
| 402 | |
| 403 /* The next ID to assign to Lisp faces. */ | |
| 404 | |
| 405 static int next_lface_id; | |
| 406 | |
| 407 /* A vector mapping Lisp face Id's to face names. */ | |
| 408 | |
| 409 static Lisp_Object *lface_id_to_name; | |
| 410 static int lface_id_to_name_size; | |
| 411 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
412 /* 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
|
413 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
414 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
| 24995 | 415 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
416 /* 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
|
417 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
418 Lisp_Object Qtty_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
419 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
420 /* 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
|
421 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
422 Lisp_Object Vtty_defined_color_alist; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
423 |
| 24995 | 424 /* Counter for calls to clear_face_cache. If this counter reaches |
| 425 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
| 426 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
| 427 | |
| 428 static int clear_font_table_count; | |
| 429 #define CLEAR_FONT_TABLE_COUNT 100 | |
| 430 #define CLEAR_FONT_TABLE_NFONTS 10 | |
| 431 | |
| 432 /* Non-zero means face attributes have been changed since the last | |
| 433 redisplay. Used in redisplay_internal. */ | |
| 434 | |
| 435 int face_change_count; | |
| 436 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
437 /* 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
|
438 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
|
439 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
|
440 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
|
441 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
442 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
|
443 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
444 /* 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
|
445 Finternal_set_lisp_face_attribute. */ |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
446 |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
447 static Lisp_Object Vparam_value_alist; |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
448 |
| 24995 | 449 /* The total number of colors currently allocated. */ |
| 450 | |
| 451 #if GLYPH_DEBUG | |
| 452 static int ncolors_allocated; | |
| 453 static int npixmaps_allocated; | |
| 454 static int ngcs; | |
| 455 #endif | |
| 456 | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
457 /* 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
|
458 been changed. */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
459 |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
460 int menu_face_changed_default; |
| 24995 | 461 |
| 2336 | 462 |
| 24995 | 463 /* Function prototypes. */ |
| 464 | |
| 465 struct font_name; | |
| 466 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
|
467 struct named_merge_point; |
| 24995 | 468 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
469 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
|
470 enum lface_attribute_index, int *)); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
471 static Lisp_Object resolve_face_name P_ ((Lisp_Object)); |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
472 static int may_use_scalable_font_p P_ ((const char *)); |
| 24995 | 473 static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); |
| 474 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
|
475 int, int)); |
| 24995 | 476 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
|
477 struct font_name **, int, int)); |
| 24995 | 478 static int font_scalable_p P_ ((struct font_name *)); |
| 479 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int)); | |
| 480 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); | |
| 481 static unsigned char *xstrlwr P_ ((unsigned char *)); | |
| 482 static void signal_error P_ ((char *, Lisp_Object)); | |
| 483 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
484 static void load_face_font P_ ((struct frame *, struct face *, int)); |
| 24995 | 485 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); |
| 486 static void free_face_colors P_ ((struct frame *, struct face *)); | |
| 487 static int face_color_gray_p P_ ((struct frame *, char *)); | |
| 488 static char *build_font_name P_ ((struct font_name *)); | |
| 489 static void free_font_names P_ ((struct font_name *, int)); | |
| 490 static int sorted_font_list P_ ((struct frame *, char *, | |
| 491 int (*cmpfn) P_ ((const void *, const void *)), | |
| 492 struct font_name **)); | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
493 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
|
494 Lisp_Object, struct font_name **)); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
495 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
|
496 Lisp_Object, struct font_name **)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
497 static int try_font_list P_ ((struct frame *, Lisp_Object *, |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
498 Lisp_Object, Lisp_Object, struct font_name **, |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
499 int)); |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
500 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
|
501 Lisp_Object, struct font_name **)); |
| 24995 | 502 static int cmp_font_names P_ ((const void *, const void *)); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
503 static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, int, |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
504 struct face *, int)); |
| 24995 | 505 static struct face *realize_x_face P_ ((struct face_cache *, |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
506 Lisp_Object *, int, struct face *)); |
| 24995 | 507 static struct face *realize_tty_face P_ ((struct face_cache *, |
| 508 Lisp_Object *, int)); | |
| 509 static int realize_basic_faces P_ ((struct frame *)); | |
| 510 static int realize_default_face P_ ((struct frame *)); | |
| 511 static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); | |
| 512 static int lface_fully_specified_p P_ ((Lisp_Object *)); | |
| 513 static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); | |
| 514 static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); | |
| 515 static unsigned lface_hash P_ ((Lisp_Object *)); | |
| 516 static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); | |
| 517 static struct face_cache *make_face_cache P_ ((struct frame *)); | |
| 518 static void free_realized_face P_ ((struct frame *, struct face *)); | |
| 519 static void clear_face_gcs P_ ((struct face_cache *)); | |
| 520 static void free_face_cache P_ ((struct face_cache *)); | |
| 521 static int face_numeric_weight P_ ((Lisp_Object)); | |
| 522 static int face_numeric_slant P_ ((Lisp_Object)); | |
| 523 static int face_numeric_swidth P_ ((Lisp_Object)); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
524 static int face_fontset P_ ((Lisp_Object *)); |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
525 static char *choose_face_font P_ ((struct frame *, Lisp_Object *, int, int, int*)); |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
526 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
|
527 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
|
528 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
|
529 int, struct named_merge_point *)); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
530 static int set_lface_from_font_name P_ ((struct frame *, Lisp_Object, |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
531 Lisp_Object, int, int)); |
| 24995 | 532 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
|
533 static struct face *make_realized_face P_ ((Lisp_Object *)); |
| 24995 | 534 static void free_realized_faces P_ ((struct face_cache *)); |
| 535 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
|
536 struct font_name *, int, int, int *)); |
| 24995 | 537 static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); |
| 538 static void uncache_face P_ ((struct face_cache *, struct face *)); | |
| 539 static int xlfd_numeric_slant P_ ((struct font_name *)); | |
| 540 static int xlfd_numeric_weight P_ ((struct font_name *)); | |
| 541 static int xlfd_numeric_swidth P_ ((struct font_name *)); | |
| 542 static Lisp_Object xlfd_symbolic_slant P_ ((struct font_name *)); | |
| 543 static Lisp_Object xlfd_symbolic_weight P_ ((struct font_name *)); | |
| 544 static Lisp_Object xlfd_symbolic_swidth P_ ((struct font_name *)); | |
| 545 static int xlfd_fixed_p P_ ((struct font_name *)); | |
| 546 static int xlfd_numeric_value P_ ((struct table_entry *, int, struct font_name *, | |
| 547 int, int)); | |
| 548 static Lisp_Object xlfd_symbolic_value P_ ((struct table_entry *, int, | |
|
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
549 struct font_name *, int, |
|
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
550 Lisp_Object)); |
| 24995 | 551 static struct table_entry *xlfd_lookup_field_contents P_ ((struct table_entry *, int, |
| 552 struct font_name *, int)); | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
553 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
554 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 555 |
| 556 static int split_font_name P_ ((struct frame *, struct font_name *, int)); | |
| 557 static int xlfd_point_size P_ ((struct frame *, struct font_name *)); | |
| 558 static void sort_fonts P_ ((struct frame *, struct font_name *, int, | |
| 559 int (*cmpfn) P_ ((const void *, const void *)))); | |
| 560 static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); | |
| 561 static void x_free_gc P_ ((struct frame *, GC)); | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
562 static void clear_font_table P_ ((struct x_display_info *)); |
| 24995 | 563 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
564 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
565 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
|
566 #endif /* WINDOWSNT */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
567 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
568 #ifdef USE_X_TOOLKIT |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
569 static void x_update_menu_appearance P_ ((struct frame *)); |
| 39675 | 570 |
| 571 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
|
572 #endif /* USE_X_TOOLKIT */ |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
573 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
574 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 575 |
| 576 | |
| 577 /*********************************************************************** | |
| 578 Utilities | |
| 579 ***********************************************************************/ | |
| 580 | |
| 581 #ifdef HAVE_X_WINDOWS | |
| 582 | |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
583 #ifdef DEBUG_X_COLORS |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
584 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
585 /* 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
|
586 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
|
587 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
|
588 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
|
589 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
|
590 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
|
591 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
|
592 single display/screen. --gerd. */ |
|
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 /* Reference counts for pixel colors. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 int color_count[256]; |
|
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 /* Register color PIXEL as allocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
599 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
600 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
601 register_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
602 unsigned long pixel; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
603 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
605 ++color_count[pixel]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
606 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
607 |
|
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 /* Register color PIXEL as deallocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
610 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
611 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 unregister_color (pixel) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 unsigned long pixel; |
|
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 xassert (pixel < 256); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
616 if (color_count[pixel] > 0) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
617 --color_count[pixel]; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
618 else |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
619 abort (); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
620 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
621 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
622 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
623 /* Register N colors from PIXELS as deallocated. */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
624 |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
625 void |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
626 unregister_colors (pixels, n) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
627 unsigned long *pixels; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
628 int n; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
629 { |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
630 int i; |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
631 for (i = 0; i < n; ++i) |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
632 unregister_color (pixels[i]); |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
633 } |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
634 |
|
29599
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 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
|
637 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
|
638 () |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
639 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
640 int i, n; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
641 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
642 fputc ('\n', stderr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
643 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
644 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
|
645 if (color_count[i]) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
646 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
647 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
|
648 ++n; |
|
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 else |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
652 fputc ('\t', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
653 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
654 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
655 if (n % 5 != 0) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
656 fputc ('\n', stderr); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
657 return Qnil; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
658 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
659 |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
660 #endif /* DEBUG_X_COLORS */ |
|
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
661 |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
662 |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
663 /* 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
|
664 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
|
665 is called. */ |
|
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 void |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
668 x_free_colors (f, pixels, npixels) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
669 struct frame *f; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
670 unsigned long *pixels; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
671 int npixels; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
672 { |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
673 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
674 |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
675 /* 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
|
676 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
|
677 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
678 { |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
679 #ifdef DEBUG_X_COLORS |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
680 unregister_colors (pixels, npixels); |
|
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
681 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
682 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
|
683 pixels, npixels, 0); |
|
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
684 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
685 } |
|
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
686 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
687 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
688 /* 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
|
689 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
|
690 is called. */ |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
691 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
692 void |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
693 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
|
694 Display *dpy; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
695 Screen *screen; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
696 Colormap cmap; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
697 unsigned long *pixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
698 int npixels; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
699 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
700 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
|
701 int class = dpyinfo->visual->class; |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
702 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
703 /* 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
|
704 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
|
705 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
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 #ifdef DEBUG_X_COLORS |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
708 unregister_colors (pixels, npixels); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
709 #endif |
|
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
710 XFreeColors (dpy, cmap, pixels, npixels, 0); |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
711 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
712 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
713 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
714 |
| 24995 | 715 /* Create and return a GC for use on frame F. GC values and mask |
| 716 are given by XGCV and MASK. */ | |
| 717 | |
| 718 static INLINE GC | |
| 719 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
|
720 struct frame *f; |
| 24995 | 721 unsigned long mask; |
| 722 XGCValues *xgcv; | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
723 { |
| 2336 | 724 GC gc; |
| 24995 | 725 BLOCK_INPUT; |
| 726 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
| 727 UNBLOCK_INPUT; | |
| 728 IF_DEBUG (++ngcs); | |
| 729 return gc; | |
| 730 } | |
| 731 | |
| 732 | |
| 733 /* Free GC which was used on frame F. */ | |
| 734 | |
| 735 static INLINE void | |
| 736 x_free_gc (f, gc) | |
| 737 struct frame *f; | |
| 738 GC gc; | |
| 739 { | |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
740 BLOCK_INPUT; |
| 24995 | 741 xassert (--ngcs >= 0); |
| 742 XFreeGC (FRAME_X_DISPLAY (f), gc); | |
| 743 UNBLOCK_INPUT; | |
| 744 } | |
| 745 | |
| 746 #endif /* HAVE_X_WINDOWS */ | |
| 747 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
748 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
749 /* W32 emulation of GCs */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
750 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
751 static INLINE GC |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
752 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
|
753 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
754 unsigned long mask; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
755 XGCValues *xgcv; |
|
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 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
758 BLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
759 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
|
760 UNBLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
761 IF_DEBUG (++ngcs); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
762 return gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
763 } |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
764 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
765 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
766 /* 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
|
767 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
768 static INLINE void |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
769 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
|
770 struct frame *f; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
771 GC gc; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
772 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
773 BLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
774 xassert (--ngcs >= 0); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
775 xfree (gc); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
776 UNBLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
777 } |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
778 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
779 #endif /* WINDOWSNT */ |
| 24995 | 780 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
781 #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
|
782 /* 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
|
783 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
784 extern XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *); |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
785 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
786 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
|
787 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
|
788 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
|
789 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
|
790 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
|
791 { |
|
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 gc = XCreateGC (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (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
|
794 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
|
795 } |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
796 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
797 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
|
798 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
|
799 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
|
800 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
|
801 { |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
802 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
|
803 } |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
804 |
|
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
805 #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
|
806 |
| 24995 | 807 /* Like stricmp. Used to compare parts of font names which are in |
| 808 ISO8859-1. */ | |
| 809 | |
| 810 int | |
| 811 xstricmp (s1, s2) | |
|
46478
d6b51ec01987
(xstricmp): String pointer args now point to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
812 const unsigned char *s1, *s2; |
| 24995 | 813 { |
| 814 while (*s1 && *s2) | |
| 815 { | |
| 816 unsigned char c1 = tolower (*s1); | |
| 817 unsigned char c2 = tolower (*s2); | |
| 818 if (c1 != c2) | |
| 819 return c1 < c2 ? -1 : 1; | |
| 820 ++s1, ++s2; | |
| 821 } | |
| 822 | |
| 823 if (*s1 == 0) | |
| 824 return *s2 == 0 ? 0 : -1; | |
| 825 return 1; | |
| 826 } | |
| 827 | |
| 828 | |
| 829 /* Like strlwr, which might not always be available. */ | |
| 830 | |
| 831 static unsigned char * | |
| 832 xstrlwr (s) | |
| 833 unsigned char *s; | |
| 834 { | |
| 835 unsigned char *p = s; | |
| 836 | |
| 837 for (p = s; *p; ++p) | |
| 838 *p = tolower (*p); | |
| 839 | |
| 840 return s; | |
| 841 } | |
| 842 | |
| 843 | |
| 844 /* Signal `error' with message S, and additional argument ARG. */ | |
| 845 | |
| 846 static void | |
| 847 signal_error (s, arg) | |
| 848 char *s; | |
| 849 Lisp_Object arg; | |
| 850 { | |
| 851 Fsignal (Qerror, Fcons (build_string (s), Fcons (arg, Qnil))); | |
| 852 } | |
| 853 | |
| 854 | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
855 /* 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
|
856 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
|
857 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
|
858 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
|
859 Lisp function definitions. */ |
| 24995 | 860 |
| 861 static INLINE struct frame * | |
| 862 frame_or_selected_frame (frame, nparam) | |
| 863 Lisp_Object frame; | |
| 864 int nparam; | |
| 865 { | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
866 if (NILP (frame)) |
|
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
867 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
868 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
869 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
870 return XFRAME (frame); |
| 24995 | 871 } |
| 872 | |
| 873 | |
| 874 /*********************************************************************** | |
| 875 Frames and faces | |
| 876 ***********************************************************************/ | |
| 877 | |
| 878 /* 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
|
879 |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
880 void |
| 24995 | 881 init_frame_faces (f) |
| 882 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
|
883 { |
| 24995 | 884 /* Make a face cache, if F doesn't have one. */ |
| 885 if (FRAME_FACE_CACHE (f) == NULL) | |
| 886 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
887 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
888 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 889 /* 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
|
890 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
|
891 { |
| 24995 | 892 if (FRAME_X_IMAGE_CACHE (f) == NULL) |
| 893 FRAME_X_IMAGE_CACHE (f) = make_image_cache (); | |
| 894 ++FRAME_X_IMAGE_CACHE (f)->refcount; | |
| 895 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
896 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 897 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
898 /* Realize basic faces. Must have enough information in frame |
| 24995 | 899 parameters to realize basic faces at this point. */ |
| 900 #ifdef HAVE_X_WINDOWS | |
| 901 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
| 902 #endif | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
903 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
904 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
|
905 #endif |
| 45848 | 906 #ifdef MAC_OS |
| 907 if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) | |
| 908 #endif | |
| 24995 | 909 if (!realize_basic_faces (f)) |
| 910 abort (); | |
| 911 } | |
| 912 | |
| 913 | |
| 914 /* Free face cache of frame F. Called from Fdelete_frame. */ | |
| 915 | |
| 916 void | |
| 917 free_frame_faces (f) | |
| 918 struct frame *f; | |
| 919 { | |
| 920 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
|
921 |
| 24995 | 922 if (face_cache) |
| 923 { | |
| 924 free_face_cache (face_cache); | |
| 925 FRAME_FACE_CACHE (f) = NULL; | |
| 926 } | |
| 927 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
928 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
929 if (FRAME_WINDOW_P (f)) |
| 24995 | 930 { |
| 931 struct image_cache *image_cache = FRAME_X_IMAGE_CACHE (f); | |
| 932 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
|
933 { |
| 24995 | 934 --image_cache->refcount; |
| 935 if (image_cache->refcount == 0) | |
| 936 free_image_cache (f); | |
| 937 } | |
| 938 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
939 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 940 } |
| 941 | |
| 942 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
943 /* 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
|
944 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
|
945 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
|
946 of named faces. */ |
| 24995 | 947 |
| 948 void | |
| 949 recompute_basic_faces (f) | |
| 950 struct frame *f; | |
| 951 { | |
| 952 if (FRAME_FACE_CACHE (f)) | |
| 953 { | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
954 clear_face_cache (0); |
|
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
955 if (!realize_basic_faces (f)) |
|
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
956 abort (); |
| 24995 | 957 } |
| 958 } | |
| 959 | |
| 960 | |
| 961 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
| 962 try to free unused fonts, too. */ | |
| 963 | |
| 964 void | |
| 965 clear_face_cache (clear_fonts_p) | |
| 966 int clear_fonts_p; | |
| 967 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
968 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 969 Lisp_Object tail, frame; |
| 970 struct frame *f; | |
| 971 | |
| 972 if (clear_fonts_p | |
| 973 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
| 974 { | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
975 struct x_display_info *dpyinfo; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
976 |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
977 /* Fonts are common for frames on one display, i.e. on |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
978 one X screen. */ |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
979 for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
980 if (dpyinfo->n_fonts > CLEAR_FONT_TABLE_NFONTS) |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
981 clear_font_table (dpyinfo); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
982 |
| 24995 | 983 /* From time to time see if we can unload some fonts. This also |
| 984 frees all realized faces on all frames. Fonts needed by | |
| 985 faces will be loaded again when faces are realized again. */ | |
| 986 clear_font_table_count = 0; | |
| 987 | |
| 988 FOR_EACH_FRAME (tail, frame) | |
| 989 { | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
990 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
|
991 if (FRAME_WINDOW_P (f) |
| 24995 | 992 && 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
|
993 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
|
994 } |
|
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
995 } |
| 24995 | 996 else |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
997 { |
| 24995 | 998 /* Clear GCs of realized faces. */ |
| 999 FOR_EACH_FRAME (tail, frame) | |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1000 { |
| 24995 | 1001 f = XFRAME (frame); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1002 if (FRAME_WINDOW_P (f)) |
| 24995 | 1003 { |
| 1004 clear_face_gcs (FRAME_FACE_CACHE (f)); | |
| 1005 clear_image_cache (f, 0); | |
| 1006 } | |
|
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1007 } |
|
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1008 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1009 #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
|
1010 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1011 |
| 24995 | 1012 |
| 1013 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
|
1014 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
|
1015 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
|
1016 (thoroughly) |
|
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1017 Lisp_Object thoroughly; |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1018 { |
|
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1019 clear_face_cache (!NILP (thoroughly)); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1020 ++face_change_count; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1021 ++windows_or_buffers_changed; |
| 24995 | 1022 return Qnil; |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1023 } |
|
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1024 |
| 24995 | 1025 |
| 1026 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1027 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1028 |
| 1029 | |
| 38435 | 1030 /* Remove fonts from the font table of DPYINFO except for the default |
| 1031 ASCII fonts of frames on that display. Called from clear_face_cache | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1032 from time to time. */ |
| 24995 | 1033 |
| 1034 static void | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1035 clear_font_table (dpyinfo) |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1036 struct x_display_info *dpyinfo; |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1037 { |
| 24995 | 1038 int i; |
| 1039 | |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1040 /* Free those fonts that are not used by frames on DPYINFO. */ |
| 24995 | 1041 for (i = 0; i < dpyinfo->n_fonts; ++i) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1042 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1043 struct font_info *font_info = dpyinfo->font_table + i; |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1044 Lisp_Object tail, frame; |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1045 |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1046 /* Check if slot is already free. */ |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1047 if (font_info->name == NULL) |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1048 continue; |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1049 |
|
44705
413dd322c77d
(clear_font_table): Don't free the default font of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43270
diff
changeset
|
1050 /* Don't free a default font of some frame. */ |
|
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1051 FOR_EACH_FRAME (tail, frame) |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1052 { |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1053 struct frame *f = XFRAME (frame); |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1054 if (FRAME_WINDOW_P (f) |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1055 && font_info->font == FRAME_FONT (f)) |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1056 break; |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1057 } |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1058 |
|
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1059 if (!NILP (tail)) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1060 continue; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1061 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1062 /* Free names. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1063 if (font_info->full_name != font_info->name) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1064 xfree (font_info->full_name); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1065 xfree (font_info->name); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1066 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1067 /* Free the font. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1068 BLOCK_INPUT; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1069 #ifdef HAVE_X_WINDOWS |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1070 XFreeFont (dpyinfo->display, font_info->font); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1071 #endif |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1072 #ifdef WINDOWSNT |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1073 w32_unload_font (dpyinfo, font_info->font); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1074 #endif |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1075 UNBLOCK_INPUT; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1076 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1077 /* Mark font table slot free. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1078 font_info->font = NULL; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1079 font_info->name = font_info->full_name = NULL; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1080 } |
|
9564
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 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1083 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1084 |
| 1085 | |
| 1086 | |
| 1087 /*********************************************************************** | |
| 1088 X Pixmaps | |
| 1089 ***********************************************************************/ | |
| 1090 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1091 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1092 |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1093 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
|
1094 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
|
1095 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
|
1096 \(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
|
1097 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
|
1098 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
|
1099 \(WIDTH + 7)/8 bytes. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1100 (object) |
|
14090
24b93860d392
(Fpixmap_spec_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1101 Lisp_Object object; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1102 { |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1103 int pixmap_p = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1104 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1105 if (STRINGP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1106 /* 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
|
1107 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1108 else if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1109 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1110 /* 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
|
1111 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
|
1112 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
|
1113 Lisp_Object width, height, data; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1114 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1115 height = width = data = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1116 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1117 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1118 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1119 width = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1120 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1121 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1122 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1123 height = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1124 object = XCDR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1125 if (CONSP (object)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1126 data = XCAR (object); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1127 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1128 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1129 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1130 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1131 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1132 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
|
1133 / 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
|
1134 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
|
1135 pixmap_p = 1; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1136 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1137 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1138 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1139 return pixmap_p ? Qt : Qnil; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1140 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1141 |
| 24995 | 1142 |
| 1143 /* Load a bitmap according to NAME (which is either a file name or a | |
| 1144 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
| 1145 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
| 1146 bitmap cannot be loaded, display a message saying so, and return | |
| 1147 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
| 1148 if these pointers are not null. */ | |
| 1149 | |
| 1150 static int | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1151 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
|
1152 FRAME_PTR f; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1153 Lisp_Object name; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1154 unsigned int *w_ptr, *h_ptr; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1155 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1156 int bitmap_id; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1157 Lisp_Object tem; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1158 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1159 if (NILP (name)) |
| 24995 | 1160 return 0; |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1161 |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1162 tem = Fbitmap_spec_p (name); |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1163 if (NILP (tem)) |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1164 wrong_type_argument (Qbitmap_spec_p, name); |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1165 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1166 BLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1167 if (CONSP (name)) |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1168 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1169 /* Decode a bitmap spec into a bitmap. */ |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1170 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1171 int h, w; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1172 Lisp_Object bits; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1173 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1174 w = XINT (Fcar (name)); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1175 h = XINT (Fcar (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1176 bits = Fcar (Fcdr (Fcdr (name))); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1177 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1178 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
|
1179 w, h); |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1180 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1181 else |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1182 { |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1183 /* 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
|
1184 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
|
1185 } |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1186 UNBLOCK_INPUT; |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1187 |
|
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1188 if (bitmap_id < 0) |
| 24995 | 1189 { |
|
25799
1c370ec939da
(load_pixmap): Call add_to_log without frame parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25678
diff
changeset
|
1190 add_to_log ("Invalid or undefined bitmap %s", name, Qnil); |
| 24995 | 1191 bitmap_id = 0; |
| 1192 | |
| 1193 if (w_ptr) | |
| 1194 *w_ptr = 0; | |
| 1195 if (h_ptr) | |
| 1196 *h_ptr = 0; | |
| 1197 } | |
| 1198 else | |
| 1199 { | |
| 1200 #if GLYPH_DEBUG | |
| 1201 ++npixmaps_allocated; | |
| 1202 #endif | |
| 1203 if (w_ptr) | |
| 1204 *w_ptr = x_bitmap_width (f, bitmap_id); | |
| 1205 | |
| 1206 if (h_ptr) | |
| 1207 *h_ptr = x_bitmap_height (f, bitmap_id); | |
| 1208 } | |
|
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1209 |
|
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1210 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
|
1211 } |
| 9572 | 1212 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1213 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1214 |
| 9572 | 1215 |
| 2336 | 1216 |
| 24995 | 1217 /*********************************************************************** |
| 1218 Fonts | |
| 1219 ***********************************************************************/ | |
| 1220 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1221 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1222 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1223 /* Load font of face FACE which is used on frame F to display |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1224 character C. The name of the font to load is determined by lface |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1225 and fontset of FACE. */ |
|
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
1226 |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1227 static void |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1228 load_face_font (f, face, c) |
| 24995 | 1229 struct frame *f; |
| 1230 struct face *face; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1231 int c; |
| 24995 | 1232 { |
| 1233 struct font_info *font_info = NULL; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1234 char *font_name; |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1235 int needs_overstrike; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1236 |
| 24995 | 1237 face->font_info_id = -1; |
| 1238 face->font = NULL; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1239 |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1240 font_name = choose_face_font (f, face->lface, face->fontset, c, |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1241 &needs_overstrike); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1242 if (!font_name) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1243 return; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1244 |
| 24995 | 1245 BLOCK_INPUT; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1246 font_info = FS_LOAD_FACE_FONT (f, c, font_name, face); |
| 24995 | 1247 UNBLOCK_INPUT; |
| 1248 | |
| 1249 if (font_info) | |
| 1250 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1251 face->font_info_id = font_info->font_idx; |
| 24995 | 1252 face->font = font_info->font; |
| 1253 face->font_name = font_info->full_name; | |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1254 face->overstrike = needs_overstrike; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1255 if (face->gc) |
| 24995 | 1256 { |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1257 x_free_gc (f, face->gc); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1258 face->gc = 0; |
| 24995 | 1259 } |
| 1260 } | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1261 else |
|
25799
1c370ec939da
(load_pixmap): Call add_to_log without frame parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25678
diff
changeset
|
1262 add_to_log ("Unable to load font %s", |
|
25301
2042c4a224ad
(add_to_log): Renamed from display_message.
Gerd Moellmann <gerd@gnu.org>
parents:
25270
diff
changeset
|
1263 build_string (font_name), Qnil); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1264 xfree (font_name); |
| 24995 | 1265 } |
| 1266 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1267 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1268 |
| 1269 | |
| 1270 | |
| 1271 /*********************************************************************** | |
| 1272 X Colors | |
| 1273 ***********************************************************************/ | |
| 1274 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1275 /* 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
|
1276 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
|
1277 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
|
1278 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1279 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1280 parse_rgb_list (rgb_list, color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1281 Lisp_Object rgb_list; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1282 XColor *color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1283 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1284 #define PARSE_RGB_LIST_FIELD(field) \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1285 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
|
1286 { \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1287 color->field = XINT (XCAR (rgb_list)); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1288 rgb_list = XCDR (rgb_list); \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1289 } \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1290 else \ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1291 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1292 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1293 PARSE_RGB_LIST_FIELD (red); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1294 PARSE_RGB_LIST_FIELD (green); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1295 PARSE_RGB_LIST_FIELD (blue); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1296 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1297 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1298 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1299 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1300 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1301 /* 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
|
1302 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
|
1303 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
|
1304 returned in it. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1305 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1306 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1307 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
|
1308 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1309 Lisp_Object color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1310 XColor *tty_color, *std_color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1311 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1312 Lisp_Object frame, color_desc; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1313 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1314 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
|
1315 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1316 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1317 XSETFRAME (frame, f); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1318 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1319 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
|
1320 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
|
1321 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1322 Lisp_Object rgb; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1323 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1324 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1325 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1326 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1327 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
|
1328 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1329 rgb = XCDR (XCDR (color_desc)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1330 if (! parse_rgb_list (rgb, tty_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1331 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1332 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1333 /* Should we fill in STD_COLOR too? */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1334 if (std_color) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1335 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1336 /* 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
|
1337 *std_color = *tty_color; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1338 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1339 /* 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
|
1340 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
|
1341 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
|
1342 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
|
1343 if ((!STRINGP (XCAR (color_desc)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1344 || 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
|
1345 && !NILP (Ffboundp (Qtty_color_standard_values))) |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1346 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1347 /* Look up STD_COLOR separately. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1348 rgb = call1 (Qtty_color_standard_values, color); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1349 if (! parse_rgb_list (rgb, std_color)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1350 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1351 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1352 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1353 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1354 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1355 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1356 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
|
1357 /* 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
|
1358 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
|
1359 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
|
1360 load color" messages in the *Messages* buffer. */ |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1361 return 1; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1362 else |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1363 /* 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
|
1364 return 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1365 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1366 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1367 /* 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
|
1368 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1369 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1370 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
|
1371 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1372 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1373 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1374 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1375 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1376 int status = 1; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1377 |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1378 /* Defaults. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1379 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
|
1380 color_def->red = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1381 color_def->blue = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1382 color_def->green = 0; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1383 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1384 if (*color_name) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1385 status = tty_lookup_color (f, build_string (color_name), color_def, 0); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1386 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1387 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
|
1388 { |
|
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1389 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
|
1390 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
|
1391 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
|
1392 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
|
1393 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1394 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1395 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
|
1396 status = 1; |
|
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1397 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1398 return status; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1399 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1400 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1401 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1402 /* 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
|
1403 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
|
1404 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
|
1405 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1406 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
|
1407 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1408 int |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1409 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
|
1410 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1411 char *color_name; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1412 XColor *color_def; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1413 int alloc; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1414 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1415 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
|
1416 return tty_defined_color (f, color_name, color_def, alloc); |
| 24995 | 1417 #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
|
1418 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
|
1419 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
|
1420 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1421 #ifdef WINDOWSNT |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1422 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
|
1423 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
|
1424 #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
|
1425 #ifdef MAC_OS |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1426 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
|
1427 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
|
1428 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1429 else |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1430 abort (); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1431 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1432 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1433 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1434 /* 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
|
1435 Lisp string. */ |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1436 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1437 Lisp_Object |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1438 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
|
1439 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1440 int idx; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1441 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1442 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
|
1443 { |
|
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1444 Lisp_Object frame; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1445 Lisp_Object coldesc; |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1446 |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1447 XSETFRAME (frame, f); |
|
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1448 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
|
1449 |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1450 if (!NILP (coldesc)) |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1451 return XCAR (coldesc); |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1452 } |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1453 #ifdef MSDOS |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1454 /* 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
|
1455 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
|
1456 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
|
1457 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
|
1458 #endif |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1459 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1460 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1461 return build_string (unspecified_fg); |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1462 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
|
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1463 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
|
1464 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1465 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1466 return vga_stdcolor_name (idx); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1467 #endif |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1468 |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1469 return Qunspecified; |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1470 } |
| 24995 | 1471 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1472 |
| 24995 | 1473 /* Return non-zero if COLOR_NAME is a shade of gray (or white or |
| 1474 black) on frame F. The algorithm is taken from 20.2 faces.el. */ | |
| 1475 | |
| 1476 static int | |
| 1477 face_color_gray_p (f, color_name) | |
| 1478 struct frame *f; | |
| 1479 char *color_name; | |
| 1480 { | |
| 1481 XColor color; | |
| 1482 int gray_p; | |
| 1483 | |
| 1484 if (defined_color (f, color_name, &color, 0)) | |
| 1485 gray_p = ((abs (color.red - color.green) | |
| 1486 < max (color.red, color.green) / 20) | |
| 1487 && (abs (color.green - color.blue) | |
| 1488 < max (color.green, color.blue) / 20) | |
| 1489 && (abs (color.blue - color.red) | |
| 1490 < max (color.blue, color.red) / 20)); | |
| 1491 else | |
| 1492 gray_p = 0; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1493 |
| 24995 | 1494 return gray_p; |
| 1495 } | |
| 1496 | |
| 1497 | |
| 1498 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
| 1499 BACKGROUND_P non-zero means the color will be used as background | |
| 1500 color. */ | |
| 1501 | |
| 1502 static int | |
| 1503 face_color_supported_p (f, color_name, background_p) | |
| 1504 struct frame *f; | |
| 1505 char *color_name; | |
| 1506 int background_p; | |
| 1507 { | |
| 1508 Lisp_Object frame; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1509 XColor not_used; |
| 24995 | 1510 |
| 1511 XSETFRAME (frame, f); | |
|
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1512 return |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1513 #ifdef HAVE_X_WINDOWS |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1514 FRAME_WINDOW_P (f) |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1515 ? (!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
|
1516 || xstricmp (color_name, "black") == 0 |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1517 || xstricmp (color_name, "white") == 0 |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1518 || (background_p |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1519 && 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
|
1520 || (!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
|
1521 && 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
|
1522 : |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1523 #endif |
|
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1524 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
|
1525 } |
| 24995 | 1526 |
| 1527 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1528 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
|
1529 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
|
1530 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
|
1531 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
|
1532 (color, frame) |
| 24995 | 1533 Lisp_Object color, frame; |
| 1534 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1535 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1536 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1537 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1538 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1539 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1540 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1541 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1542 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
|
1543 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
| 24995 | 1544 } |
| 1545 | |
| 1546 | |
|
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1547 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
|
1548 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
|
1549 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
|
1550 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
|
1551 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
|
1552 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
|
1553 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
|
1554 (color, frame, background_p) |
| 24995 | 1555 Lisp_Object frame, color, background_p; |
| 1556 { | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1557 struct frame *f; |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1558 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1559 CHECK_STRING (color); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1560 if (NILP (frame)) |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1561 frame = selected_frame; |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1562 else |
|
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1563 CHECK_FRAME (frame); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1564 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
|
1565 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
| 24995 | 1566 return Qt; |
| 1567 return Qnil; | |
| 1568 } | |
| 1569 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1570 |
| 24995 | 1571 /* Load color with name NAME for use by face FACE on frame F. |
| 1572 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
| 1573 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
| 1574 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
| 1575 pixel color. If color cannot be loaded, display a message, and | |
| 1576 return the foreground, background or underline color of F, but | |
| 1577 record that fact in flags of the face so that we don't try to free | |
| 1578 these colors. */ | |
| 1579 | |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1580 unsigned long |
| 24995 | 1581 load_color (f, face, name, target_index) |
| 1582 struct frame *f; | |
| 1583 struct face *face; | |
| 1584 Lisp_Object name; | |
| 1585 enum lface_attribute_index target_index; | |
| 1586 { | |
| 1587 XColor color; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1588 |
| 24995 | 1589 xassert (STRINGP (name)); |
| 1590 xassert (target_index == LFACE_FOREGROUND_INDEX | |
| 1591 || target_index == LFACE_BACKGROUND_INDEX | |
| 1592 || target_index == LFACE_UNDERLINE_INDEX | |
| 1593 || target_index == LFACE_OVERLINE_INDEX | |
| 1594 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
| 1595 || target_index == LFACE_BOX_INDEX); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1596 |
| 24995 | 1597 /* if the color map is full, defined_color will return a best match |
| 1598 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
|
1599 if (!defined_color (f, SDATA (name), &color, 1)) |
| 24995 | 1600 { |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1601 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
|
1602 |
| 24995 | 1603 switch (target_index) |
| 1604 { | |
| 1605 case LFACE_FOREGROUND_INDEX: | |
| 1606 face->foreground_defaulted_p = 1; | |
| 1607 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1608 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1609 |
| 24995 | 1610 case LFACE_BACKGROUND_INDEX: |
| 1611 face->background_defaulted_p = 1; | |
| 1612 color.pixel = FRAME_BACKGROUND_PIXEL (f); | |
| 1613 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1614 |
| 24995 | 1615 case LFACE_UNDERLINE_INDEX: |
| 1616 face->underline_defaulted_p = 1; | |
| 1617 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1618 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1619 |
| 24995 | 1620 case LFACE_OVERLINE_INDEX: |
| 1621 face->overline_color_defaulted_p = 1; | |
| 1622 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1623 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1624 |
| 24995 | 1625 case LFACE_STRIKE_THROUGH_INDEX: |
| 1626 face->strike_through_color_defaulted_p = 1; | |
| 1627 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1628 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1629 |
| 24995 | 1630 case LFACE_BOX_INDEX: |
| 1631 face->box_color_defaulted_p = 1; | |
| 1632 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
| 1633 break; | |
| 1634 | |
| 1635 default: | |
| 1636 abort (); | |
| 1637 } | |
| 1638 } | |
| 1639 #if GLYPH_DEBUG | |
| 1640 else | |
| 1641 ++ncolors_allocated; | |
| 1642 #endif | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1643 |
| 24995 | 1644 return color.pixel; |
| 1645 } | |
| 1646 | |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1647 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1648 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 1649 |
| 1650 /* Load colors for face FACE which is used on frame F. Colors are | |
| 1651 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
| 1652 of ATTRS. If the background color specified is not supported on F, | |
| 1653 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
| 1654 | |
| 1655 static void | |
| 1656 load_face_colors (f, face, attrs) | |
| 1657 struct frame *f; | |
| 1658 struct face *face; | |
| 1659 Lisp_Object *attrs; | |
| 1660 { | |
| 1661 Lisp_Object fg, bg; | |
| 1662 | |
| 1663 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
| 1664 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
| 1665 | |
| 1666 /* Swap colors if face is inverse-video. */ | |
| 1667 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
| 1668 { | |
| 1669 Lisp_Object tmp; | |
| 1670 tmp = fg; | |
| 1671 fg = bg; | |
| 1672 bg = tmp; | |
| 1673 } | |
| 1674 | |
| 1675 /* Check for support for foreground, not for background because | |
| 1676 face_color_supported_p is smart enough to know that grays are | |
| 1677 "supported" as background because we are supposed to use stipple | |
| 1678 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
|
1679 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
|
1680 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
| 24995 | 1681 { |
| 1682 x_destroy_bitmap (f, face->stipple); | |
| 1683 face->stipple = load_pixmap (f, Vface_default_stipple, | |
| 1684 &face->pixmap_w, &face->pixmap_h); | |
| 1685 } | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1686 |
|
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1687 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
| 24995 | 1688 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
| 1689 } | |
| 1690 | |
| 1691 | |
| 1692 /* Free color PIXEL on frame F. */ | |
| 1693 | |
| 1694 void | |
| 1695 unload_color (f, pixel) | |
| 1696 struct frame *f; | |
| 1697 unsigned long pixel; | |
| 1698 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1699 #ifdef HAVE_X_WINDOWS |
|
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1700 if (pixel != -1) |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1701 { |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1702 BLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1703 x_free_colors (f, &pixel, 1); |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1704 UNBLOCK_INPUT; |
|
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1705 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1706 #endif |
| 24995 | 1707 } |
| 1708 | |
| 1709 | |
| 1710 /* Free colors allocated for FACE. */ | |
| 1711 | |
| 1712 static void | |
| 1713 free_face_colors (f, face) | |
| 1714 struct frame *f; | |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1715 struct face *face; |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1716 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1717 #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
|
1718 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
|
1719 return; |
|
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1720 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1721 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1722 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1723 if (!face->foreground_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1724 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1725 x_free_colors (f, &face->foreground, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1726 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1727 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1728 |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1729 if (!face->background_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1730 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1731 x_free_colors (f, &face->background, 1); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1732 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1733 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1734 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1735 if (face->underline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1736 && !face->underline_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1737 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1738 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
|
1739 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1740 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1741 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1742 if (face->overline_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1743 && !face->overline_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1744 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1745 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
|
1746 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1747 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1748 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1749 if (face->strike_through_p |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1750 && !face->strike_through_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1751 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1752 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
|
1753 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1754 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1755 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1756 if (face->box != FACE_NO_BOX |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1757 && !face->box_color_defaulted_p) |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1758 { |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1759 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
|
1760 IF_DEBUG (--ncolors_allocated); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1761 } |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1762 |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1763 UNBLOCK_INPUT; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1764 #endif /* HAVE_X_WINDOWS */ |
| 24995 | 1765 } |
|
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1766 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1767 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 1768 |
| 1769 | |
| 1770 | |
| 1771 /*********************************************************************** | |
| 1772 XLFD Font Names | |
| 1773 ***********************************************************************/ | |
| 1774 | |
| 1775 /* An enumerator for each field of an XLFD font name. */ | |
| 1776 | |
| 1777 enum xlfd_field | |
| 1778 { | |
| 1779 XLFD_FOUNDRY, | |
| 1780 XLFD_FAMILY, | |
| 1781 XLFD_WEIGHT, | |
| 1782 XLFD_SLANT, | |
| 1783 XLFD_SWIDTH, | |
| 1784 XLFD_ADSTYLE, | |
| 1785 XLFD_PIXEL_SIZE, | |
| 1786 XLFD_POINT_SIZE, | |
| 1787 XLFD_RESX, | |
| 1788 XLFD_RESY, | |
| 1789 XLFD_SPACING, | |
| 1790 XLFD_AVGWIDTH, | |
| 1791 XLFD_REGISTRY, | |
| 1792 XLFD_ENCODING, | |
| 1793 XLFD_LAST | |
| 1794 }; | |
| 1795 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1796 /* An enumerator for each possible slant value of a font. Taken from |
| 24995 | 1797 the XLFD specification. */ |
| 1798 | |
| 1799 enum xlfd_slant | |
| 1800 { | |
| 1801 XLFD_SLANT_UNKNOWN, | |
| 1802 XLFD_SLANT_ROMAN, | |
| 1803 XLFD_SLANT_ITALIC, | |
| 1804 XLFD_SLANT_OBLIQUE, | |
| 1805 XLFD_SLANT_REVERSE_ITALIC, | |
| 1806 XLFD_SLANT_REVERSE_OBLIQUE, | |
| 1807 XLFD_SLANT_OTHER | |
| 1808 }; | |
| 1809 | |
| 1810 /* Relative font weight according to XLFD documentation. */ | |
| 1811 | |
| 1812 enum xlfd_weight | |
| 1813 { | |
| 1814 XLFD_WEIGHT_UNKNOWN, | |
| 1815 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
| 1816 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
| 1817 XLFD_WEIGHT_LIGHT, /* 30 */ | |
| 1818 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
| 1819 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1820 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
| 1821 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
| 1822 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
| 1823 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
| 1824 }; | |
| 1825 | |
| 1826 /* Relative proportionate width. */ | |
| 1827 | |
| 1828 enum xlfd_swidth | |
| 1829 { | |
| 1830 XLFD_SWIDTH_UNKNOWN, | |
| 1831 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
| 1832 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
| 1833 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
| 1834 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
| 1835 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
| 1836 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
| 1837 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
| 1838 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
| 1839 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
| 1840 }; | |
| 1841 | |
| 1842 /* Structure used for tables mapping XLFD weight, slant, and width | |
| 1843 names to numeric and symbolic values. */ | |
| 1844 | |
| 1845 struct table_entry | |
| 1846 { | |
| 1847 char *name; | |
| 1848 int numeric; | |
| 1849 Lisp_Object *symbol; | |
| 1850 }; | |
| 1851 | |
| 1852 /* Table of XLFD slant names and their numeric and symbolic | |
| 1853 representations. This table must be sorted by slant names in | |
| 1854 ascending order. */ | |
| 1855 | |
| 1856 static struct table_entry slant_table[] = | |
| 1857 { | |
| 1858 {"i", XLFD_SLANT_ITALIC, &Qitalic}, | |
| 1859 {"o", XLFD_SLANT_OBLIQUE, &Qoblique}, | |
| 1860 {"ot", XLFD_SLANT_OTHER, &Qitalic}, | |
| 1861 {"r", XLFD_SLANT_ROMAN, &Qnormal}, | |
| 1862 {"ri", XLFD_SLANT_REVERSE_ITALIC, &Qreverse_italic}, | |
| 1863 {"ro", XLFD_SLANT_REVERSE_OBLIQUE, &Qreverse_oblique} | |
| 1864 }; | |
| 1865 | |
| 1866 /* Table of XLFD weight names. This table must be sorted by weight | |
| 1867 names in ascending order. */ | |
| 1868 | |
| 1869 static struct table_entry weight_table[] = | |
| 1870 { | |
| 1871 {"black", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold}, | |
| 1872 {"bold", XLFD_WEIGHT_BOLD, &Qbold}, | |
| 1873 {"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
|
1874 {"demi", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
| 24995 | 1875 {"demibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
| 1876 {"extralight", XLFD_WEIGHT_EXTRA_LIGHT, &Qextra_light}, | |
| 1877 {"extrabold", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
| 1878 {"heavy", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
| 1879 {"light", XLFD_WEIGHT_LIGHT, &Qlight}, | |
| 1880 {"medium", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
| 1881 {"normal", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
| 1882 {"regular", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
| 1883 {"semibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, | |
| 1884 {"semilight", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light}, | |
| 1885 {"ultralight", XLFD_WEIGHT_ULTRA_LIGHT, &Qultra_light}, | |
| 1886 {"ultrabold", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold} | |
| 1887 }; | |
| 1888 | |
| 1889 /* Table of XLFD width names. This table must be sorted by width | |
| 1890 names in ascending order. */ | |
| 1891 | |
| 1892 static struct table_entry swidth_table[] = | |
| 1893 { | |
| 1894 {"compressed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
| 1895 {"condensed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
| 1896 {"demiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
| 1897 {"expanded", XLFD_SWIDTH_EXPANDED, &Qexpanded}, | |
| 1898 {"extracondensed", XLFD_SWIDTH_EXTRA_CONDENSED, &Qextra_condensed}, | |
| 1899 {"extraexpanded", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded}, | |
| 1900 {"medium", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
| 1901 {"narrow", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
| 1902 {"normal", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
| 1903 {"regular", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
| 1904 {"semicondensed", XLFD_SWIDTH_SEMI_CONDENSED, &Qsemi_condensed}, | |
| 1905 {"semiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
| 1906 {"ultracondensed", XLFD_SWIDTH_ULTRA_CONDENSED, &Qultra_condensed}, | |
| 1907 {"ultraexpanded", XLFD_SWIDTH_ULTRA_EXPANDED, &Qultra_expanded}, | |
| 1908 {"wide", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded} | |
| 1909 }; | |
| 1910 | |
| 1911 /* Structure used to hold the result of splitting font names in XLFD | |
| 1912 format into their fields. */ | |
| 1913 | |
| 1914 struct font_name | |
| 1915 { | |
| 1916 /* The original name which is modified destructively by | |
| 1917 split_font_name. The pointer is kept here to be able to free it | |
| 1918 if it was allocated from the heap. */ | |
| 1919 char *name; | |
| 1920 | |
| 1921 /* Font name fields. Each vector element points into `name' above. | |
| 1922 Fields are NUL-terminated. */ | |
| 1923 char *fields[XLFD_LAST]; | |
| 1924 | |
| 1925 /* Numeric values for those fields that interest us. See | |
| 1926 split_font_name for which these are. */ | |
| 1927 int numeric[XLFD_LAST]; | |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1928 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1929 /* If the original name matches one of Vface_font_rescale_alist, |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1930 the value is the corresponding rescale ratio. Otherwise, the |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1931 value is 1.0. */ |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1932 double rescale_ratio; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1933 |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1934 /* Lower value mean higher priority. */ |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1935 int registry_priority; |
| 24995 | 1936 }; |
| 1937 | |
| 1938 /* The frame in effect when sorting font names. Set temporarily in | |
| 1939 sort_fonts so that it is available in font comparison functions. */ | |
| 1940 | |
| 1941 static struct frame *font_frame; | |
| 1942 | |
| 1943 /* Order by which font selection chooses fonts. The default values | |
| 1944 mean `first, find a best match for the font width, then for the | |
| 1945 font height, then for weight, then for slant.' This variable can be | |
| 1946 set via set-face-font-sort-order. */ | |
| 1947 | |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
1948 #ifdef MAC_OS |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1949 static int font_sort_order[4] = { |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1950 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
|
1951 }; |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
1952 #else |
| 24995 | 1953 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
|
1954 #endif |
| 24995 | 1955 |
| 1956 /* Look up FONT.fields[FIELD_INDEX] in TABLE which has DIM entries. | |
| 1957 TABLE must be sorted by TABLE[i]->name in ascending order. Value | |
| 1958 is a pointer to the matching table entry or null if no table entry | |
| 1959 matches. */ | |
| 1960 | |
| 1961 static struct table_entry * | |
| 1962 xlfd_lookup_field_contents (table, dim, font, field_index) | |
| 1963 struct table_entry *table; | |
| 1964 int dim; | |
| 1965 struct font_name *font; | |
| 1966 int field_index; | |
| 1967 { | |
| 1968 /* Function split_font_name converts fields to lower-case, so there | |
| 1969 is no need to use xstrlwr or xstricmp here. */ | |
| 1970 char *s = font->fields[field_index]; | |
| 1971 int low, mid, high, cmp; | |
| 1972 | |
| 1973 low = 0; | |
| 1974 high = dim - 1; | |
| 1975 | |
| 1976 while (low <= high) | |
| 1977 { | |
| 1978 mid = (low + high) / 2; | |
| 1979 cmp = strcmp (table[mid].name, s); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1980 |
| 24995 | 1981 if (cmp < 0) |
| 1982 low = mid + 1; | |
| 1983 else if (cmp > 0) | |
| 1984 high = mid - 1; | |
| 1985 else | |
| 1986 return table + mid; | |
| 1987 } | |
| 1988 | |
| 1989 return NULL; | |
| 1990 } | |
| 1991 | |
| 1992 | |
| 1993 /* Return a numeric representation for font name field | |
| 1994 FONT.fields[FIELD_INDEX]. The field is looked up in TABLE which | |
| 1995 has DIM entries. Value is the numeric value found or DFLT if no | |
| 1996 table entry matches. This function is used to translate weight, | |
| 1997 slant, and swidth names of XLFD font names to numeric values. */ | |
| 1998 | |
| 1999 static INLINE int | |
| 2000 xlfd_numeric_value (table, dim, font, field_index, dflt) | |
| 2001 struct table_entry *table; | |
| 2002 int dim; | |
| 2003 struct font_name *font; | |
| 2004 int field_index; | |
| 2005 int dflt; | |
| 2006 { | |
| 2007 struct table_entry *p; | |
| 2008 p = xlfd_lookup_field_contents (table, dim, font, field_index); | |
| 2009 return p ? p->numeric : dflt; | |
| 2010 } | |
| 2011 | |
| 2012 | |
| 2013 /* Return a symbolic representation for font name field | |
| 2014 FONT.fields[FIELD_INDEX]. The field is looked up in TABLE which | |
| 2015 has DIM entries. Value is the symbolic value found or DFLT if no | |
| 2016 table entry matches. This function is used to translate weight, | |
| 2017 slant, and swidth names of XLFD font names to symbols. */ | |
| 2018 | |
| 2019 static INLINE Lisp_Object | |
| 2020 xlfd_symbolic_value (table, dim, font, field_index, dflt) | |
| 2021 struct table_entry *table; | |
| 2022 int dim; | |
| 2023 struct font_name *font; | |
| 2024 int field_index; | |
|
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
2025 Lisp_Object dflt; |
| 24995 | 2026 { |
| 2027 struct table_entry *p; | |
| 2028 p = xlfd_lookup_field_contents (table, dim, font, field_index); | |
| 2029 return p ? *p->symbol : dflt; | |
| 2030 } | |
| 2031 | |
| 2032 | |
| 2033 /* Return a numeric value for the slant of the font given by FONT. */ | |
| 2034 | |
| 2035 static INLINE int | |
| 2036 xlfd_numeric_slant (font) | |
| 2037 struct font_name *font; | |
| 2038 { | |
| 2039 return xlfd_numeric_value (slant_table, DIM (slant_table), | |
| 2040 font, XLFD_SLANT, XLFD_SLANT_ROMAN); | |
| 2041 } | |
| 2042 | |
| 2043 | |
| 2044 /* Return a symbol representing the weight of the font given by FONT. */ | |
| 2045 | |
| 2046 static INLINE Lisp_Object | |
| 2047 xlfd_symbolic_slant (font) | |
| 2048 struct font_name *font; | |
| 2049 { | |
| 2050 return xlfd_symbolic_value (slant_table, DIM (slant_table), | |
| 2051 font, XLFD_SLANT, Qnormal); | |
| 2052 } | |
| 2053 | |
| 2054 | |
| 2055 /* Return a numeric value for the weight of the font given by FONT. */ | |
| 2056 | |
| 2057 static INLINE int | |
| 2058 xlfd_numeric_weight (font) | |
| 2059 struct font_name *font; | |
| 2060 { | |
| 2061 return xlfd_numeric_value (weight_table, DIM (weight_table), | |
| 2062 font, XLFD_WEIGHT, XLFD_WEIGHT_MEDIUM); | |
| 2063 } | |
| 2064 | |
| 2065 | |
| 2066 /* Return a symbol representing the slant of the font given by FONT. */ | |
| 2067 | |
| 2068 static INLINE Lisp_Object | |
| 2069 xlfd_symbolic_weight (font) | |
| 2070 struct font_name *font; | |
| 2071 { | |
| 2072 return xlfd_symbolic_value (weight_table, DIM (weight_table), | |
| 2073 font, XLFD_WEIGHT, Qnormal); | |
| 2074 } | |
| 2075 | |
| 2076 | |
| 2077 /* Return a numeric value for the swidth of the font whose XLFD font | |
| 2078 name fields are found in FONT. */ | |
| 2079 | |
| 2080 static INLINE int | |
| 2081 xlfd_numeric_swidth (font) | |
| 2082 struct font_name *font; | |
| 2083 { | |
| 2084 return xlfd_numeric_value (swidth_table, DIM (swidth_table), | |
| 2085 font, XLFD_SWIDTH, XLFD_SWIDTH_MEDIUM); | |
| 2086 } | |
| 2087 | |
| 2088 | |
| 2089 /* Return a symbolic value for the swidth of FONT. */ | |
| 2090 | |
| 2091 static INLINE Lisp_Object | |
| 2092 xlfd_symbolic_swidth (font) | |
| 2093 struct font_name *font; | |
| 2094 { | |
| 2095 return xlfd_symbolic_value (swidth_table, DIM (swidth_table), | |
| 2096 font, XLFD_SWIDTH, Qnormal); | |
| 2097 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2098 |
| 24995 | 2099 |
| 2100 /* Look up the entry of SYMBOL in the vector TABLE which has DIM | |
| 2101 entries. Value is a pointer to the matching table entry or null if | |
| 2102 no element of TABLE contains SYMBOL. */ | |
| 2103 | |
| 2104 static struct table_entry * | |
| 2105 face_value (table, dim, symbol) | |
| 2106 struct table_entry *table; | |
| 2107 int dim; | |
| 2108 Lisp_Object symbol; | |
| 2109 { | |
| 2110 int i; | |
| 2111 | |
| 2112 xassert (SYMBOLP (symbol)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2113 |
| 24995 | 2114 for (i = 0; i < dim; ++i) |
| 2115 if (EQ (*table[i].symbol, symbol)) | |
| 2116 break; | |
| 2117 | |
| 2118 return i < dim ? table + i : NULL; | |
| 2119 } | |
| 2120 | |
| 2121 | |
| 2122 /* Return a numeric value for SYMBOL in the vector TABLE which has DIM | |
| 2123 entries. Value is -1 if SYMBOL is not found in TABLE. */ | |
| 2124 | |
| 2125 static INLINE int | |
| 2126 face_numeric_value (table, dim, symbol) | |
| 2127 struct table_entry *table; | |
| 2128 int dim; | |
| 2129 Lisp_Object symbol; | |
| 2130 { | |
| 2131 struct table_entry *p = face_value (table, dim, symbol); | |
| 2132 return p ? p->numeric : -1; | |
| 2133 } | |
| 2134 | |
| 2135 | |
| 2136 /* Return a numeric value representing the weight specified by Lisp | |
| 2137 symbol WEIGHT. Value is one of the enumerators of enum | |
| 2138 xlfd_weight. */ | |
| 2139 | |
| 2140 static INLINE int | |
| 2141 face_numeric_weight (weight) | |
| 2142 Lisp_Object weight; | |
| 2143 { | |
| 2144 return face_numeric_value (weight_table, DIM (weight_table), weight); | |
| 2145 } | |
| 2146 | |
| 2147 | |
| 2148 /* Return a numeric value representing the slant specified by Lisp | |
| 2149 symbol SLANT. Value is one of the enumerators of enum xlfd_slant. */ | |
| 2150 | |
| 2151 static INLINE int | |
| 2152 face_numeric_slant (slant) | |
| 2153 Lisp_Object slant; | |
| 2154 { | |
| 2155 return face_numeric_value (slant_table, DIM (slant_table), slant); | |
| 2156 } | |
| 2157 | |
| 2158 | |
| 2159 /* Return a numeric value representing the swidth specified by Lisp | |
| 2160 symbol WIDTH. Value is one of the enumerators of enum xlfd_swidth. */ | |
| 2161 | |
| 2162 static int | |
| 2163 face_numeric_swidth (width) | |
| 2164 Lisp_Object width; | |
| 2165 { | |
| 2166 return face_numeric_value (swidth_table, DIM (swidth_table), width); | |
| 2167 } | |
| 2168 | |
| 2169 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2170 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 2171 |
| 2172 /* Return non-zero if FONT is the name of a fixed-pitch font. */ | |
| 2173 | |
| 2174 static INLINE int | |
| 2175 xlfd_fixed_p (font) | |
| 2176 struct font_name *font; | |
| 2177 { | |
| 2178 /* Function split_font_name converts fields to lower-case, so there | |
| 2179 is no need to use tolower here. */ | |
| 2180 return *font->fields[XLFD_SPACING] != 'p'; | |
| 2181 } | |
| 2182 | |
| 2183 | |
| 2184 /* Return the point size of FONT on frame F, measured in 1/10 pt. | |
| 2185 | |
| 2186 The actual height of the font when displayed on F depends on the | |
| 2187 resolution of both the font and frame. For example, a 10pt font | |
| 2188 designed for a 100dpi display will display larger than 10pt on a | |
| 2189 75dpi display. (It's not unusual to use fonts not designed for the | |
| 2190 display one is using. For example, some intlfonts are available in | |
| 2191 72dpi versions, only.) | |
| 2192 | |
| 2193 Value is the real point size of FONT on frame F, or 0 if it cannot | |
| 2194 be determined. */ | |
| 2195 | |
| 2196 static INLINE int | |
| 2197 xlfd_point_size (f, font) | |
| 2198 struct frame *f; | |
| 2199 struct font_name *font; | |
| 2200 { | |
| 2201 double resy = FRAME_X_DISPLAY_INFO (f)->resy; | |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2202 char *pixel_field = font->fields[XLFD_PIXEL_SIZE]; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2203 double pixel; |
| 24995 | 2204 int real_pt; |
| 2205 | |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2206 if (*pixel_field == '[') |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2207 { |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2208 /* The pixel size field is `[A B C D]' which specifies |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2209 a transformation matrix. |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2210 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2211 A B 0 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2212 C D 0 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2213 0 0 1 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2214 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2215 by which all glyphs of the font are transformed. The spec |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2216 says that s scalar value N for the pixel size is equivalent |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2217 to A = N * resx/resy, B = C = 0, D = N. */ |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2218 char *start = pixel_field + 1, *end; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2219 double matrix[4]; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2220 int i; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2221 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2222 for (i = 0; i < 4; ++i) |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2223 { |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2224 matrix[i] = strtod (start, &end); |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2225 start = end; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2226 } |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2227 |
|
37798
d4b4c850abc0
(xlfd_point_size): Don't divide pixel size from
Gerd Moellmann <gerd@gnu.org>
parents:
37756
diff
changeset
|
2228 pixel = matrix[3]; |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2229 } |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2230 else |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2231 pixel = atoi (pixel_field); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2232 |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2233 if (pixel == 0) |
| 24995 | 2234 real_pt = 0; |
| 2235 else | |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2236 real_pt = PT_PER_INCH * 10.0 * pixel / resy + 0.5; |
| 24995 | 2237 |
| 2238 return real_pt; | |
| 2239 } | |
| 2240 | |
| 2241 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2242 /* Return point size of PIXEL dots while considering Y-resultion (DPI) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2243 of frame F. This function is used to guess a point size of font |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2244 when only the pixel height of the font is available. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2245 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2246 static INLINE int |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2247 pixel_point_size (f, pixel) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2248 struct frame *f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2249 int pixel; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2250 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2251 double resy = FRAME_X_DISPLAY_INFO (f)->resy; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2252 double real_pt; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2253 int int_pt; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2254 |
| 34882 | 2255 /* As one inch is PT_PER_INCH points, PT_PER_INCH/RESY gives the |
| 2256 point size of one dot. */ | |
| 2257 real_pt = pixel * PT_PER_INCH / resy; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2258 int_pt = real_pt + 0.5; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2259 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2260 return int_pt; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2261 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2262 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2263 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2264 /* 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
|
2265 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2266 static double |
|
51401
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
2267 font_rescale_ratio (name) |
|
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
2268 char *name; |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2269 { |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
2270 Lisp_Object tail, elt; |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2271 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2272 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
|
2273 { |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2274 elt = XCAR (tail); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2275 if (STRINGP (XCAR (elt)) && FLOATP (XCDR (elt)) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2276 && 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
|
2277 return XFLOAT_DATA (XCDR (elt)); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2278 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2279 return 1.0; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2280 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2281 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2282 |
| 24995 | 2283 /* Split XLFD font name FONT->name destructively into NUL-terminated, |
| 2284 lower-case fields in FONT->fields. NUMERIC_P non-zero means | |
| 2285 compute numeric values for fields XLFD_POINT_SIZE, XLFD_SWIDTH, | |
| 2286 XLFD_RESY, XLFD_SLANT, and XLFD_WEIGHT in FONT->numeric. Value is | |
| 2287 zero if the font name doesn't have the format we expect. The | |
| 2288 expected format is a font name that starts with a `-' and has | |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2289 XLFD_LAST fields separated by `-'. */ |
| 24995 | 2290 |
| 2291 static int | |
| 2292 split_font_name (f, font, numeric_p) | |
| 2293 struct frame *f; | |
| 2294 struct font_name *font; | |
| 2295 int numeric_p; | |
| 2296 { | |
| 2297 int i = 0; | |
| 2298 int success_p; | |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2299 double rescale_ratio; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2300 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2301 if (numeric_p) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2302 /* This must be done before splitting the font name. */ |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2303 rescale_ratio = font_rescale_ratio (font->name); |
| 24995 | 2304 |
| 2305 if (*font->name == '-') | |
| 2306 { | |
| 2307 char *p = xstrlwr (font->name) + 1; | |
| 2308 | |
|
37716
018b29727e8d
(split_font_name): Make sure to leave the loop
Gerd Moellmann <gerd@gnu.org>
parents:
37714
diff
changeset
|
2309 while (i < XLFD_LAST) |
| 24995 | 2310 { |
| 2311 font->fields[i] = p; | |
|
37716
018b29727e8d
(split_font_name): Make sure to leave the loop
Gerd Moellmann <gerd@gnu.org>
parents:
37714
diff
changeset
|
2312 ++i; |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2313 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2314 /* Pixel and point size may be of the form `[....]'. For |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2315 BNF, see XLFD spec, chapter 4. Negative values are |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2316 indicated by tilde characters which we replace with |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2317 `-' characters, here. */ |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2318 if (*p == '[' |
|
37736
d6f944b128c4
(split_font_name): Handle `[...]' for the right
Gerd Moellmann <gerd@gnu.org>
parents:
37724
diff
changeset
|
2319 && (i - 1 == XLFD_PIXEL_SIZE |
|
d6f944b128c4
(split_font_name): Handle `[...]' for the right
Gerd Moellmann <gerd@gnu.org>
parents:
37724
diff
changeset
|
2320 || i - 1 == XLFD_POINT_SIZE)) |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2321 { |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2322 char *start, *end; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2323 int j; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2324 |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2325 for (++p; *p && *p != ']'; ++p) |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2326 if (*p == '~') |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2327 *p = '-'; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2328 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2329 /* Check that the matrix contains 4 floating point |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2330 numbers. */ |
|
37756
2cea00ea4d76
(split_font_name): Use the right field when
Gerd Moellmann <gerd@gnu.org>
parents:
37736
diff
changeset
|
2331 for (j = 0, start = font->fields[i - 1] + 1; |
|
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2332 j < 4; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2333 ++j, start = end) |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2334 if (strtod (start, &end) == 0 && start == end) |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2335 break; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2336 |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2337 if (j < 4) |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2338 break; |
|
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2339 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2340 |
| 24995 | 2341 while (*p && *p != '-') |
| 2342 ++p; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2343 |
| 24995 | 2344 if (*p != '-') |
| 2345 break; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2346 |
| 24995 | 2347 *p++ = 0; |
| 2348 } | |
| 2349 } | |
| 2350 | |
| 2351 success_p = i == XLFD_LAST; | |
| 2352 | |
| 2353 /* If requested, and font name was in the expected format, | |
| 2354 compute numeric values for some fields. */ | |
| 2355 if (numeric_p && success_p) | |
| 2356 { | |
| 2357 font->numeric[XLFD_POINT_SIZE] = xlfd_point_size (f, font); | |
| 2358 font->numeric[XLFD_RESY] = atoi (font->fields[XLFD_RESY]); | |
| 2359 font->numeric[XLFD_SLANT] = xlfd_numeric_slant (font); | |
| 2360 font->numeric[XLFD_WEIGHT] = xlfd_numeric_weight (font); | |
| 2361 font->numeric[XLFD_SWIDTH] = xlfd_numeric_swidth (font); | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
2362 font->numeric[XLFD_AVGWIDTH] = atoi (font->fields[XLFD_AVGWIDTH]); |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2363 font->rescale_ratio = rescale_ratio; |
| 24995 | 2364 } |
| 2365 | |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2366 /* Initialize it to zero. It will be overridden by font_list while |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2367 trying alternate registries. */ |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2368 font->registry_priority = 0; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2369 |
| 24995 | 2370 return success_p; |
| 2371 } | |
| 2372 | |
| 2373 | |
| 2374 /* Build an XLFD font name from font name fields in FONT. Value is a | |
| 2375 pointer to the font name, which is allocated via xmalloc. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2376 |
| 24995 | 2377 static char * |
| 2378 build_font_name (font) | |
| 2379 struct font_name *font; | |
| 2380 { | |
| 2381 int i; | |
| 2382 int size = 100; | |
| 2383 char *font_name = (char *) xmalloc (size); | |
| 2384 int total_length = 0; | |
| 2385 | |
| 2386 for (i = 0; i < XLFD_LAST; ++i) | |
| 2387 { | |
| 2388 /* Add 1 because of the leading `-'. */ | |
| 2389 int len = strlen (font->fields[i]) + 1; | |
| 2390 | |
| 2391 /* Reallocate font_name if necessary. Add 1 for the final | |
| 2392 NUL-byte. */ | |
| 2393 if (total_length + len + 1 >= size) | |
| 2394 { | |
| 2395 int new_size = max (2 * size, size + len + 1); | |
| 2396 int sz = new_size * sizeof *font_name; | |
| 2397 font_name = (char *) xrealloc (font_name, sz); | |
| 2398 size = new_size; | |
| 2399 } | |
| 2400 | |
| 2401 font_name[total_length] = '-'; | |
| 2402 bcopy (font->fields[i], font_name + total_length + 1, len - 1); | |
| 2403 total_length += len; | |
| 2404 } | |
| 2405 | |
| 2406 font_name[total_length] = 0; | |
| 2407 return font_name; | |
| 2408 } | |
| 2409 | |
| 2410 | |
| 2411 /* Free an array FONTS of N font_name structures. This frees FONTS | |
| 2412 itself and all `name' fields in its elements. */ | |
| 2413 | |
| 2414 static INLINE void | |
| 2415 free_font_names (fonts, n) | |
| 2416 struct font_name *fonts; | |
| 2417 int n; | |
| 2418 { | |
| 2419 while (n) | |
| 2420 xfree (fonts[--n].name); | |
| 2421 xfree (fonts); | |
| 2422 } | |
| 2423 | |
| 2424 | |
| 2425 /* Sort vector FONTS of font_name structures which contains NFONTS | |
| 2426 elements using qsort and comparison function CMPFN. F is the frame | |
| 2427 on which the fonts will be used. The global variable font_frame | |
| 2428 is temporarily set to F to make it available in CMPFN. */ | |
| 2429 | |
| 2430 static INLINE void | |
| 2431 sort_fonts (f, fonts, nfonts, cmpfn) | |
| 2432 struct frame *f; | |
| 2433 struct font_name *fonts; | |
| 2434 int nfonts; | |
| 2435 int (*cmpfn) P_ ((const void *, const void *)); | |
| 2436 { | |
| 2437 font_frame = f; | |
| 2438 qsort (fonts, nfonts, sizeof *fonts, cmpfn); | |
| 2439 font_frame = NULL; | |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
2440 } |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
2441 |
| 24995 | 2442 |
| 2443 /* Get fonts matching PATTERN on frame F. If F is null, use the first | |
| 2444 display in x_display_list. FONTS is a pointer to a vector of | |
| 2445 NFONTS font_name structures. TRY_ALTERNATIVES_P non-zero means try | |
| 2446 alternative patterns from Valternate_fontname_alist if no fonts are | |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2447 found matching PATTERN. |
| 24995 | 2448 |
| 2449 For all fonts found, set FONTS[i].name to the name of the font, | |
| 2450 allocated via xmalloc, and split font names into fields. Ignore | |
|
35371
dc0d772c9d3d
(x_face_list_fonts): Don't BLOCK_INPUT around the
Gerd Moellmann <gerd@gnu.org>
parents:
35369
diff
changeset
|
2451 fonts that we can't parse. Value is the number of fonts found. */ |
| 24995 | 2452 |
| 2453 static int | |
|
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
|
2454 x_face_list_fonts (f, pattern, pfonts, nfonts, try_alternatives_p) |
| 24995 | 2455 struct frame *f; |
| 2456 char *pattern; | |
|
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
|
2457 struct font_name **pfonts; |
| 24995 | 2458 int nfonts, try_alternatives_p; |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2459 { |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2460 int n, nignored; |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2461 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2462 /* NTEMACS_TODO : currently this uses w32_list_fonts, but it may be |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2463 better to do it the other way around. */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2464 Lisp_Object lfonts; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2465 Lisp_Object lpattern, tem; |
|
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
|
2466 struct font_name *fonts = 0; |
|
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
|
2467 int num_fonts = nfonts; |
|
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
|
2468 |
|
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
|
2469 *pfonts = 0; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2470 lpattern = build_string (pattern); |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2471 |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2472 /* Get the list of fonts matching PATTERN. */ |
|
35371
dc0d772c9d3d
(x_face_list_fonts): Don't BLOCK_INPUT around the
Gerd Moellmann <gerd@gnu.org>
parents:
35369
diff
changeset
|
2473 #ifdef WINDOWSNT |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2474 BLOCK_INPUT; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2475 lfonts = w32_list_fonts (f, lpattern, 0, nfonts); |
|
35371
dc0d772c9d3d
(x_face_list_fonts): Don't BLOCK_INPUT around the
Gerd Moellmann <gerd@gnu.org>
parents:
35369
diff
changeset
|
2476 UNBLOCK_INPUT; |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2477 #else |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2478 lfonts = x_list_fonts (f, lpattern, -1, nfonts); |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
2479 #endif |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2480 |
|
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
|
2481 if (nfonts < 0 && CONSP (lfonts)) |
|
49914
b4b6ede28a6f
(x_face_list_fonts): Fix int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49864
diff
changeset
|
2482 num_fonts = XFASTINT (Flength (lfonts)); |
|
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
2483 |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2484 /* Make a copy of the font names we got from X, and |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2485 split them into fields. */ |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2486 n = nignored = 0; |
|
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
|
2487 for (tem = lfonts; CONSP (tem) && n < num_fonts; tem = XCDR (tem)) |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2488 { |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2489 Lisp_Object elt, tail; |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
2490 const char *name = SDATA (XCAR (tem)); |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2491 |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2492 /* Ignore fonts matching a pattern from face-ignored-fonts. */ |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2493 for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail)) |
| 24995 | 2494 { |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2495 elt = XCAR (tail); |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2496 if (STRINGP (elt) |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2497 && fast_c_string_match_ignore_case (elt, name) >= 0) |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2498 break; |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2499 } |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2500 if (!NILP (tail)) |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2501 { |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2502 ++nignored; |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2503 continue; |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2504 } |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2505 |
|
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
|
2506 if (! fonts) |
|
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
|
2507 { |
|
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
|
2508 *pfonts = (struct font_name *) xmalloc (num_fonts * sizeof **pfonts); |
|
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
|
2509 fonts = *pfonts; |
|
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
|
2510 } |
|
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
|
2511 |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2512 /* Make a copy of the font name. */ |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2513 fonts[n].name = xstrdup (name); |
|
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2514 |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2515 if (split_font_name (f, fonts + n, 1)) |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2516 { |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2517 if (font_scalable_p (fonts + n) |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2518 && !may_use_scalable_font_p (name)) |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2519 { |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2520 ++nignored; |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2521 xfree (fonts[n].name); |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2522 } |
| 24995 | 2523 else |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2524 ++n; |
| 24995 | 2525 } |
|
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2526 else |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2527 xfree (fonts[n].name); |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2528 } |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2529 |
| 24995 | 2530 /* If no fonts found, try patterns from Valternate_fontname_alist. */ |
| 2531 if (n == 0 && try_alternatives_p) | |
| 2532 { | |
| 2533 Lisp_Object list = Valternate_fontname_alist; | |
| 2534 | |
|
49863
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2535 if (*pfonts) |
|
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2536 { |
|
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2537 xfree (*pfonts); |
|
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2538 *pfonts = 0; |
|
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2539 } |
|
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2540 |
| 24995 | 2541 while (CONSP (list)) |
| 2542 { | |
| 2543 Lisp_Object entry = XCAR (list); | |
| 2544 if (CONSP (entry) | |
| 2545 && STRINGP (XCAR (entry)) | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2546 && strcmp (SDATA (XCAR (entry)), pattern) == 0) |
| 24995 | 2547 break; |
| 2548 list = XCDR (list); | |
| 2549 } | |
| 2550 | |
| 2551 if (CONSP (list)) | |
| 2552 { | |
| 2553 Lisp_Object patterns = XCAR (list); | |
| 2554 Lisp_Object name; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2555 |
| 24995 | 2556 while (CONSP (patterns) |
| 2557 /* If list is screwed up, give up. */ | |
| 2558 && (name = XCAR (patterns), | |
| 2559 STRINGP (name)) | |
| 2560 /* Ignore patterns equal to PATTERN because we tried that | |
| 2561 already with no success. */ | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2562 && (strcmp (SDATA (name), pattern) == 0 |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2563 || (n = x_face_list_fonts (f, SDATA (name), |
|
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
|
2564 pfonts, nfonts, 0), |
| 24995 | 2565 n == 0))) |
| 2566 patterns = XCDR (patterns); | |
| 2567 } | |
| 2568 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2569 |
| 24995 | 2570 return n; |
| 2571 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2572 |
| 24995 | 2573 |
|
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2574 /* Check if a font matching pattern_offset_t on frame F is available |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2575 or not. PATTERN may be a cons (FAMILY . REGISTRY), in which case, |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2576 a font name pattern is generated from FAMILY and REGISTRY. */ |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2577 |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2578 int |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2579 face_font_available_p (f, pattern) |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2580 struct frame *f; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2581 Lisp_Object pattern; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2582 { |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2583 Lisp_Object fonts; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2584 |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2585 if (! STRINGP (pattern)) |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2586 { |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2587 Lisp_Object family, registry; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2588 char *family_str, *registry_str, *pattern_str; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2589 |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2590 CHECK_CONS (pattern); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2591 family = XCAR (pattern); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2592 if (NILP (family)) |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2593 family_str = "*"; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2594 else |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2595 { |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2596 CHECK_STRING (family); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2597 family_str = (char *) SDATA (family); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2598 } |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2599 registry = XCDR (pattern); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2600 if (NILP (registry)) |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2601 registry_str = "*"; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2602 else |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2603 { |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2604 CHECK_STRING (registry); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2605 registry_str = (char *) SDATA (registry); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2606 } |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2607 |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2608 pattern_str = (char *) alloca (strlen (family_str) |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2609 + strlen (registry_str) |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2610 + 10); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2611 strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-"); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2612 strcat (pattern_str, family_str); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2613 strcat (pattern_str, "-*-"); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2614 strcat (pattern_str, registry_str); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2615 if (!index (registry_str, '-')) |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2616 { |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2617 if (registry_str[strlen (registry_str) - 1] == '*') |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2618 strcat (pattern_str, "-*"); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2619 else |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2620 strcat (pattern_str, "*-*"); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2621 } |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2622 pattern = build_string (pattern_str); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2623 } |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2624 |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2625 /* Get the list of fonts matching PATTERN. */ |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2626 #ifdef WINDOWSNT |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2627 BLOCK_INPUT; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2628 fonts = w32_list_fonts (f, pattern, 0, 1); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2629 UNBLOCK_INPUT; |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2630 #else |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2631 fonts = x_list_fonts (f, pattern, -1, 1); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2632 #endif |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2633 return XINT (Flength (fonts)); |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2634 } |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2635 |
|
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2636 |
| 24995 | 2637 /* Determine fonts matching PATTERN on frame F. Sort resulting fonts |
| 2638 using comparison function CMPFN. Value is the number of fonts | |
| 2639 found. If value is non-zero, *FONTS is set to a vector of | |
| 2640 font_name structures allocated from the heap containing matching | |
| 2641 fonts. Each element of *FONTS contains a name member that is also | |
| 2642 allocated from the heap. Font names in these structures are split | |
| 2643 into fields. Use free_font_names to free such an array. */ | |
| 2644 | |
| 2645 static int | |
| 2646 sorted_font_list (f, pattern, cmpfn, fonts) | |
| 2647 struct frame *f; | |
| 2648 char *pattern; | |
| 2649 int (*cmpfn) P_ ((const void *, const void *)); | |
| 2650 struct font_name **fonts; | |
| 2651 { | |
| 2652 int nfonts; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2653 |
| 24995 | 2654 /* Get the list of fonts matching pattern. 100 should suffice. */ |
| 25270 | 2655 nfonts = DEFAULT_FONT_LIST_LIMIT; |
|
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
|
2656 if (INTEGERP (Vfont_list_limit)) |
|
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
|
2657 nfonts = XINT (Vfont_list_limit); |
|
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
|
2658 |
|
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
|
2659 *fonts = NULL; |
|
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
|
2660 nfonts = x_face_list_fonts (f, pattern, fonts, nfonts, 1); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2661 |
|
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2662 /* Sort the resulting array and return it in *FONTS. If no |
| 24995 | 2663 fonts were found, make sure to set *FONTS to null. */ |
| 2664 if (nfonts) | |
| 2665 sort_fonts (f, *fonts, nfonts, cmpfn); | |
|
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
|
2666 else if (*fonts) |
| 24995 | 2667 { |
| 2668 xfree (*fonts); | |
| 2669 *fonts = NULL; | |
| 2670 } | |
| 2671 | |
| 2672 return nfonts; | |
| 2673 } | |
| 2674 | |
| 2675 | |
| 2676 /* Compare two font_name structures *A and *B. Value is analogous to | |
| 2677 strcmp. Sort order is given by the global variable | |
| 2678 font_sort_order. Font names are sorted so that, everything else | |
| 2679 being equal, fonts with a resolution closer to that of the frame on | |
| 2680 which they are used are listed first. The global variable | |
| 2681 font_frame is the frame on which we operate. */ | |
| 2682 | |
| 2683 static int | |
| 2684 cmp_font_names (a, b) | |
| 2685 const void *a, *b; | |
| 2686 { | |
| 2687 struct font_name *x = (struct font_name *) a; | |
| 2688 struct font_name *y = (struct font_name *) b; | |
| 2689 int cmp; | |
| 2690 | |
| 2691 /* All strings have been converted to lower-case by split_font_name, | |
| 2692 so we can use strcmp here. */ | |
| 2693 cmp = strcmp (x->fields[XLFD_FAMILY], y->fields[XLFD_FAMILY]); | |
| 2694 if (cmp == 0) | |
| 2695 { | |
| 2696 int i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2697 |
| 24995 | 2698 for (i = 0; i < DIM (font_sort_order) && cmp == 0; ++i) |
| 2699 { | |
| 2700 int j = font_sort_order[i]; | |
| 2701 cmp = x->numeric[j] - y->numeric[j]; | |
| 2702 } | |
| 2703 | |
| 2704 if (cmp == 0) | |
| 2705 { | |
| 2706 /* Everything else being equal, we prefer fonts with an | |
| 2707 y-resolution closer to that of the frame. */ | |
| 2708 int resy = FRAME_X_DISPLAY_INFO (font_frame)->resy; | |
| 2709 int x_resy = x->numeric[XLFD_RESY]; | |
| 2710 int y_resy = y->numeric[XLFD_RESY]; | |
| 2711 cmp = abs (resy - x_resy) - abs (resy - y_resy); | |
| 2712 } | |
| 2713 } | |
| 2714 | |
| 2715 return cmp; | |
| 2716 } | |
| 2717 | |
| 2718 | |
| 2719 /* Get a sorted list of fonts of family FAMILY on frame F. If PATTERN | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2720 is non-nil list fonts matching that pattern. Otherwise, if |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2721 REGISTRY is non-nil return only fonts with that registry, otherwise |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2722 return fonts of any registry. Set *FONTS to a vector of font_name |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2723 structures allocated from the heap containing the fonts found. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2724 Value is the number of fonts found. */ |
| 24995 | 2725 |
| 2726 static int | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2727 font_list_1 (f, pattern, family, registry, fonts) |
| 24995 | 2728 struct frame *f; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2729 Lisp_Object pattern, family, registry; |
| 24995 | 2730 struct font_name **fonts; |
| 2731 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2732 char *pattern_str, *family_str, *registry_str; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2733 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2734 if (NILP (pattern)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2735 { |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2736 family_str = (NILP (family) ? "*" : (char *) SDATA (family)); |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2737 registry_str = (NILP (registry) ? "*" : (char *) SDATA (registry)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2738 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2739 pattern_str = (char *) alloca (strlen (family_str) |
|
29768
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2740 + strlen (registry_str) |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2741 + 10); |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2742 strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-"); |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2743 strcat (pattern_str, family_str); |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2744 strcat (pattern_str, "-*-"); |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2745 strcat (pattern_str, registry_str); |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2746 if (!index (registry_str, '-')) |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2747 { |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2748 if (registry_str[strlen (registry_str) - 1] == '*') |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2749 strcat (pattern_str, "-*"); |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2750 else |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2751 strcat (pattern_str, "*-*"); |
|
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2752 } |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2753 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2754 else |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2755 pattern_str = (char *) SDATA (pattern); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2756 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2757 return sorted_font_list (f, pattern_str, cmp_font_names, fonts); |
| 24995 | 2758 } |
| 2759 | |
| 2760 | |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2761 /* Concatenate font list FONTS1 and FONTS2. FONTS1 and FONTS2 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2762 contains NFONTS1 fonts and NFONTS2 fonts respectively. Return a |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2763 pointer to a newly allocated font list. FONTS1 and FONTS2 are |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2764 freed. */ |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2765 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2766 static struct font_name * |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2767 concat_font_list (fonts1, nfonts1, fonts2, nfonts2) |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2768 struct font_name *fonts1, *fonts2; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2769 int nfonts1, nfonts2; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2770 { |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2771 int new_nfonts = nfonts1 + nfonts2; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2772 struct font_name *new_fonts; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2773 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2774 new_fonts = (struct font_name *) xmalloc (sizeof *new_fonts * new_nfonts); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2775 bcopy (fonts1, new_fonts, sizeof *new_fonts * nfonts1); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2776 bcopy (fonts2, new_fonts + nfonts1, sizeof *new_fonts * nfonts2); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2777 xfree (fonts1); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2778 xfree (fonts2); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2779 return new_fonts; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2780 } |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2781 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2782 |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2783 /* Get a sorted list of fonts of family FAMILY on frame F. |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2784 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2785 If PATTERN is non-nil list fonts matching that pattern. |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2786 |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2787 If REGISTRY is non-nil, return fonts with that registry and the |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2788 alternative registries from Vface_alternative_font_registry_alist. |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2789 |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2790 If REGISTRY is nil return fonts of any registry. |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2791 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2792 Set *FONTS to a vector of font_name structures allocated from the |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2793 heap containing the fonts found. Value is the number of fonts |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2794 found. */ |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2795 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2796 static int |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2797 font_list (f, pattern, family, registry, fonts) |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2798 struct frame *f; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2799 Lisp_Object pattern, family, registry; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2800 struct font_name **fonts; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2801 { |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2802 int nfonts = font_list_1 (f, pattern, family, registry, fonts); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2803 |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2804 if (!NILP (registry) |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2805 && CONSP (Vface_alternative_font_registry_alist)) |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2806 { |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2807 Lisp_Object alter; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2808 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2809 alter = Fassoc (registry, Vface_alternative_font_registry_alist); |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2810 if (CONSP (alter)) |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2811 { |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2812 int reg_prio, i; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2813 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2814 for (alter = XCDR (alter), reg_prio = 1; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2815 CONSP (alter); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2816 alter = XCDR (alter), reg_prio++) |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2817 if (STRINGP (XCAR (alter))) |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2818 { |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2819 int nfonts2; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2820 struct font_name *fonts2; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2821 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2822 nfonts2 = font_list_1 (f, pattern, family, XCAR (alter), |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2823 &fonts2); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2824 for (i = 0; i < nfonts2; i++) |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2825 fonts2[i].registry_priority = reg_prio; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2826 *fonts = (nfonts > 0 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2827 ? concat_font_list (*fonts, nfonts, fonts2, nfonts2) |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2828 : fonts2); |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2829 nfonts += nfonts2; |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2830 } |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2831 } |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2832 } |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2833 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2834 return nfonts; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2835 } |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2836 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2837 |
| 24995 | 2838 /* Remove elements from LIST whose cars are `equal'. Called from |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2839 x-family-fonts and x-font-family-list to remove duplicate font |
| 24995 | 2840 entries. */ |
| 2841 | |
| 2842 static void | |
| 2843 remove_duplicates (list) | |
| 2844 Lisp_Object list; | |
| 2845 { | |
| 2846 Lisp_Object tail = list; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2847 |
| 24995 | 2848 while (!NILP (tail) && !NILP (XCDR (tail))) |
| 2849 { | |
| 2850 Lisp_Object next = XCDR (tail); | |
| 2851 if (!NILP (Fequal (XCAR (next), XCAR (tail)))) | |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39914
diff
changeset
|
2852 XSETCDR (tail, XCDR (next)); |
| 24995 | 2853 else |
| 2854 tail = XCDR (tail); | |
| 2855 } | |
| 2856 } | |
| 2857 | |
| 2858 | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2859 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
|
2860 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
|
2861 If FAMILY is omitted or nil, list all families. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2862 Otherwise, FAMILY must be a string, possibly containing wildcards |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2863 `?' and `*'. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2864 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
|
2865 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
|
2866 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2867 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
|
2868 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
|
2869 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
|
2870 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
|
2871 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
|
2872 giving the registry and encoding of the font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2873 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
|
2874 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
|
2875 (family, frame) |
| 24995 | 2876 Lisp_Object family, frame; |
| 2877 { | |
| 2878 struct frame *f = check_x_frame (frame); | |
| 2879 struct font_name *fonts; | |
| 2880 int i, nfonts; | |
| 2881 Lisp_Object result; | |
| 2882 struct gcpro gcpro1; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2883 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2884 if (!NILP (family)) |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2885 CHECK_STRING (family); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2886 |
| 24995 | 2887 result = Qnil; |
| 2888 GCPRO1 (result); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2889 nfonts = font_list (f, Qnil, family, Qnil, &fonts); |
| 24995 | 2890 for (i = nfonts - 1; i >= 0; --i) |
| 2891 { | |
| 25270 | 2892 Lisp_Object v = Fmake_vector (make_number (8), Qnil); |
| 2893 char *tem; | |
| 24995 | 2894 |
| 2895 ASET (v, 0, build_string (fonts[i].fields[XLFD_FAMILY])); | |
| 2896 ASET (v, 1, xlfd_symbolic_swidth (fonts + i)); | |
| 2897 ASET (v, 2, make_number (xlfd_point_size (f, fonts + i))); | |
| 2898 ASET (v, 3, xlfd_symbolic_weight (fonts + i)); | |
| 2899 ASET (v, 4, xlfd_symbolic_slant (fonts + i)); | |
| 2900 ASET (v, 5, xlfd_fixed_p (fonts + i) ? Qt : Qnil); | |
| 25270 | 2901 tem = build_font_name (fonts + i); |
| 2902 ASET (v, 6, build_string (tem)); | |
| 2903 sprintf (tem, "%s-%s", fonts[i].fields[XLFD_REGISTRY], | |
| 2904 fonts[i].fields[XLFD_ENCODING]); | |
| 2905 ASET (v, 7, build_string (tem)); | |
| 2906 xfree (tem); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2907 |
| 24995 | 2908 result = Fcons (v, result); |
| 2909 } | |
| 2910 | |
| 2911 remove_duplicates (result); | |
| 2912 free_font_names (fonts, nfonts); | |
| 2913 UNGCPRO; | |
| 2914 return result; | |
| 2915 } | |
| 2916 | |
| 2917 | |
| 2918 DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list, | |
| 2919 0, 1, 0, | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2920 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
|
2921 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
|
2922 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
|
2923 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
|
2924 are fixed-pitch. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2925 (frame) |
| 24995 | 2926 Lisp_Object frame; |
| 2927 { | |
| 2928 struct frame *f = check_x_frame (frame); | |
| 2929 int nfonts, i; | |
| 2930 struct font_name *fonts; | |
| 2931 Lisp_Object result; | |
| 2932 struct gcpro gcpro1; | |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
2933 int count = SPECPDL_INDEX (); |
|
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
|
2934 |
|
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
|
2935 /* Let's consider all fonts. */ |
|
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
|
2936 specbind (intern ("font-list-limit"), make_number (-1)); |
|
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
|
2937 nfonts = font_list (f, Qnil, Qnil, Qnil, &fonts); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2938 |
| 24995 | 2939 result = Qnil; |
| 2940 GCPRO1 (result); | |
| 2941 for (i = nfonts - 1; i >= 0; --i) | |
| 2942 result = Fcons (Fcons (build_string (fonts[i].fields[XLFD_FAMILY]), | |
| 2943 xlfd_fixed_p (fonts + i) ? Qt : Qnil), | |
| 2944 result); | |
| 2945 | |
| 2946 remove_duplicates (result); | |
| 2947 free_font_names (fonts, nfonts); | |
| 2948 UNGCPRO; | |
| 25270 | 2949 return unbind_to (count, result); |
| 24995 | 2950 } |
| 2951 | |
| 2952 | |
| 2953 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
|
2954 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
|
2955 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
|
2956 the same size as FACE on FRAME. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2957 PATTERN is a string, perhaps with wildcard characters; |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2958 the * character matches any substring, and |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2959 the ? character matches any single character. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2960 PATTERN is case-insensitive. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2961 FACE is a face name--a symbol. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2962 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2963 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
|
2964 set-face-font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2965 |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2966 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
|
2967 even if they match PATTERN and FACE. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2968 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
|
2969 fonts to match. The first MAXIMUM fonts are reported. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2970 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
|
2971 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
|
2972 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
|
2973 (pattern, face, frame, maximum, width) |
| 24995 | 2974 Lisp_Object pattern, face, frame, maximum, width; |
| 2975 { | |
| 2976 struct frame *f; | |
| 2977 int size; | |
| 2978 int maxnames; | |
| 2979 | |
| 2980 check_x (); | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2981 CHECK_STRING (pattern); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2982 |
| 24995 | 2983 if (NILP (maximum)) |
|
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
|
2984 maxnames = -1; |
| 24995 | 2985 else |
| 2986 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2987 CHECK_NATNUM (maximum); |
| 24995 | 2988 maxnames = XINT (maximum); |
| 2989 } | |
| 2990 | |
| 2991 if (!NILP (width)) | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2992 CHECK_NUMBER (width); |
| 24995 | 2993 |
| 2994 /* We can't simply call check_x_frame because this function may be | |
| 2995 called before any frame is created. */ | |
| 2996 f = frame_or_selected_frame (frame, 2); | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2997 if (!FRAME_WINDOW_P (f)) |
| 24995 | 2998 { |
| 2999 /* Perhaps we have not yet created any frame. */ | |
| 3000 f = NULL; | |
| 3001 face = Qnil; | |
| 3002 } | |
| 3003 | |
| 3004 /* Determine the width standard for comparison with the fonts we find. */ | |
| 3005 | |
| 3006 if (NILP (face)) | |
| 3007 size = 0; | |
| 3008 else | |
| 3009 { | |
| 3010 /* This is of limited utility since it works with character | |
| 3011 widths. Keep it for compatibility. --gerd. */ | |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
3012 int face_id = lookup_named_face (f, face, 0, 0); |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3013 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
|
3014 ? NULL |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3015 : 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
|
3016 |
|
51210
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3017 #ifdef WINDOWSNT |
|
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3018 /* For historic reasons, FONT_WIDTH refers to average width on W32, |
|
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3019 not maximum as on X. Redefine here. */ |
|
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3020 #undef FONT_WIDTH |
|
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3021 #define FONT_WIDTH FONT_MAX_WIDTH |
|
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3022 #endif |
|
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3023 |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3024 if (face && face->font) |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3025 size = FONT_WIDTH (face->font); |
| 24995 | 3026 else |
|
51210
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3027 size = FONT_WIDTH (FRAME_FONT (f)); /* FRAME_COLUMN_WIDTH (f) */ |
| 24995 | 3028 |
| 3029 if (!NILP (width)) | |
| 3030 size *= XINT (width); | |
| 3031 } | |
| 3032 | |
| 3033 { | |
| 3034 Lisp_Object args[2]; | |
| 3035 | |
| 3036 args[0] = x_list_fonts (f, pattern, size, maxnames); | |
| 3037 if (f == NULL) | |
| 3038 /* We don't have to check fontsets. */ | |
| 3039 return args[0]; | |
| 3040 args[1] = list_fontsets (f, pattern, size); | |
| 3041 return Fnconc (2, args); | |
| 3042 } | |
| 3043 } | |
| 3044 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3045 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3046 |
| 3047 | |
| 3048 | |
| 3049 /*********************************************************************** | |
| 3050 Lisp Faces | |
| 3051 ***********************************************************************/ | |
| 3052 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3053 /* 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
|
3054 |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3055 #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
|
3056 #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
|
3057 #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
|
3058 #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
|
3059 #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
|
3060 #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
|
3061 #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
|
3062 #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
|
3063 #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
|
3064 #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
|
3065 #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
|
3066 #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
|
3067 #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
|
3068 #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
|
3069 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3070 #define LFACE_AVGWIDTH(LFACE) AREF ((LFACE), LFACE_AVGWIDTH_INDEX) |
| 24995 | 3071 |
| 3072 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
| 3073 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
| 3074 | |
| 3075 #define LFACEP(LFACE) \ | |
| 3076 (VECTORP (LFACE) \ | |
| 3077 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3078 && EQ (AREF (LFACE, 0), Qface)) |
| 24995 | 3079 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3080 |
| 24995 | 3081 #if GLYPH_DEBUG |
| 3082 | |
| 3083 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
| 3084 | |
| 3085 static void | |
| 3086 check_lface_attrs (attrs) | |
| 3087 Lisp_Object *attrs; | |
| 3088 { | |
| 3089 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
| 3090 || STRINGP (attrs[LFACE_FAMILY_INDEX])); | |
| 3091 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) | |
| 3092 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3093 xassert (UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX]) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3094 || INTEGERP (attrs[LFACE_AVGWIDTH_INDEX])); |
| 24995 | 3095 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) |
| 31178 | 3096 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
| 3097 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
| 3098 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
| 24995 | 3099 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
| 3100 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); | |
| 3101 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
| 3102 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); | |
| 3103 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
| 3104 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) | |
| 3105 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
| 3106 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
| 3107 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) | |
| 3108 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
| 3109 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
| 3110 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
| 3111 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
| 3112 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
| 3113 || SYMBOLP (attrs[LFACE_BOX_INDEX]) | |
| 3114 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
| 3115 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
| 3116 || CONSP (attrs[LFACE_BOX_INDEX])); | |
| 3117 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
| 3118 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); | |
| 3119 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
| 3120 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); | |
| 3121 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
| 3122 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); | |
| 31178 | 3123 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
| 3124 || NILP (attrs[LFACE_INHERIT_INDEX]) | |
| 3125 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
| 3126 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
| 24995 | 3127 #ifdef HAVE_WINDOW_SYSTEM |
| 3128 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
| 3129 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3130 || !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
|
3131 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX]) |
|
28237
2f636fd2f714
(check_lface_attrs) [GLYPH_DEBUG]: Fix syntax error.
Gerd Moellmann <gerd@gnu.org>
parents:
28230
diff
changeset
|
3132 || NILP (attrs[LFACE_FONT_INDEX]) |
|
2f636fd2f714
(check_lface_attrs) [GLYPH_DEBUG]: Fix syntax error.
Gerd Moellmann <gerd@gnu.org>
parents:
28230
diff
changeset
|
3133 || STRINGP (attrs[LFACE_FONT_INDEX])); |
| 24995 | 3134 #endif |
| 3135 } | |
| 3136 | |
| 3137 | |
| 3138 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
| 3139 | |
| 3140 static void | |
| 3141 check_lface (lface) | |
| 3142 Lisp_Object lface; | |
| 3143 { | |
| 3144 if (!NILP (lface)) | |
| 3145 { | |
| 3146 xassert (LFACEP (lface)); | |
| 3147 check_lface_attrs (XVECTOR (lface)->contents); | |
| 3148 } | |
| 3149 } | |
| 3150 | |
| 3151 #else /* GLYPH_DEBUG == 0 */ | |
| 3152 | |
| 3153 #define check_lface_attrs(attrs) (void) 0 | |
| 3154 #define check_lface(lface) (void) 0 | |
| 3155 | |
| 3156 #endif /* GLYPH_DEBUG == 0 */ | |
| 3157 | |
| 3158 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3159 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3160 /* 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
|
3161 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3162 /* 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
|
3163 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
|
3164 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
|
3165 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
|
3166 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
|
3167 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
|
3168 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
|
3169 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3170 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
|
3171 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
|
3172 }; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3173 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3174 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3175 /* 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
|
3176 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
|
3177 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
|
3178 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
|
3179 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3180 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
|
3181 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
|
3182 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
|
3183 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
|
3184 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3185 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
|
3186 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3187 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
|
3188 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
|
3189 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
|
3190 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3191 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
|
3192 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
|
3193 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3194 *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
|
3195 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3196 return 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3197 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3198 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3199 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3200 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3201 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3202 /* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3203 to make it a symvol. If FACE_NAME is an alias for another face, |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3204 return that face's name. */ |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3205 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3206 static Lisp_Object |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3207 resolve_face_name (face_name) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3208 Lisp_Object face_name; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3209 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3210 Lisp_Object aliased; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3211 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3212 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
|
3213 face_name = intern (SDATA (face_name)); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3214 |
|
33070
ca31e3965686
(resolve_face_name): Handle case that FACE_NAME
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
3215 while (SYMBOLP (face_name)) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3216 { |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3217 aliased = Fget (face_name, Qface_alias); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3218 if (NILP (aliased)) |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3219 break; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3220 else |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3221 face_name = aliased; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3222 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3223 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3224 return face_name; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3225 } |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3226 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3227 |
| 24995 | 3228 /* 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
|
3229 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
|
3230 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
|
3231 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
|
3232 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
|
3233 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
|
3234 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
|
3235 name. */ |
| 24995 | 3236 |
| 3237 static INLINE Lisp_Object | |
| 3238 lface_from_face_name (f, face_name, signal_p) | |
| 3239 struct frame *f; | |
| 3240 Lisp_Object face_name; | |
| 3241 int signal_p; | |
| 3242 { | |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3243 Lisp_Object lface; |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3244 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3245 face_name = resolve_face_name (face_name); |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3246 |
| 24995 | 3247 if (f) |
| 3248 lface = assq_no_quit (face_name, f->face_alist); | |
| 3249 else | |
| 3250 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
| 3251 | |
| 3252 if (CONSP (lface)) | |
| 3253 lface = XCDR (lface); | |
| 3254 else if (signal_p) | |
| 3255 signal_error ("Invalid face", face_name); | |
| 3256 | |
| 3257 check_lface (lface); | |
| 3258 return lface; | |
| 3259 } | |
| 3260 | |
| 3261 | |
| 3262 /* Get face attributes of face FACE_NAME from frame-local faces on | |
| 3263 frame F. Store the resulting attributes in ATTRS which must point | |
| 3264 to a vector of Lisp_Objects of size LFACE_VECTOR_SIZE. If SIGNAL_P | |
| 3265 is non-zero, signal an error if FACE_NAME does not name a face. | |
| 3266 Otherwise, value is zero if FACE_NAME is not a face. */ | |
| 3267 | |
| 3268 static INLINE int | |
| 3269 get_lface_attributes (f, face_name, attrs, signal_p) | |
| 3270 struct frame *f; | |
| 3271 Lisp_Object face_name; | |
| 3272 Lisp_Object *attrs; | |
| 3273 int signal_p; | |
| 3274 { | |
| 3275 Lisp_Object lface; | |
| 3276 int success_p; | |
| 3277 | |
| 3278 lface = lface_from_face_name (f, face_name, signal_p); | |
| 3279 if (!NILP (lface)) | |
| 3280 { | |
| 3281 bcopy (XVECTOR (lface)->contents, attrs, | |
| 3282 LFACE_VECTOR_SIZE * sizeof *attrs); | |
| 3283 success_p = 1; | |
| 3284 } | |
| 3285 else | |
| 3286 success_p = 0; | |
| 3287 | |
| 3288 return success_p; | |
| 3289 } | |
| 3290 | |
| 3291 | |
| 3292 /* Non-zero if all attributes in face attribute vector ATTRS are | |
| 3293 specified, i.e. are non-nil. */ | |
| 3294 | |
| 3295 static int | |
| 3296 lface_fully_specified_p (attrs) | |
| 3297 Lisp_Object *attrs; | |
| 3298 { | |
| 3299 int i; | |
| 3300 | |
| 3301 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
|
3302 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3303 && i != LFACE_AVGWIDTH_INDEX) |
|
53274
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3304 if (UNSPECIFIEDP (attrs[i]) |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3305 #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
|
3306 /* 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
|
3307 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
|
3308 && 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
|
3309 #endif |
|
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3310 ) |
|
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3311 break; |
| 24995 | 3312 |
| 3313 return i == LFACE_VECTOR_SIZE; | |
| 3314 } | |
| 3315 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3316 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 3317 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3318 /* Set font-related attributes of Lisp face LFACE from the fullname of |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3319 the font opened by FONTNAME. If FORCE_P is zero, set only |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3320 unspecified attributes of LFACE. The exception is `font' |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3321 attribute. It is set to FONTNAME as is regardless of FORCE_P. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3322 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3323 If FONTNAME is not available on frame F, |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3324 return 0 if MAY_FAIL_P is non-zero, otherwise abort. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3325 If the fullname is not in a valid XLFD format, |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3326 return 0 if MAY_FAIL_P is non-zero, otherwise set normal values |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3327 in LFACE and return 1. |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3328 Otherwise, return 1. */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3329 |
| 24995 | 3330 static int |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3331 set_lface_from_font_name (f, lface, fontname, force_p, may_fail_p) |
|
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
3332 struct frame *f; |
| 24995 | 3333 Lisp_Object lface; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3334 Lisp_Object fontname; |
|
26594
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3335 int force_p, may_fail_p; |
| 24995 | 3336 { |
| 3337 struct font_name font; | |
| 3338 char *buffer; | |
| 3339 int pt; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3340 int have_xlfd_p; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3341 int fontset; |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3342 char *font_name = SDATA (fontname); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3343 struct font_info *font_info; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3344 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3345 /* If FONTNAME is actually a fontset name, get ASCII font name of it. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3346 fontset = fs_query_fontset (fontname, 0); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3347 if (fontset >= 0) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3348 font_name = SDATA (fontset_ascii (fontset)); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3349 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3350 /* Check if FONT_NAME is surely available on the system. Usually |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3351 FONT_NAME is already cached for the frame F and FS_LOAD_FONT |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3352 returns quickly. But, even if FONT_NAME is not yet cached, |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3353 caching it now is not futail because we anyway load the font |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3354 later. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3355 BLOCK_INPUT; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3356 font_info = FS_LOAD_FONT (f, 0, font_name, -1); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3357 UNBLOCK_INPUT; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3358 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3359 if (!font_info) |
|
26594
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3360 { |
|
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3361 if (may_fail_p) |
|
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3362 return 0; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3363 abort (); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3364 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3365 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3366 font.name = STRDUPA (font_info->full_name); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3367 have_xlfd_p = split_font_name (f, &font, 1); |
| 24995 | 3368 |
| 3369 /* Set attributes only if unspecified, otherwise face defaults for | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3370 new frames would never take effect. If we couldn't get a font |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3371 name conforming to XLFD, set normal values. */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3372 |
| 24995 | 3373 if (force_p || UNSPECIFIEDP (LFACE_FAMILY (lface))) |
| 3374 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3375 Lisp_Object val; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3376 if (have_xlfd_p) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3377 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3378 buffer = (char *) alloca (strlen (font.fields[XLFD_FAMILY]) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3379 + strlen (font.fields[XLFD_FOUNDRY]) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3380 + 2); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3381 sprintf (buffer, "%s-%s", font.fields[XLFD_FOUNDRY], |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3382 font.fields[XLFD_FAMILY]); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3383 val = build_string (buffer); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3384 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3385 else |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3386 val = build_string ("*"); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3387 LFACE_FAMILY (lface) = val; |
| 24995 | 3388 } |
| 3389 | |
| 3390 if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface))) | |
| 3391 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3392 if (have_xlfd_p) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3393 pt = xlfd_point_size (f, &font); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3394 else |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3395 pt = pixel_point_size (f, font_info->height * 10); |
| 24995 | 3396 xassert (pt > 0); |
| 3397 LFACE_HEIGHT (lface) = make_number (pt); | |
| 3398 } | |
| 3399 | |
| 3400 if (force_p || UNSPECIFIEDP (LFACE_SWIDTH (lface))) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3401 LFACE_SWIDTH (lface) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3402 = have_xlfd_p ? xlfd_symbolic_swidth (&font) : Qnormal; |
| 24995 | 3403 |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3404 if (force_p || UNSPECIFIEDP (LFACE_AVGWIDTH (lface))) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3405 LFACE_AVGWIDTH (lface) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3406 = (have_xlfd_p |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3407 ? make_number (font.numeric[XLFD_AVGWIDTH]) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3408 : Qunspecified); |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3409 |
| 24995 | 3410 if (force_p || UNSPECIFIEDP (LFACE_WEIGHT (lface))) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3411 LFACE_WEIGHT (lface) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3412 = have_xlfd_p ? xlfd_symbolic_weight (&font) : Qnormal; |
| 24995 | 3413 |
| 3414 if (force_p || UNSPECIFIEDP (LFACE_SLANT (lface))) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3415 LFACE_SLANT (lface) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3416 = have_xlfd_p ? xlfd_symbolic_slant (&font) : Qnormal; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3417 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3418 LFACE_FONT (lface) = fontname; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3419 |
| 24995 | 3420 return 1; |
| 3421 } | |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3422 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3423 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 3424 |
| 3425 | |
| 31178 | 3426 /* Merges the face height FROM with the face height TO, and returns the |
| 3427 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
|
3428 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
|
3429 `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
|
3430 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
|
3431 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
|
3432 call into lisp. */ |
| 31178 | 3433 |
| 3434 Lisp_Object | |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3435 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
|
3436 Lisp_Object from, to, invalid; |
| 31178 | 3437 { |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3438 Lisp_Object result = invalid; |
| 31178 | 3439 |
| 3440 if (INTEGERP (from)) | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3441 /* 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
|
3442 result = from; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3443 else if (FLOATP (from)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3444 /* 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
|
3445 { |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3446 if (INTEGERP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3447 /* relative X absolute => absolute */ |
|
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
3448 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
|
3449 else if (FLOATP (to)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3450 /* relative X relative => relative */ |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3451 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
|
3452 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
|
3453 result = from; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3454 } |
| 31178 | 3455 else if (FUNCTIONP (from)) |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3456 /* FROM is a function, which use to adjust TO. */ |
| 31178 | 3457 { |
| 3458 /* Call function with current height as argument. | |
| 3459 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
|
3460 Lisp_Object args[2]; |
| 31178 | 3461 |
| 3462 args[0] = from; | |
| 3463 args[1] = to; | |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3464 result = safe_call (2, args); |
| 31178 | 3465 |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3466 /* 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
|
3467 if (INTEGERP (to) && !INTEGERP (result)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3468 result = invalid; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3469 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3470 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3471 return result; |
| 31178 | 3472 } |
| 3473 | |
| 3474 | |
| 3475 /* 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
|
3476 store the resulting attributes in TO, which must be already be |
|
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3477 completely specified and contain only absolute attributes. Every |
|
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3478 specified attribute of FROM overrides the corresponding attribute of |
|
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3479 TO; relative attributes in FROM are merged with the absolute value in |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3480 TO and replace it. NAMED_MERGE_POINTS is used internally to detect |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3481 loops in face inheritance; it should be 0 when called from other |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3482 places. */ |
| 24995 | 3483 |
| 3484 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
|
3485 merge_face_vectors (f, from, to, named_merge_points) |
| 31178 | 3486 struct frame *f; |
| 24995 | 3487 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
|
3488 struct named_merge_point *named_merge_points; |
| 24995 | 3489 { |
| 3490 int i; | |
| 31178 | 3491 |
| 3492 /* If FROM inherits from some other faces, merge their attributes into | |
| 3493 TO before merging FROM's direct attributes. Note that an :inherit | |
| 3494 attribute of `unspecified' is the same as one of nil; we never | |
| 3495 merge :inherit attributes, so nil is more correct, but lots of | |
| 3496 other code uses `unspecified' as a generic value for face attributes. */ | |
| 3497 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
| 3498 && !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
|
3499 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
| 31178 | 3500 |
| 31221 | 3501 /* If TO specifies a :font attribute, and FROM specifies some |
| 3502 font-related attribute, we need to clear TO's :font attribute | |
| 3503 (because it will be inconsistent with whatever FROM specifies, and | |
| 3504 FROM takes precedence). */ | |
| 3505 if (!NILP (to[LFACE_FONT_INDEX]) | |
| 3506 && (!UNSPECIFIEDP (from[LFACE_FAMILY_INDEX]) | |
| 3507 || !UNSPECIFIEDP (from[LFACE_HEIGHT_INDEX]) | |
| 3508 || !UNSPECIFIEDP (from[LFACE_WEIGHT_INDEX]) | |
| 3509 || !UNSPECIFIEDP (from[LFACE_SLANT_INDEX]) | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3510 || !UNSPECIFIEDP (from[LFACE_SWIDTH_INDEX]) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3511 || !UNSPECIFIEDP (from[LFACE_AVGWIDTH_INDEX]))) |
| 31221 | 3512 to[LFACE_FONT_INDEX] = Qnil; |
| 3513 | |
| 24995 | 3514 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
| 3515 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
|
3516 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3517 if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i])) |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3518 to[i] = merge_face_heights (from[i], to[i], to[i]); |
|
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3519 else |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3520 to[i] = from[i]; |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3521 } |
| 31178 | 3522 |
| 3523 /* TO is always an absolute face, which should inherit from nothing. | |
| 3524 We blindly copy the :inherit attribute above and fix it up here. */ | |
| 3525 to[LFACE_INHERIT_INDEX] = Qnil; | |
| 3526 } | |
| 3527 | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3528 /* 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
|
3529 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
|
3530 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
|
3531 merging succeeded. */ |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3532 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3533 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3534 merge_named_face (f, face_name, to, named_merge_points) |
| 31178 | 3535 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
|
3536 Lisp_Object face_name; |
| 31178 | 3537 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
|
3538 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
|
3539 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3540 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
|
3541 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3542 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
|
3543 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
|
3544 { |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3545 struct gcpro gcpro1; |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3546 Lisp_Object from[LFACE_VECTOR_SIZE]; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3547 int ok = get_lface_attributes (f, face_name, from, 0); |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3548 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3549 if (ok) |
|
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3550 { |
|
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3551 GCPRO1 (named_merge_point.face_name); |
|
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3552 merge_face_vectors (f, from, to, named_merge_points); |
|
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3553 UNGCPRO; |
|
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3554 } |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3555 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3556 return ok; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3557 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3558 else |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3559 return 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3560 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3561 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3562 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3563 /* 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
|
3564 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
|
3565 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
|
3566 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
|
3567 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
|
3568 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
|
3569 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3570 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
|
3571 specifications. Each face specification can be: |
| 24995 | 3572 |
| 3573 1. A symbol or string naming a Lisp face. | |
| 3574 | |
| 3575 2. A property list of the form (KEYWORD VALUE ...) where each | |
| 3576 KEYWORD is a face attribute name, and value is an appropriate value | |
| 3577 for that attribute. | |
| 3578 | |
| 3579 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
| 3580 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
| 3581 for compatibility with 20.2. | |
| 3582 | |
| 3583 Face specifications earlier in lists take precedence over later | |
| 3584 specifications. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3585 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3586 static int |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3587 merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) |
| 24995 | 3588 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
|
3589 Lisp_Object face_ref; |
| 24995 | 3590 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
|
3591 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
|
3592 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
|
3593 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3594 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
|
3595 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3596 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
|
3597 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3598 Lisp_Object first = XCAR (face_ref); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3599 |
| 24995 | 3600 if (EQ (first, Qforeground_color) |
| 3601 || EQ (first, Qbackground_color)) | |
| 3602 { | |
| 3603 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
| 3604 . 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
|
3605 Lisp_Object color_name = XCDR (face_ref); |
| 24995 | 3606 Lisp_Object color = first; |
| 3607 | |
| 3608 if (STRINGP (color_name)) | |
| 3609 { | |
| 3610 if (EQ (color, Qforeground_color)) | |
| 3611 to[LFACE_FOREGROUND_INDEX] = color_name; | |
| 3612 else | |
| 3613 to[LFACE_BACKGROUND_INDEX] = color_name; | |
| 3614 } | |
| 3615 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3616 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3617 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
|
3618 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
|
3619 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3620 } |
| 24995 | 3621 } |
| 3622 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
|
3623 && *SDATA (SYMBOL_NAME (first)) == ':') |
| 24995 | 3624 { |
| 3625 /* 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
|
3626 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
| 24995 | 3627 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3628 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
|
3629 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
|
3630 int err = 0; |
| 24995 | 3631 |
|
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3632 /* 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
|
3633 if (EQ (value, Qunspecified)) |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3634 ; |
|
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3635 else if (EQ (keyword, QCfamily)) |
| 24995 | 3636 { |
| 3637 if (STRINGP (value)) | |
| 3638 to[LFACE_FAMILY_INDEX] = value; | |
| 3639 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3640 err = 1; |
| 24995 | 3641 } |
| 3642 else if (EQ (keyword, QCheight)) | |
| 3643 { | |
| 31178 | 3644 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
|
3645 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
| 31178 | 3646 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3647 if (! NILP (new_height)) |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3648 to[LFACE_HEIGHT_INDEX] = new_height; |
| 24995 | 3649 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3650 err = 1; |
| 24995 | 3651 } |
| 3652 else if (EQ (keyword, QCweight)) | |
| 3653 { | |
| 3654 if (SYMBOLP (value) | |
| 3655 && face_numeric_weight (value) >= 0) | |
| 3656 to[LFACE_WEIGHT_INDEX] = value; | |
| 3657 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3658 err = 1; |
| 24995 | 3659 } |
| 3660 else if (EQ (keyword, QCslant)) | |
| 3661 { | |
| 3662 if (SYMBOLP (value) | |
| 3663 && face_numeric_slant (value) >= 0) | |
| 3664 to[LFACE_SLANT_INDEX] = value; | |
| 3665 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3666 err = 1; |
| 24995 | 3667 } |
| 3668 else if (EQ (keyword, QCunderline)) | |
| 3669 { | |
| 3670 if (EQ (value, Qt) | |
| 3671 || NILP (value) | |
| 3672 || STRINGP (value)) | |
| 3673 to[LFACE_UNDERLINE_INDEX] = value; | |
| 3674 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3675 err = 1; |
| 24995 | 3676 } |
| 3677 else if (EQ (keyword, QCoverline)) | |
| 3678 { | |
| 3679 if (EQ (value, Qt) | |
| 3680 || NILP (value) | |
| 3681 || STRINGP (value)) | |
| 3682 to[LFACE_OVERLINE_INDEX] = value; | |
| 3683 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3684 err = 1; |
| 24995 | 3685 } |
| 3686 else if (EQ (keyword, QCstrike_through)) | |
| 3687 { | |
| 3688 if (EQ (value, Qt) | |
| 3689 || NILP (value) | |
| 3690 || STRINGP (value)) | |
| 3691 to[LFACE_STRIKE_THROUGH_INDEX] = value; | |
| 3692 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3693 err = 1; |
| 24995 | 3694 } |
| 3695 else if (EQ (keyword, QCbox)) | |
| 3696 { | |
| 3697 if (EQ (value, Qt)) | |
| 3698 value = make_number (1); | |
| 3699 if (INTEGERP (value) | |
| 3700 || STRINGP (value) | |
| 3701 || CONSP (value) | |
| 3702 || NILP (value)) | |
| 3703 to[LFACE_BOX_INDEX] = value; | |
| 3704 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3705 err = 1; |
| 24995 | 3706 } |
| 3707 else if (EQ (keyword, QCinverse_video) | |
| 3708 || EQ (keyword, QCreverse_video)) | |
| 3709 { | |
| 3710 if (EQ (value, Qt) || NILP (value)) | |
| 3711 to[LFACE_INVERSE_INDEX] = value; | |
| 3712 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3713 err = 1; |
| 24995 | 3714 } |
| 3715 else if (EQ (keyword, QCforeground)) | |
| 3716 { | |
| 3717 if (STRINGP (value)) | |
| 3718 to[LFACE_FOREGROUND_INDEX] = value; | |
| 3719 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3720 err = 1; |
| 24995 | 3721 } |
| 3722 else if (EQ (keyword, QCbackground)) | |
| 3723 { | |
| 3724 if (STRINGP (value)) | |
| 3725 to[LFACE_BACKGROUND_INDEX] = value; | |
| 3726 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3727 err = 1; |
| 24995 | 3728 } |
| 3729 else if (EQ (keyword, QCstipple)) | |
| 3730 { | |
| 3731 #ifdef HAVE_X_WINDOWS | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3732 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
| 24995 | 3733 if (!NILP (pixmap_p)) |
| 3734 to[LFACE_STIPPLE_INDEX] = value; | |
| 3735 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3736 err = 1; |
| 24995 | 3737 #endif |
| 3738 } | |
| 3739 else if (EQ (keyword, QCwidth)) | |
| 3740 { | |
| 3741 if (SYMBOLP (value) | |
| 3742 && face_numeric_swidth (value) >= 0) | |
| 3743 to[LFACE_SWIDTH_INDEX] = value; | |
| 3744 else | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3745 err = 1; |
| 24995 | 3746 } |
| 31178 | 3747 else if (EQ (keyword, QCinherit)) |
| 3748 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3749 /* 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
|
3750 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
|
3751 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
|
3752 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
|
3753 err = 1; |
| 31178 | 3754 } |
| 24995 | 3755 else |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3756 err = 1; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3757 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3758 if (err) |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3759 { |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3760 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
|
3761 ok = 0; |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3762 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3763 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3764 face_ref = XCDR (XCDR (face_ref)); |
| 24995 | 3765 } |
| 3766 } | |
| 3767 else | |
| 3768 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3769 /* 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
|
3770 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
|
3771 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
|
3772 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
|
3773 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3774 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
|
3775 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
|
3776 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3777 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
|
3778 ok = 0; |
| 24995 | 3779 } |
| 3780 } | |
| 3781 else | |
| 3782 { | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3783 /* 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
|
3784 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
|
3785 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
|
3786 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
|
3787 } |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3788 |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3789 return ok; |
| 24995 | 3790 } |
| 3791 | |
| 3792 | |
| 3793 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
| 3794 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
|
3795 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
|
3796 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
|
3797 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
|
3798 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
|
3799 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
|
3800 (face, frame) |
| 24995 | 3801 Lisp_Object face, frame; |
| 3802 { | |
| 3803 Lisp_Object global_lface, lface; | |
| 3804 struct frame *f; | |
| 3805 int i; | |
| 3806 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3807 CHECK_SYMBOL (face); |
| 24995 | 3808 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
|
3809 |
| 24995 | 3810 if (!NILP (frame)) |
| 3811 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3812 CHECK_LIVE_FRAME (frame); |
| 24995 | 3813 f = XFRAME (frame); |
| 3814 lface = lface_from_face_name (f, face, 0); | |
| 3815 } | |
| 3816 else | |
| 3817 f = NULL, lface = Qnil; | |
| 3818 | |
| 3819 /* Add a global definition if there is none. */ | |
| 3820 if (NILP (global_lface)) | |
| 3821 { | |
| 3822 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 3823 Qunspecified); | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3824 AREF (global_lface, 0) = Qface; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3825 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
| 24995 | 3826 Vface_new_frame_defaults); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3827 |
| 24995 | 3828 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
| 3829 face id to Lisp face is given by the vector lface_id_to_name. | |
| 3830 The mapping from Lisp face to Lisp face id is given by the | |
| 3831 property `face' of the Lisp face name. */ | |
| 3832 if (next_lface_id == lface_id_to_name_size) | |
| 3833 { | |
| 3834 int new_size = max (50, 2 * lface_id_to_name_size); | |
| 3835 int sz = new_size * sizeof *lface_id_to_name; | |
| 3836 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
| 3837 lface_id_to_name_size = new_size; | |
| 3838 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3839 |
| 24995 | 3840 lface_id_to_name[next_lface_id] = face; |
| 3841 Fput (face, Qface, make_number (next_lface_id)); | |
| 3842 ++next_lface_id; | |
| 3843 } | |
| 3844 else if (f == NULL) | |
| 3845 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
|
3846 AREF (global_lface, i) = Qunspecified; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3847 |
| 24995 | 3848 /* Add a frame-local definition. */ |
| 3849 if (f) | |
| 3850 { | |
| 3851 if (NILP (lface)) | |
| 3852 { | |
| 3853 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
| 3854 Qunspecified); | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3855 AREF (lface, 0) = Qface; |
| 24995 | 3856 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
| 3857 } | |
| 3858 else | |
| 3859 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
|
3860 AREF (lface, i) = Qunspecified; |
| 24995 | 3861 } |
| 3862 else | |
| 3863 lface = global_lface; | |
| 3864 | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3865 /* 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
|
3866 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
|
3867 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
|
3868 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
|
3869 init_iterator will then free realized faces. */ |
| 57107 | 3870 if (NILP (Fget (face, Qface_no_inherit))) |
| 3871 { | |
| 3872 ++face_change_count; | |
| 3873 ++windows_or_buffers_changed; | |
| 3874 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3875 |
| 24995 | 3876 xassert (LFACEP (lface)); |
| 3877 check_lface (lface); | |
| 3878 return lface; | |
| 3879 } | |
| 3880 | |
| 3881 | |
| 3882 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
| 3883 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
|
3884 doc: /* Return non-nil if FACE names a face. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3885 If optional second parameter FRAME is non-nil, check for the |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3886 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
|
3887 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
|
3888 (face, frame) |
| 24995 | 3889 Lisp_Object face, frame; |
| 3890 { | |
| 3891 Lisp_Object lface; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3892 |
| 24995 | 3893 if (!NILP (frame)) |
| 3894 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3895 CHECK_LIVE_FRAME (frame); |
| 24995 | 3896 lface = lface_from_face_name (XFRAME (frame), face, 0); |
| 3897 } | |
| 3898 else | |
| 3899 lface = lface_from_face_name (NULL, face, 0); | |
| 3900 | |
| 3901 return lface; | |
| 3902 } | |
| 3903 | |
| 3904 | |
| 3905 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
| 3906 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
|
3907 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
|
3908 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
|
3909 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
|
3910 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
|
3911 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
|
3912 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
|
3913 |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3914 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
|
3915 (from, to, frame, new_frame) |
| 24995 | 3916 Lisp_Object from, to, frame, new_frame; |
| 3917 { | |
| 3918 Lisp_Object lface, copy; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3919 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3920 CHECK_SYMBOL (from); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3921 CHECK_SYMBOL (to); |
| 24995 | 3922 |
| 3923 if (EQ (frame, Qt)) | |
| 3924 { | |
| 3925 /* Copy global definition of FROM. We don't make copies of | |
| 3926 strings etc. because 20.2 didn't do it either. */ | |
| 3927 lface = lface_from_face_name (NULL, from, 1); | |
| 3928 copy = Finternal_make_lisp_face (to, Qnil); | |
| 3929 } | |
| 3930 else | |
| 3931 { | |
| 3932 /* 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
|
3933 if (NILP (new_frame)) |
|
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3934 new_frame = frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3935 CHECK_LIVE_FRAME (frame); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3936 CHECK_LIVE_FRAME (new_frame); |
| 24995 | 3937 lface = lface_from_face_name (XFRAME (frame), from, 1); |
| 3938 copy = Finternal_make_lisp_face (to, new_frame); | |
| 3939 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3940 |
| 24995 | 3941 bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents, |
| 3942 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3943 |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3944 /* 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
|
3945 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
|
3946 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
|
3947 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
|
3948 init_iterator will then free realized faces. */ |
| 57107 | 3949 if (NILP (Fget (to, Qface_no_inherit))) |
| 3950 { | |
| 3951 ++face_change_count; | |
| 3952 ++windows_or_buffers_changed; | |
| 3953 } | |
|
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3954 |
| 24995 | 3955 return to; |
| 3956 } | |
| 3957 | |
| 3958 | |
| 3959 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
| 3960 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
|
3961 doc: /* Set attribute ATTR of FACE to VALUE. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3962 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
|
3963 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
|
3964 FRAME t means change the default for new frames. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3965 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
|
3966 for new frames. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3967 (face, attr, value, frame) |
| 24995 | 3968 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
|
3969 { |
| 24995 | 3970 Lisp_Object lface; |
| 3971 Lisp_Object old_value = Qnil; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3972 /* Set 1 if ATTR is QCfont. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3973 int font_attr_p = 0; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3974 /* Set 1 if ATTR is one of font-related attributes other than QCfont. */ |
| 24995 | 3975 int font_related_attr_p = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3976 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3977 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3978 CHECK_SYMBOL (attr); |
| 24995 | 3979 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3980 face = resolve_face_name (face); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3981 |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3982 /* 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
|
3983 default for new frames. */ |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3984 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
|
3985 { |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3986 Lisp_Object tail; |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3987 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
|
3988 FOR_EACH_FRAME (tail, frame) |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3989 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
|
3990 return face; |
|
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3991 } |
|
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3992 |
| 24995 | 3993 /* Set lface to the Lisp attribute vector of FACE. */ |
| 3994 if (EQ (frame, Qt)) | |
| 3995 lface = lface_from_face_name (NULL, face, 1); | |
| 3996 else | |
| 3997 { | |
| 3998 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3999 frame = selected_frame; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4000 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4001 CHECK_LIVE_FRAME (frame); |
| 24995 | 4002 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
|
4003 |
| 24995 | 4004 /* If a frame-local face doesn't exist yet, create one. */ |
| 4005 if (NILP (lface)) | |
| 4006 lface = Finternal_make_lisp_face (face, frame); | |
| 4007 } | |
| 4008 | |
| 4009 if (EQ (attr, QCfamily)) | |
| 4010 { | |
| 4011 if (!UNSPECIFIEDP (value)) | |
| 4012 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4013 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
|
4014 if (SCHARS (value) == 0) |
| 24995 | 4015 signal_error ("Invalid face family", value); |
| 4016 } | |
| 4017 old_value = LFACE_FAMILY (lface); | |
| 4018 LFACE_FAMILY (lface) = value; | |
| 4019 font_related_attr_p = 1; | |
| 4020 } | |
| 4021 else if (EQ (attr, QCheight)) | |
| 4022 { | |
| 4023 if (!UNSPECIFIEDP (value)) | |
| 4024 { | |
|
40023
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4025 Lisp_Object test; |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4026 |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4027 test = (EQ (face, Qdefault) |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4028 ? value |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4029 /* 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
|
4030 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
|
4031 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
|
4032 : 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
|
4033 |
|
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4034 if (!INTEGERP (test) || XINT (test) <= 0) |
| 24995 | 4035 signal_error ("Invalid face height", value); |
| 4036 } | |
| 31178 | 4037 |
| 24995 | 4038 old_value = LFACE_HEIGHT (lface); |
| 4039 LFACE_HEIGHT (lface) = value; | |
| 4040 font_related_attr_p = 1; | |
| 4041 } | |
| 4042 else if (EQ (attr, QCweight)) | |
| 4043 { | |
| 4044 if (!UNSPECIFIEDP (value)) | |
| 4045 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4046 CHECK_SYMBOL (value); |
| 24995 | 4047 if (face_numeric_weight (value) < 0) |
| 4048 signal_error ("Invalid face weight", value); | |
| 4049 } | |
| 4050 old_value = LFACE_WEIGHT (lface); | |
| 4051 LFACE_WEIGHT (lface) = value; | |
| 4052 font_related_attr_p = 1; | |
| 4053 } | |
| 4054 else if (EQ (attr, QCslant)) | |
| 4055 { | |
| 4056 if (!UNSPECIFIEDP (value)) | |
| 4057 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4058 CHECK_SYMBOL (value); |
| 24995 | 4059 if (face_numeric_slant (value) < 0) |
| 4060 signal_error ("Invalid face slant", value); | |
| 4061 } | |
| 4062 old_value = LFACE_SLANT (lface); | |
| 4063 LFACE_SLANT (lface) = value; | |
| 4064 font_related_attr_p = 1; | |
| 4065 } | |
| 4066 else if (EQ (attr, QCunderline)) | |
| 4067 { | |
| 4068 if (!UNSPECIFIEDP (value)) | |
| 4069 if ((SYMBOLP (value) | |
| 4070 && !EQ (value, Qt) | |
| 4071 && !EQ (value, Qnil)) | |
| 4072 /* Underline color. */ | |
| 4073 || (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
|
4074 && SCHARS (value) == 0)) |
| 24995 | 4075 signal_error ("Invalid face underline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4076 |
| 24995 | 4077 old_value = LFACE_UNDERLINE (lface); |
| 4078 LFACE_UNDERLINE (lface) = value; | |
| 4079 } | |
| 4080 else if (EQ (attr, QCoverline)) | |
| 4081 { | |
| 4082 if (!UNSPECIFIEDP (value)) | |
| 4083 if ((SYMBOLP (value) | |
| 4084 && !EQ (value, Qt) | |
| 4085 && !EQ (value, Qnil)) | |
| 4086 /* Overline color. */ | |
| 4087 || (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
|
4088 && SCHARS (value) == 0)) |
| 24995 | 4089 signal_error ("Invalid face overline", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4090 |
| 24995 | 4091 old_value = LFACE_OVERLINE (lface); |
| 4092 LFACE_OVERLINE (lface) = value; | |
| 4093 } | |
| 4094 else if (EQ (attr, QCstrike_through)) | |
| 4095 { | |
| 4096 if (!UNSPECIFIEDP (value)) | |
| 4097 if ((SYMBOLP (value) | |
| 4098 && !EQ (value, Qt) | |
| 4099 && !EQ (value, Qnil)) | |
| 4100 /* Strike-through color. */ | |
| 4101 || (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
|
4102 && SCHARS (value) == 0)) |
| 24995 | 4103 signal_error ("Invalid face strike-through", value); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4104 |
| 24995 | 4105 old_value = LFACE_STRIKE_THROUGH (lface); |
| 4106 LFACE_STRIKE_THROUGH (lface) = value; | |
| 4107 } | |
| 4108 else if (EQ (attr, QCbox)) | |
| 4109 { | |
| 4110 int valid_p; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4111 |
| 24995 | 4112 /* Allow t meaning a simple box of width 1 in foreground color |
| 4113 of the face. */ | |
| 4114 if (EQ (value, Qt)) | |
| 4115 value = make_number (1); | |
| 4116 | |
| 4117 if (UNSPECIFIEDP (value)) | |
| 4118 valid_p = 1; | |
| 4119 else if (NILP (value)) | |
| 4120 valid_p = 1; | |
| 4121 else if (INTEGERP (value)) | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
4122 valid_p = XINT (value) != 0; |
| 24995 | 4123 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
|
4124 valid_p = SCHARS (value) > 0; |
| 24995 | 4125 else if (CONSP (value)) |
| 4126 { | |
| 4127 Lisp_Object tem; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4128 |
| 24995 | 4129 tem = value; |
| 4130 while (CONSP (tem)) | |
| 4131 { | |
| 4132 Lisp_Object k, v; | |
| 4133 | |
| 4134 k = XCAR (tem); | |
| 4135 tem = XCDR (tem); | |
| 4136 if (!CONSP (tem)) | |
| 4137 break; | |
| 4138 v = XCAR (tem); | |
| 4139 tem = XCDR (tem); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4140 |
| 24995 | 4141 if (EQ (k, QCline_width)) |
| 4142 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
4143 if (!INTEGERP (v) || XINT (v) == 0) |
| 24995 | 4144 break; |
| 4145 } | |
| 4146 else if (EQ (k, QCcolor)) | |
| 4147 { | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4148 if (!STRINGP (v) || SCHARS (v) == 0) |
| 24995 | 4149 break; |
| 4150 } | |
| 4151 else if (EQ (k, QCstyle)) | |
| 4152 { | |
| 4153 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
| 4154 break; | |
| 4155 } | |
| 4156 else | |
| 4157 break; | |
| 4158 } | |
| 4159 | |
| 4160 valid_p = NILP (tem); | |
| 4161 } | |
| 4162 else | |
| 4163 valid_p = 0; | |
| 4164 | |
| 4165 if (!valid_p) | |
| 4166 signal_error ("Invalid face box", value); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4167 |
| 24995 | 4168 old_value = LFACE_BOX (lface); |
| 4169 LFACE_BOX (lface) = value; | |
| 4170 } | |
| 4171 else if (EQ (attr, QCinverse_video) | |
| 4172 || EQ (attr, QCreverse_video)) | |
| 4173 { | |
| 4174 if (!UNSPECIFIEDP (value)) | |
| 4175 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4176 CHECK_SYMBOL (value); |
| 24995 | 4177 if (!EQ (value, Qt) && !NILP (value)) |
| 4178 signal_error ("Invalid inverse-video face attribute value", value); | |
| 4179 } | |
| 4180 old_value = LFACE_INVERSE (lface); | |
| 4181 LFACE_INVERSE (lface) = value; | |
| 4182 } | |
| 4183 else if (EQ (attr, QCforeground)) | |
| 4184 { | |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
4185 if (!UNSPECIFIEDP (value)) |
| 24995 | 4186 { |
| 4187 /* Don't check for valid color names here because it depends | |
| 4188 on the frame (display) whether the color will be valid | |
| 4189 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
|
4190 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
|
4191 if (SCHARS (value) == 0) |
| 24995 | 4192 signal_error ("Empty foreground color value", value); |
| 4193 } | |
| 4194 old_value = LFACE_FOREGROUND (lface); | |
| 4195 LFACE_FOREGROUND (lface) = value; | |
| 4196 } | |
| 4197 else if (EQ (attr, QCbackground)) | |
| 4198 { | |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
4199 if (!UNSPECIFIEDP (value)) |
| 24995 | 4200 { |
| 4201 /* Don't check for valid color names here because it depends | |
| 4202 on the frame (display) whether the color will be valid | |
| 4203 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
|
4204 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
|
4205 if (SCHARS (value) == 0) |
| 24995 | 4206 signal_error ("Empty background color value", value); |
| 4207 } | |
| 4208 old_value = LFACE_BACKGROUND (lface); | |
| 4209 LFACE_BACKGROUND (lface) = value; | |
| 4210 } | |
| 4211 else if (EQ (attr, QCstipple)) | |
| 4212 { | |
| 4213 #ifdef HAVE_X_WINDOWS | |
| 4214 if (!UNSPECIFIEDP (value) | |
| 4215 && !NILP (value) | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
4216 && NILP (Fbitmap_spec_p (value))) |
| 24995 | 4217 signal_error ("Invalid stipple attribute", value); |
| 4218 old_value = LFACE_STIPPLE (lface); | |
| 4219 LFACE_STIPPLE (lface) = value; | |
| 4220 #endif /* HAVE_X_WINDOWS */ | |
| 4221 } | |
| 4222 else if (EQ (attr, QCwidth)) | |
| 4223 { | |
| 4224 if (!UNSPECIFIEDP (value)) | |
| 4225 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4226 CHECK_SYMBOL (value); |
| 24995 | 4227 if (face_numeric_swidth (value) < 0) |
| 4228 signal_error ("Invalid face width", value); | |
| 4229 } | |
| 4230 old_value = LFACE_SWIDTH (lface); | |
| 4231 LFACE_SWIDTH (lface) = value; | |
| 4232 font_related_attr_p = 1; | |
| 4233 } | |
| 4234 else if (EQ (attr, QCfont)) | |
| 4235 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4236 #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
|
4237 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
|
4238 { |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4239 /* Set font-related attributes of the Lisp face from an XLFD |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4240 font name. */ |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4241 struct frame *f; |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4242 Lisp_Object tmp; |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4243 |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4244 if (EQ (frame, Qt)) |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4245 f = SELECTED_FRAME (); |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4246 else |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4247 f = check_x_frame (frame); |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4248 |
|
51092
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4249 if (!UNSPECIFIEDP (value)) |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4250 { |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4251 CHECK_STRING (value); |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4252 |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4253 /* VALUE may be a fontset name or an alias of fontset. In |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4254 such a case, use the base fontset name. */ |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4255 tmp = Fquery_fontset (value, Qnil); |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4256 if (!NILP (tmp)) |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4257 value = tmp; |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4258 |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4259 if (!set_lface_from_font_name (f, lface, value, 1, 1)) |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4260 signal_error ("Invalid font or fontset name", value); |
|
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4261 } |
|
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4262 |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4263 font_attr_p = 1; |
|
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4264 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4265 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4266 } |
| 31178 | 4267 else if (EQ (attr, QCinherit)) |
| 4268 { | |
| 4269 Lisp_Object tail; | |
| 4270 if (SYMBOLP (value)) | |
| 4271 tail = Qnil; | |
| 4272 else | |
| 4273 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
| 4274 if (!SYMBOLP (XCAR (tail))) | |
| 4275 break; | |
| 4276 if (NILP (tail)) | |
| 4277 LFACE_INHERIT (lface) = value; | |
| 4278 else | |
|
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
4279 signal_error ("Invalid face inheritance", value); |
| 31178 | 4280 } |
| 24995 | 4281 else if (EQ (attr, QCbold)) |
| 4282 { | |
| 4283 old_value = LFACE_WEIGHT (lface); | |
| 4284 LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold; | |
| 4285 font_related_attr_p = 1; | |
| 4286 } | |
| 4287 else if (EQ (attr, QCitalic)) | |
| 4288 { | |
| 4289 old_value = LFACE_SLANT (lface); | |
| 4290 LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic; | |
| 4291 font_related_attr_p = 1; | |
| 4292 } | |
| 4293 else | |
| 4294 signal_error ("Invalid face attribute name", attr); | |
| 4295 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4296 if (font_related_attr_p |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4297 && !UNSPECIFIEDP (value)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4298 /* If a font-related attribute other than QCfont is specified, the |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4299 original `font' attribute nor that of default face is useless |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4300 to determine a new font. Thus, we set it to nil so that font |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4301 selection mechanism doesn't use it. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4302 LFACE_FONT (lface) = Qnil; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4303 |
| 24995 | 4304 /* Changing a named face means that all realized faces depending on |
| 4305 that face are invalid. Since we cannot tell which realized faces | |
| 4306 depend on the face, make sure they are all removed. This is done | |
| 4307 by incrementing face_change_count. The next call to | |
| 4308 init_iterator will then free realized faces. */ | |
| 4309 if (!EQ (frame, Qt) | |
| 57107 | 4310 && NILP (Fget (face, Qface_no_inherit)) |
| 24995 | 4311 && (EQ (attr, QCfont) |
| 4312 || NILP (Fequal (old_value, value)))) | |
| 4313 { | |
| 4314 ++face_change_count; | |
| 4315 ++windows_or_buffers_changed; | |
| 4316 } | |
| 4317 | |
|
34242
dd4e1abada68
(Finternal_set_lisp_face_attribute): If FRAME is `t', update
Miles Bader <miles@gnu.org>
parents:
34160
diff
changeset
|
4318 if (!UNSPECIFIEDP (value) |
| 24995 | 4319 && NILP (Fequal (old_value, value))) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4320 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4321 Lisp_Object param; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4322 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4323 param = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4324 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4325 if (EQ (face, Qdefault)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4326 { |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4327 #ifdef HAVE_WINDOW_SYSTEM |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4328 /* 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
|
4329 reflected in changed `font' frame parameters. */ |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4330 if (FRAMEP (frame) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4331 && (font_related_attr_p || font_attr_p) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4332 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4333 set_font_frame_param (frame, lface); |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4334 else |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4335 #endif /* HAVE_WINDOW_SYSTEM */ |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4336 |
|
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4337 if (EQ (attr, QCforeground)) |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4338 param = Qforeground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4339 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4340 param = Qbackground_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4341 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4342 #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
|
4343 #ifndef WINDOWSNT |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4344 else if (EQ (face, Qscroll_bar)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4345 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4346 /* 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
|
4347 `scroll-bar-foreground' and `scroll-bar-background'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4348 if (EQ (attr, QCforeground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4349 param = Qscroll_bar_foreground; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4350 else if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4351 param = Qscroll_bar_background; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4352 } |
|
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
4353 #endif /* not WINDOWSNT */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4354 else if (EQ (face, Qborder)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4355 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4356 /* Changing background color of `border' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4357 `border-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4358 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4359 param = Qborder_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4360 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4361 else if (EQ (face, Qcursor)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4362 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4363 /* Changing background color of `cursor' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4364 `cursor-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4365 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4366 param = Qcursor_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4367 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4368 else if (EQ (face, Qmouse)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4369 { |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4370 /* Changing background color of `mouse' sets frame parameter |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4371 `mouse-color'. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4372 if (EQ (attr, QCbackground)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4373 param = Qmouse_color; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4374 } |
|
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4375 #endif /* HAVE_WINDOW_SYSTEM */ |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
4376 else if (EQ (face, Qmenu)) |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4377 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4378 /* 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
|
4379 realizing faces on FRAME. FRAME t change the |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4380 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
|
4381 setting the flag in new face caches */ |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4382 if (FRAMEP (frame)) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4383 { |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4384 struct frame *f = XFRAME (frame); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4385 if (FRAME_FACE_CACHE (f) == NULL) |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4386 FRAME_FACE_CACHE (f) = make_face_cache (f); |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4387 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
|
4388 } |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4389 else |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4390 menu_face_changed_default = 1; |
|
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4391 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4392 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4393 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
|
4394 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4395 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
|
4396 /* 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
|
4397 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4398 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
|
4399 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4400 else |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4401 /* 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
|
4402 { |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4403 Lisp_Object cons; |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4404 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
|
4405 XSETCAR (cons, param); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4406 XSETCDR (cons, value); |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4407 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
|
4408 } |
|
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4409 } |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4410 } |
| 24995 | 4411 |
| 4412 return face; | |
| 4413 } | |
| 4414 | |
| 4415 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4416 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 4417 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4418 /* Set the `font' frame parameter of FRAME determined from `default' |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4419 face attributes LFACE. If a face or fontset name is explicitely |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4420 specfied in LFACE, use it as is. Otherwise, determine a font name |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4421 from the other font-related atrributes of LFACE. In that case, if |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4422 there's no matching font, signals an error. */ |
| 24995 | 4423 |
| 4424 static void | |
| 4425 set_font_frame_param (frame, lface) | |
| 4426 Lisp_Object frame, lface; | |
| 4427 { | |
| 4428 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
|
4429 |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4430 if (FRAME_WINDOW_P (f)) |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4431 { |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4432 Lisp_Object font_name; |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4433 char *font; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4434 |
|
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4435 if (STRINGP (LFACE_FONT (lface))) |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4436 font_name = LFACE_FONT (lface); |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4437 else |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4438 { |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4439 /* Choose a font name that reflects LFACE's attributes and has |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4440 the registry and encoding pattern specified in the default |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4441 fontset (3rd arg: -1) for ASCII characters (4th arg: 0). */ |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
4442 font = choose_face_font (f, XVECTOR (lface)->contents, -1, 0, 0); |
|
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4443 if (!font) |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4444 error ("No font matches the specified attribute"); |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4445 font_name = build_string (font); |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4446 xfree (font); |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4447 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4448 |
|
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
4449 f->default_face_done_p = 0; |
|
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4450 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), Qnil)); |
|
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4451 } |
| 24995 | 4452 } |
| 4453 | |
| 4454 | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4455 /* 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
|
4456 has been assigned the value NEW_VALUE. */ |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4457 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4458 void |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4459 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
|
4460 struct frame *f; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4461 Lisp_Object param, new_value; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4462 { |
| 57107 | 4463 Lisp_Object face = Qnil; |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4464 Lisp_Object lface; |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4465 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4466 /* 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
|
4467 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
|
4468 face-set-after-frame-defaults. */ |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4469 if (NILP (f->face_alist)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4470 return; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4471 |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4472 if (EQ (param, Qforeground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4473 { |
| 57107 | 4474 face = Qdefault; |
| 4475 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
|
4476 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4477 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4478 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4479 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4480 else if (EQ (param, Qbackground_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4481 { |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4482 Lisp_Object frame; |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4483 |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4484 /* Changing the background color might change the background |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4485 mode, so that we have to load new defface specs. Call |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4486 frame-update-face-colors to do that. */ |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4487 XSETFRAME (frame, f); |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4488 call1 (Qframe_update_face_colors, frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4489 |
| 57107 | 4490 face = Qdefault; |
| 4491 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
|
4492 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4493 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4494 realize_basic_faces (f); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4495 } |
| 57107 | 4496 else if (EQ (param, Qborder_color)) |
| 4497 { | |
| 4498 face = Qborder; | |
| 4499 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
|
4500 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4501 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4502 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4503 else if (EQ (param, Qcursor_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4504 { |
| 57107 | 4505 face = Qcursor; |
| 4506 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
|
4507 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4508 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4509 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4510 else if (EQ (param, Qmouse_color)) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4511 { |
| 57107 | 4512 face = Qmouse; |
| 4513 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
|
4514 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4515 ? new_value : Qunspecified); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4516 } |
| 57107 | 4517 |
| 4518 /* Changing a named face means that all realized faces depending on | |
| 4519 that face are invalid. Since we cannot tell which realized faces | |
| 4520 depend on the face, make sure they are all removed. This is done | |
| 4521 by incrementing face_change_count. The next call to | |
| 4522 init_iterator will then free realized faces. */ | |
| 4523 if (!NILP (face) | |
| 4524 && NILP (Fget (face, Qface_no_inherit))) | |
| 4525 { | |
| 4526 ++face_change_count; | |
| 4527 ++windows_or_buffers_changed; | |
| 4528 } | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4529 } |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4530 |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4531 |
| 24995 | 4532 /* Get the value of X resource RESOURCE, class CLASS for the display |
| 4533 of frame FRAME. This is here because ordinary `x-get-resource' | |
| 4534 doesn't take a frame argument. */ | |
| 4535 | |
| 4536 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
|
4537 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
|
4538 (resource, class, frame) |
| 24995 | 4539 Lisp_Object resource, class, frame; |
| 4540 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4541 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
|
4542 CHECK_STRING (resource); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4543 CHECK_STRING (class); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4544 CHECK_LIVE_FRAME (frame); |
| 24995 | 4545 BLOCK_INPUT; |
| 4546 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
| 4547 resource, class, Qnil, Qnil); | |
| 4548 UNBLOCK_INPUT; | |
| 4549 return value; | |
| 4550 } | |
| 4551 | |
| 4552 | |
| 4553 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
| 4554 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
| 4555 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
| 4556 error; if SIGNAL_P is zero, return 0. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4557 |
| 24995 | 4558 static Lisp_Object |
| 4559 face_boolean_x_resource_value (value, signal_p) | |
| 4560 Lisp_Object value; | |
| 4561 int signal_p; | |
| 4562 { | |
| 4563 Lisp_Object result = make_number (0); | |
| 4564 | |
| 4565 xassert (STRINGP (value)); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4566 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4567 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
|
4568 || xstricmp (SDATA (value), "true") == 0) |
| 24995 | 4569 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
|
4570 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
|
4571 || xstricmp (SDATA (value), "false") == 0) |
| 24995 | 4572 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
|
4573 else if (xstricmp (SDATA (value), "unspecified") == 0) |
| 24995 | 4574 result = Qunspecified; |
| 4575 else if (signal_p) | |
| 4576 signal_error ("Invalid face attribute value from X resource", value); | |
| 4577 | |
| 4578 return result; | |
| 4579 } | |
| 4580 | |
| 4581 | |
| 4582 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
| 4583 Finternal_set_lisp_face_attribute_from_resource, | |
| 4584 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
|
4585 3, 4, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4586 (face, attr, value, frame) |
| 24995 | 4587 Lisp_Object face, attr, value, frame; |
| 4588 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4589 CHECK_SYMBOL (face); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4590 CHECK_SYMBOL (attr); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4591 CHECK_STRING (value); |
| 24995 | 4592 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4593 if (xstricmp (SDATA (value), "unspecified") == 0) |
| 24995 | 4594 value = Qunspecified; |
| 4595 else if (EQ (attr, QCheight)) | |
| 4596 { | |
| 4597 value = Fstring_to_number (value, make_number (10)); | |
| 4598 if (XINT (value) <= 0) | |
| 4599 signal_error ("Invalid face height from X resource", value); | |
| 4600 } | |
| 4601 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
| 4602 value = face_boolean_x_resource_value (value, 1); | |
| 4603 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
|
4604 value = intern (SDATA (value)); |
| 24995 | 4605 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
| 4606 value = face_boolean_x_resource_value (value, 1); | |
| 4607 else if (EQ (attr, QCunderline) | |
| 4608 || EQ (attr, QCoverline) | |
|
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4609 || EQ (attr, QCstrike_through)) |
| 24995 | 4610 { |
| 4611 Lisp_Object boolean_value; | |
| 4612 | |
| 4613 /* If the result of face_boolean_x_resource_value is t or nil, | |
| 4614 VALUE does NOT specify a color. */ | |
| 4615 boolean_value = face_boolean_x_resource_value (value, 0); | |
| 4616 if (SYMBOLP (boolean_value)) | |
| 4617 value = boolean_value; | |
| 4618 } | |
|
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4619 else if (EQ (attr, QCbox)) |
|
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4620 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
| 24995 | 4621 |
| 4622 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
|
4623 } |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4624 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4625 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 4626 |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4627 |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4628 /*********************************************************************** |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4629 Menu face |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4630 ***********************************************************************/ |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4631 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4632 #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
|
4633 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4634 /* 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
|
4635 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4636 static void |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4637 x_update_menu_appearance (f) |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4638 struct frame *f; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4639 { |
|
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4640 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
|
4641 XrmDatabase rdb; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4642 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4643 if (dpyinfo |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4644 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4645 rdb != NULL)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4646 { |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4647 char line[512]; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4648 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
|
4649 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
|
4650 const char *myname = SDATA (Vx_resource_name); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4651 int changed_p = 0; |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4652 #ifdef USE_MOTIF |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4653 const char *popup_path = "popup_menu"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4654 #else |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4655 const char *popup_path = "menu.popup"; |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4656 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4657 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4658 if (STRINGP (LFACE_FOREGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4659 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4660 sprintf (line, "%s.%s*foreground: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4661 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
|
4662 SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4663 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4664 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
|
4665 myname, SDATA (LFACE_FOREGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4666 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4667 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4668 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4669 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4670 if (STRINGP (LFACE_BACKGROUND (lface))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4671 { |
|
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4672 sprintf (line, "%s.%s*background: %s", |
|
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4673 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
|
4674 SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4675 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4676 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
|
4677 myname, SDATA (LFACE_BACKGROUND (lface))); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4678 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4679 changed_p = 1; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4680 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4681 |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4682 if (face->font_name |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4683 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4684 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4685 || !UNSPECIFIEDP (LFACE_AVGWIDTH (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4686 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4687 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4688 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4689 { |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4690 #ifdef USE_MOTIF |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4691 const char *suffix = "List"; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4692 #else |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4693 const char *suffix = ""; |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4694 #endif |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4695 sprintf (line, "%s.pane.menubar*font%s: %s", |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4696 myname, suffix, face->font_name); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4697 XrmPutLineResource (&rdb, line); |
|
36996
46d9cc8def79
(x_update_menu_appearance): Use local variable
Gerd Moellmann <gerd@gnu.org>
parents:
36956
diff
changeset
|
4698 sprintf (line, "%s.%s*font%s: %s", |
|
46d9cc8def79
(x_update_menu_appearance): Use local variable
Gerd Moellmann <gerd@gnu.org>
parents:
36956
diff
changeset
|
4699 myname, popup_path, suffix, face->font_name); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4700 XrmPutLineResource (&rdb, line); |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4701 changed_p = 1; |
|
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4702 } |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4703 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4704 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
|
4705 free_frame_menubar (f); |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4706 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4707 } |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4708 |
|
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4709 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
| 24995 | 4710 |
| 4711 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4712 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
|
4713 Sface_attribute_relative_p, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4714 2, 2, 0, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4715 doc: /* Return non-nil if face ATTRIBUTE VALUE is relative. */) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4716 (attribute, value) |
|
40532
221868112227
(Fface_attribute_relative_p): Declare args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40441
diff
changeset
|
4717 Lisp_Object attribute, value; |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4718 { |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4719 if (EQ (value, Qunspecified)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4720 return Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4721 else if (EQ (attribute, QCheight)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4722 return INTEGERP (value) ? Qnil : Qt; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4723 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4724 return Qnil; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4725 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4726 |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4727 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
|
4728 3, 3, 0, |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4729 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
|
4730 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
|
4731 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
|
4732 (attribute, value1, value2) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4733 Lisp_Object attribute, value1, value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4734 { |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4735 if (EQ (value1, Qunspecified)) |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4736 return value2; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4737 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
|
4738 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
|
4739 else |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4740 return value1; |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4741 } |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4742 |
| 24995 | 4743 |
| 4744 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
| 4745 Sinternal_get_lisp_face_attribute, | |
| 4746 2, 3, 0, | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4747 doc: /* Return face attribute KEYWORD of face SYMBOL. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4748 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
|
4749 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
|
4750 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
|
4751 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
|
4752 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
|
4753 (symbol, keyword, frame) |
| 24995 | 4754 Lisp_Object symbol, keyword, frame; |
| 4755 { | |
| 4756 Lisp_Object lface, value = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4757 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4758 CHECK_SYMBOL (symbol); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4759 CHECK_SYMBOL (keyword); |
| 24995 | 4760 |
| 4761 if (EQ (frame, Qt)) | |
| 4762 lface = lface_from_face_name (NULL, symbol, 1); | |
| 4763 else | |
| 4764 { | |
| 4765 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4766 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4767 CHECK_LIVE_FRAME (frame); |
| 24995 | 4768 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
| 4769 } | |
| 4770 | |
| 4771 if (EQ (keyword, QCfamily)) | |
| 4772 value = LFACE_FAMILY (lface); | |
| 4773 else if (EQ (keyword, QCheight)) | |
| 4774 value = LFACE_HEIGHT (lface); | |
| 4775 else if (EQ (keyword, QCweight)) | |
| 4776 value = LFACE_WEIGHT (lface); | |
| 4777 else if (EQ (keyword, QCslant)) | |
| 4778 value = LFACE_SLANT (lface); | |
| 4779 else if (EQ (keyword, QCunderline)) | |
| 4780 value = LFACE_UNDERLINE (lface); | |
| 4781 else if (EQ (keyword, QCoverline)) | |
| 4782 value = LFACE_OVERLINE (lface); | |
| 4783 else if (EQ (keyword, QCstrike_through)) | |
| 4784 value = LFACE_STRIKE_THROUGH (lface); | |
| 4785 else if (EQ (keyword, QCbox)) | |
| 4786 value = LFACE_BOX (lface); | |
| 4787 else if (EQ (keyword, QCinverse_video) | |
| 4788 || EQ (keyword, QCreverse_video)) | |
| 4789 value = LFACE_INVERSE (lface); | |
| 4790 else if (EQ (keyword, QCforeground)) | |
| 4791 value = LFACE_FOREGROUND (lface); | |
| 4792 else if (EQ (keyword, QCbackground)) | |
| 4793 value = LFACE_BACKGROUND (lface); | |
| 4794 else if (EQ (keyword, QCstipple)) | |
| 4795 value = LFACE_STIPPLE (lface); | |
| 4796 else if (EQ (keyword, QCwidth)) | |
| 4797 value = LFACE_SWIDTH (lface); | |
| 31178 | 4798 else if (EQ (keyword, QCinherit)) |
| 4799 value = LFACE_INHERIT (lface); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4800 else if (EQ (keyword, QCfont)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4801 value = LFACE_FONT (lface); |
| 24995 | 4802 else |
| 4803 signal_error ("Invalid face attribute name", keyword); | |
| 4804 | |
| 4805 return value; | |
| 4806 } | |
| 4807 | |
| 4808 | |
| 4809 DEFUN ("internal-lisp-face-attribute-values", | |
| 4810 Finternal_lisp_face_attribute_values, | |
| 4811 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
|
4812 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
|
4813 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
|
4814 (attr) |
| 24995 | 4815 Lisp_Object attr; |
| 4816 { | |
| 4817 Lisp_Object result = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4818 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4819 CHECK_SYMBOL (attr); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4820 |
| 24995 | 4821 if (EQ (attr, QCweight) |
| 4822 || EQ (attr, QCslant) | |
| 4823 || EQ (attr, QCwidth)) | |
| 4824 { | |
| 4825 /* Extract permissible symbols from tables. */ | |
| 4826 struct table_entry *table; | |
| 4827 int i, dim; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4828 |
| 24995 | 4829 if (EQ (attr, QCweight)) |
| 4830 table = weight_table, dim = DIM (weight_table); | |
| 4831 else if (EQ (attr, QCslant)) | |
| 4832 table = slant_table, dim = DIM (slant_table); | |
| 4833 else | |
| 4834 table = swidth_table, dim = DIM (swidth_table); | |
| 4835 | |
| 4836 for (i = 0; i < dim; ++i) | |
| 4837 { | |
| 4838 Lisp_Object symbol = *table[i].symbol; | |
| 4839 Lisp_Object tail = result; | |
| 4840 | |
| 4841 while (!NILP (tail) | |
| 4842 && !EQ (XCAR (tail), symbol)) | |
| 4843 tail = XCDR (tail); | |
| 4844 | |
| 4845 if (NILP (tail)) | |
| 4846 result = Fcons (symbol, result); | |
| 4847 } | |
| 4848 } | |
| 4849 else if (EQ (attr, QCunderline)) | |
| 4850 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 4851 else if (EQ (attr, QCoverline)) | |
| 4852 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 4853 else if (EQ (attr, QCstrike_through)) | |
| 4854 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 4855 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
| 4856 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
| 4857 | |
| 4858 return result; | |
| 4859 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4860 |
| 24995 | 4861 |
| 4862 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
|
4863 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
|
4864 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
|
4865 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
|
4866 (face, frame) |
| 24995 | 4867 Lisp_Object face, frame; |
| 4868 { | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4869 int i; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4870 Lisp_Object global_lface, local_lface, *gvec, *lvec; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4871 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4872 CHECK_LIVE_FRAME (frame); |
| 24995 | 4873 global_lface = lface_from_face_name (NULL, face, 1); |
| 4874 local_lface = lface_from_face_name (XFRAME (frame), face, 0); | |
| 4875 if (NILP (local_lface)) | |
| 4876 local_lface = Finternal_make_lisp_face (face, frame); | |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4877 |
|
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
4878 /* 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
|
4879 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
|
4880 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
|
4881 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
|
4882 "global before local" priority. */ |
|
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4883 lvec = XVECTOR (local_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4884 gvec = XVECTOR (global_lface)->contents; |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4885 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4886 if (! UNSPECIFIEDP (gvec[i])) |
|
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4887 lvec[i] = gvec[i]; |
|
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4888 |
|
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4889 return Qnil; |
| 24995 | 4890 } |
| 4891 | |
| 4892 | |
| 4893 /* The following function is implemented for compatibility with 20.2. | |
| 4894 The function is used in x-resolve-fonts when it is asked to | |
| 4895 return fonts with the same size as the font of a face. This is | |
| 4896 done in fontset.el. */ | |
| 4897 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4898 DEFUN ("face-font", Fface_font, Sface_font, 1, 2, 0, |
|
40598
7f3db64c7d42
(Finternal_merge_in_global_face): Reindent.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40555
diff
changeset
|
4899 doc: /* Return the font name of face FACE, or nil if it is unspecified. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4900 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
|
4901 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
|
4902 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
|
4903 of the form (bold), (italic) or (bold italic). |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4904 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
|
4905 (face, frame) |
| 24995 | 4906 Lisp_Object face, frame; |
| 4907 { | |
| 4908 if (EQ (frame, Qt)) | |
| 4909 { | |
| 4910 Lisp_Object result = Qnil; | |
| 4911 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
| 4912 | |
| 4913 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
| 4914 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
| 4915 result = Fcons (Qbold, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4916 |
|
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
4917 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
| 24995 | 4918 && !EQ (LFACE_SLANT (lface), Qnormal)) |
| 4919 result = Fcons (Qitalic, result); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4920 |
| 24995 | 4921 return result; |
| 4922 } | |
| 4923 else | |
| 4924 { | |
| 4925 struct frame *f = frame_or_selected_frame (frame, 1); | |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4926 int face_id = lookup_named_face (f, face, 0, 1); |
| 24995 | 4927 struct face *face = FACE_FROM_ID (f, face_id); |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4928 return face ? build_string (face->font_name) : Qnil; |
| 24995 | 4929 } |
| 4930 } | |
| 4931 | |
| 4932 | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4933 /* 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
|
4934 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
|
4935 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
|
4936 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4937 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
|
4938 face_attr_equal_p (v1, v2) |
|
56063
109c0a603543
(face_attr_equal_p): Declare parameters.
Andreas Schwab <schwab@suse.de>
parents:
55982
diff
changeset
|
4939 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
|
4940 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4941 /* 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
|
4942 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
|
4943 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
|
4944 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4945 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4946 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
|
4947 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4948 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4949 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
|
4950 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4951 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
|
4952 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
|
4953 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4954 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4955 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
|
4956 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4957 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
|
4958 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
|
4959 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4960 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4961 default: |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4962 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
|
4963 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4964 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4965 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4966 |
| 24995 | 4967 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
| 4968 all attributes are `equal'. Tries to be fast because this function | |
| 4969 is called quite often. */ | |
| 4970 | |
| 4971 static INLINE int | |
| 4972 lface_equal_p (v1, v2) | |
| 4973 Lisp_Object *v1, *v2; | |
| 4974 { | |
| 4975 int i, equal_p = 1; | |
| 4976 | |
| 4977 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
|
4978 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
|
4979 |
| 24995 | 4980 return equal_p; |
| 4981 } | |
| 4982 | |
| 4983 | |
| 4984 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
| 4985 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
|
4986 doc: /* True if FACE1 and FACE2 are equal. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4987 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
|
4988 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
|
4989 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
|
4990 (face1, face2, frame) |
| 24995 | 4991 Lisp_Object face1, face2, frame; |
| 4992 { | |
| 4993 int equal_p; | |
| 4994 struct frame *f; | |
| 4995 Lisp_Object lface1, lface2; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4996 |
| 24995 | 4997 if (EQ (frame, Qt)) |
| 4998 f = NULL; | |
| 4999 else | |
| 5000 /* Don't use check_x_frame here because this function is called | |
| 5001 before X frames exist. At that time, if FRAME is nil, | |
| 5002 selected_frame will be used which is the frame dumped with | |
| 5003 Emacs. That frame is not an X frame. */ | |
| 5004 f = frame_or_selected_frame (frame, 2); | |
| 5005 | |
| 5006 lface1 = lface_from_face_name (NULL, face1, 1); | |
| 5007 lface2 = lface_from_face_name (NULL, face2, 1); | |
| 5008 equal_p = lface_equal_p (XVECTOR (lface1)->contents, | |
| 5009 XVECTOR (lface2)->contents); | |
| 5010 return equal_p ? Qt : Qnil; | |
| 5011 } | |
| 5012 | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5013 |
| 24995 | 5014 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
| 5015 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
|
5016 doc: /* True if FACE has no attribute specified. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5017 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
|
5018 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
|
5019 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
|
5020 (face, frame) |
| 24995 | 5021 Lisp_Object face, frame; |
| 5022 { | |
| 5023 struct frame *f; | |
| 5024 Lisp_Object lface; | |
| 5025 int i; | |
| 5026 | |
| 5027 if (NILP (frame)) | |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
5028 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5029 CHECK_LIVE_FRAME (frame); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
5030 f = XFRAME (frame); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5031 |
| 24995 | 5032 if (EQ (frame, Qt)) |
| 5033 lface = lface_from_face_name (NULL, face, 1); | |
| 5034 else | |
| 5035 lface = lface_from_face_name (f, face, 1); | |
| 5036 | |
| 5037 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
|
5038 if (!UNSPECIFIEDP (AREF (lface, i))) |
| 24995 | 5039 break; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5040 |
| 24995 | 5041 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
| 5042 } | |
| 5043 | |
| 5044 | |
| 5045 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
|
5046 0, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5047 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
|
5048 For internal use only. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5049 (frame) |
| 24995 | 5050 Lisp_Object frame; |
| 5051 { | |
| 5052 struct frame *f = frame_or_selected_frame (frame, 0); | |
| 5053 return f->face_alist; | |
| 5054 } | |
| 5055 | |
| 5056 | |
| 5057 /* Return a hash code for Lisp string STRING with case ignored. Used | |
| 5058 below in computing a hash value for a Lisp face. */ | |
| 5059 | |
| 5060 static INLINE unsigned | |
| 5061 hash_string_case_insensitive (string) | |
| 5062 Lisp_Object string; | |
| 5063 { | |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
5064 const unsigned char *s; |
| 24995 | 5065 unsigned hash = 0; |
| 5066 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
|
5067 for (s = SDATA (string); *s; ++s) |
| 24995 | 5068 hash = (hash << 1) ^ tolower (*s); |
| 5069 return hash; | |
| 5070 } | |
| 5071 | |
| 5072 | |
| 5073 /* Return a hash code for face attribute vector V. */ | |
| 5074 | |
| 5075 static INLINE unsigned | |
| 5076 lface_hash (v) | |
| 5077 Lisp_Object *v; | |
| 5078 { | |
| 5079 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
| 5080 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) | |
| 5081 ^ hash_string_case_insensitive (v[LFACE_BACKGROUND_INDEX]) | |
|
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
5082 ^ XFASTINT (v[LFACE_WEIGHT_INDEX]) |
|
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
5083 ^ XFASTINT (v[LFACE_SLANT_INDEX]) |
|
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
5084 ^ XFASTINT (v[LFACE_SWIDTH_INDEX]) |
| 24995 | 5085 ^ XFASTINT (v[LFACE_HEIGHT_INDEX])); |
| 5086 } | |
| 5087 | |
| 5088 | |
| 5089 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
| 5090 considering charsets/registries). They do if they specify the same | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5091 family, point size, weight, width, slant, and fontset. Both LFACE1 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5092 and LFACE2 must be fully-specified. */ |
| 24995 | 5093 |
| 5094 static INLINE int | |
| 5095 lface_same_font_attributes_p (lface1, lface2) | |
| 5096 Lisp_Object *lface1, *lface2; | |
| 5097 { | |
| 5098 xassert (lface_fully_specified_p (lface1) | |
| 5099 && 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
|
5100 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
|
5101 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
| 31178 | 5102 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
| 24995 | 5103 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX]) |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5104 && EQ (lface1[LFACE_AVGWIDTH_INDEX], lface2[LFACE_AVGWIDTH_INDEX]) |
| 24995 | 5105 && 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
|
5106 && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX]) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5107 && (EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX]) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5108 || (STRINGP (lface1[LFACE_FONT_INDEX]) |
|
28263
73181b84ea57
(lface_same_font_attributes_p): Compare font attributes
Gerd Moellmann <gerd@gnu.org>
parents:
28237
diff
changeset
|
5109 && STRINGP (lface2[LFACE_FONT_INDEX]) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5110 && xstricmp (SDATA (lface1[LFACE_FONT_INDEX]), |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5111 SDATA (lface2[LFACE_FONT_INDEX]))))); |
| 24995 | 5112 } |
| 5113 | |
| 5114 | |
| 5115 | |
| 5116 /*********************************************************************** | |
| 5117 Realized Faces | |
| 5118 ***********************************************************************/ | |
| 5119 | |
| 5120 /* 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
|
5121 vector ATTR. */ |
| 24995 | 5122 |
| 5123 static struct face * | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5124 make_realized_face (attr) |
| 24995 | 5125 Lisp_Object *attr; |
| 5126 { | |
| 5127 struct face *face = (struct face *) xmalloc (sizeof *face); | |
| 5128 bzero (face, sizeof *face); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5129 face->ascii_face = face; |
| 24995 | 5130 bcopy (attr, face->lface, sizeof face->lface); |
| 5131 return face; | |
| 5132 } | |
| 5133 | |
| 5134 | |
| 5135 /* Free realized face FACE, including its X resources. FACE may | |
| 5136 be null. */ | |
| 5137 | |
| 5138 static void | |
| 5139 free_realized_face (f, face) | |
| 5140 struct frame *f; | |
| 5141 struct face *face; | |
| 5142 { | |
| 5143 if (face) | |
| 5144 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5145 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5146 if (FRAME_WINDOW_P (f)) |
| 24995 | 5147 { |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5148 /* 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
|
5149 if (face->fontset >= 0 && face == face->ascii_face) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5150 free_face_fontset (f, face); |
| 24995 | 5151 if (face->gc) |
| 5152 { | |
| 5153 x_free_gc (f, face->gc); | |
| 5154 face->gc = 0; | |
| 5155 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5156 |
| 24995 | 5157 free_face_colors (f, face); |
| 5158 x_destroy_bitmap (f, face->stipple); | |
| 5159 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5160 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5161 |
| 5162 xfree (face); | |
| 5163 } | |
| 5164 } | |
| 5165 | |
| 5166 | |
| 5167 /* Prepare face FACE for subsequent display on frame F. This | |
| 5168 allocated GCs if they haven't been allocated yet or have been freed | |
| 5169 by clearing the face cache. */ | |
| 5170 | |
| 5171 void | |
| 5172 prepare_face_for_display (f, face) | |
| 5173 struct frame *f; | |
| 5174 struct face *face; | |
| 5175 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5176 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5177 xassert (FRAME_WINDOW_P (f)); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5178 |
| 24995 | 5179 if (face->gc == 0) |
| 5180 { | |
| 5181 XGCValues xgcv; | |
| 5182 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
| 5183 | |
| 5184 xgcv.foreground = face->foreground; | |
| 5185 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
|
5186 #ifdef HAVE_X_WINDOWS |
| 24995 | 5187 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
|
5188 #endif |
| 24995 | 5189 /* The font of FACE may be null if we couldn't load it. */ |
| 5190 if (face->font) | |
| 5191 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5192 #ifdef HAVE_X_WINDOWS |
| 24995 | 5193 xgcv.font = face->font->fid; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5194 #endif |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5195 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5196 xgcv.font = face->font; |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5197 #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
|
5198 #ifdef MAC_OS |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
5199 xgcv.font = face->font; |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
5200 #endif |
| 24995 | 5201 mask |= GCFont; |
| 5202 } | |
| 5203 | |
| 5204 BLOCK_INPUT; | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5205 #ifdef HAVE_X_WINDOWS |
| 24995 | 5206 if (face->stipple) |
| 5207 { | |
|
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
5208 xgcv.fill_style = FillOpaqueStippled; |
| 24995 | 5209 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
| 5210 mask |= GCFillStyle | GCStipple; | |
| 5211 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5212 #endif |
| 24995 | 5213 face->gc = x_create_gc (f, mask, &xgcv); |
| 5214 UNBLOCK_INPUT; | |
| 5215 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5216 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5217 } |
| 5218 | |
| 5219 | |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5220 /* 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
|
5221 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5222 static int |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5223 color_distance (x, y) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5224 XColor *x, *y; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5225 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5226 /* 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
|
5227 Quoting from that paper: |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5228 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5229 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
|
5230 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
|
5231 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
|
5232 gives far from optimal results. |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5233 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5234 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
|
5235 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5236 long r = (x->red - y->red) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5237 long g = (x->green - y->green) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5238 long b = (x->blue - y->blue) >> 8; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5239 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
|
5240 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5241 return |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5242 (((512 + r_mean) * r * r) >> 8) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5243 + 4 * g * g |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5244 + (((767 - r_mean) * b * b) >> 8); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5245 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5246 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5247 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5248 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
|
5249 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
|
5250 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
|
5251 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
|
5252 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
|
5253 (color1, color2, frame) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5254 Lisp_Object color1, color2, frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5255 { |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5256 struct frame *f; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5257 XColor cdef1, cdef2; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5258 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5259 if (NILP (frame)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5260 frame = selected_frame; |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5261 CHECK_LIVE_FRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5262 f = XFRAME (frame); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5263 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5264 if ((CONSP (color1) && !parse_rgb_list (color1, &cdef1)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5265 || !STRINGP (color1) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5266 || !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
|
5267 signal_error ("Invalid color", color1); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5268 if ((CONSP (color2) && !parse_rgb_list (color2, &cdef2)) |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5269 || !STRINGP (color2) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5270 || !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
|
5271 signal_error ("Invalid color", color2); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5272 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5273 return make_number (color_distance (&cdef1, &cdef2)); |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5274 } |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5275 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5276 |
|
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5277 /*********************************************************************** |
| 24995 | 5278 Face Cache |
| 5279 ***********************************************************************/ | |
| 5280 | |
| 5281 /* Return a new face cache for frame F. */ | |
| 5282 | |
| 5283 static struct face_cache * | |
| 5284 make_face_cache (f) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5285 struct frame *f; |
| 24995 | 5286 { |
| 5287 struct face_cache *c; | |
| 5288 int size; | |
| 5289 | |
| 5290 c = (struct face_cache *) xmalloc (sizeof *c); | |
| 5291 bzero (c, sizeof *c); | |
| 5292 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 5293 c->buckets = (struct face **) xmalloc (size); | |
| 5294 bzero (c->buckets, size); | |
| 5295 c->size = 50; | |
| 5296 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
| 5297 c->f = f; | |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5298 c->menu_face_changed_p = menu_face_changed_default; |
| 24995 | 5299 return c; |
| 5300 } | |
| 5301 | |
| 5302 | |
| 5303 /* Clear out all graphics contexts for all realized faces, except for | |
| 5304 the basic faces. This should be done from time to time just to avoid | |
| 5305 keeping too many graphics contexts that are no longer needed. */ | |
| 5306 | |
| 5307 static void | |
| 5308 clear_face_gcs (c) | |
| 5309 struct face_cache *c; | |
| 5310 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5311 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
|
5312 { |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5313 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 5314 int i; |
| 5315 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
| 5316 { | |
| 5317 struct face *face = c->faces_by_id[i]; | |
| 5318 if (face && face->gc) | |
| 5319 { | |
| 5320 x_free_gc (c->f, face->gc); | |
| 5321 face->gc = 0; | |
| 5322 } | |
| 5323 } | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5324 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 5325 } |
| 5326 } | |
| 5327 | |
| 5328 | |
|
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
5329 /* 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
|
5330 C may be null. If faces are freed, make sure the frame's current |
| 24995 | 5331 matrix is marked invalid, so that a display caused by an expose |
| 5332 event doesn't try to use faces we destroyed. */ | |
| 5333 | |
| 5334 static void | |
| 5335 free_realized_faces (c) | |
| 5336 struct face_cache *c; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5337 { |
| 24995 | 5338 if (c && c->used) |
| 5339 { | |
| 5340 int i, size; | |
| 5341 struct frame *f = c->f; | |
| 5342 | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5343 /* 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
|
5344 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
|
5345 current matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5346 BLOCK_INPUT; |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5347 |
| 24995 | 5348 for (i = 0; i < c->used; ++i) |
| 5349 { | |
| 5350 free_realized_face (f, c->faces_by_id[i]); | |
| 5351 c->faces_by_id[i] = NULL; | |
| 5352 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5353 |
| 24995 | 5354 c->used = 0; |
| 5355 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
| 5356 bzero (c->buckets, size); | |
| 5357 | |
| 5358 /* Must do a thorough redisplay the next time. Mark current | |
| 5359 matrices as invalid because they will reference faces freed | |
| 5360 above. This function is also called when a frame is | |
| 5361 destroyed. In this case, the root window of F is nil. */ | |
| 5362 if (WINDOWP (f->root_window)) | |
| 5363 { | |
| 5364 clear_current_matrices (f); | |
| 5365 ++windows_or_buffers_changed; | |
| 5366 } | |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5367 |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5368 UNBLOCK_INPUT; |
| 24995 | 5369 } |
| 5370 } | |
| 5371 | |
| 5372 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5373 /* Free all faces realized for multibyte characters on frame F that |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5374 has FONTSET. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5375 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5376 void |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5377 free_realized_multibyte_face (f, fontset) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5378 struct frame *f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5379 int fontset; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5380 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5381 struct face_cache *cache = FRAME_FACE_CACHE (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5382 struct face *face; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5383 int i; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5384 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5385 /* 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
|
5386 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
|
5387 matrix still references freed faces. */ |
|
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5388 BLOCK_INPUT; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5389 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5390 for (i = 0; i < cache->used; i++) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5391 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5392 face = cache->faces_by_id[i]; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5393 if (face |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5394 && face != face->ascii_face |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5395 && face->fontset == fontset) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5396 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5397 uncache_face (cache, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5398 free_realized_face (f, face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5399 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5400 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5401 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5402 /* 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
|
5403 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
|
5404 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
|
5405 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
|
5406 if (WINDOWP (f->root_window)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5407 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5408 clear_current_matrices (f); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5409 ++windows_or_buffers_changed; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5410 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5411 |
|
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5412 UNBLOCK_INPUT; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5413 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5414 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5415 |
| 24995 | 5416 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
| 5417 This is done after attributes of a named face have been changed, | |
| 5418 because we can't tell which realized faces depend on that face. */ | |
| 5419 | |
| 5420 void | |
| 5421 free_all_realized_faces (frame) | |
| 5422 Lisp_Object frame; | |
| 5423 { | |
| 5424 if (NILP (frame)) | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5425 { |
| 24995 | 5426 Lisp_Object rest; |
| 5427 FOR_EACH_FRAME (rest, frame) | |
| 5428 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 5429 } | |
| 5430 else | |
| 5431 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
| 5432 } | |
| 5433 | |
| 5434 | |
| 5435 /* Free face cache C and faces in it, including their X resources. */ | |
| 5436 | |
| 5437 static void | |
| 5438 free_face_cache (c) | |
| 5439 struct face_cache *c; | |
| 5440 { | |
| 5441 if (c) | |
| 5442 { | |
| 5443 free_realized_faces (c); | |
| 5444 xfree (c->buckets); | |
| 5445 xfree (c->faces_by_id); | |
| 5446 xfree (c); | |
| 5447 } | |
| 5448 } | |
| 5449 | |
| 5450 | |
| 5451 /* Cache realized face FACE in face cache C. HASH is the hash value | |
| 5452 of FACE. If FACE->fontset >= 0, add the new face to the end of the | |
| 5453 collision list of the face hash table of C. This is done because | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5454 otherwise lookup_face would find FACE for every character, even if |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5455 faces with the same attributes but for specific characters exist. */ |
| 24995 | 5456 |
| 5457 static void | |
| 5458 cache_face (c, face, hash) | |
| 5459 struct face_cache *c; | |
| 5460 struct face *face; | |
| 5461 unsigned hash; | |
| 5462 { | |
| 5463 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
| 5464 | |
| 5465 face->hash = hash; | |
| 5466 | |
| 5467 if (face->fontset >= 0) | |
| 5468 { | |
| 5469 struct face *last = c->buckets[i]; | |
| 5470 if (last) | |
| 5471 { | |
| 5472 while (last->next) | |
| 5473 last = last->next; | |
| 5474 last->next = face; | |
| 5475 face->prev = last; | |
| 5476 face->next = NULL; | |
| 5477 } | |
| 5478 else | |
| 5479 { | |
| 5480 c->buckets[i] = face; | |
| 5481 face->prev = face->next = NULL; | |
| 5482 } | |
| 5483 } | |
| 5484 else | |
| 5485 { | |
| 5486 face->prev = NULL; | |
| 5487 face->next = c->buckets[i]; | |
| 5488 if (face->next) | |
| 5489 face->next->prev = face; | |
| 5490 c->buckets[i] = face; | |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5491 } |
|
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5492 |
| 24995 | 5493 /* Find a free slot in C->faces_by_id and use the index of the free |
| 5494 slot as FACE->id. */ | |
| 5495 for (i = 0; i < c->used; ++i) | |
| 5496 if (c->faces_by_id[i] == NULL) | |
| 5497 break; | |
| 5498 face->id = i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5499 |
| 24995 | 5500 /* 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
|
5501 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
|
5502 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5503 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
|
5504 { |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5505 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
|
5506 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
|
5507 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
|
5508 abort (); /* Alternatives? ++kfs */ |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5509 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
|
5510 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
|
5511 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
|
5512 } |
|
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5513 c->used++; |
| 24995 | 5514 } |
| 5515 | |
| 5516 #if GLYPH_DEBUG | |
| 5517 /* Check that FACE got a unique id. */ | |
| 5518 { | |
| 5519 int j, n; | |
| 5520 struct face *face; | |
| 5521 | |
| 5522 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
| 5523 for (face = c->buckets[j]; face; face = face->next) | |
| 5524 if (face->id == i) | |
| 5525 ++n; | |
| 5526 | |
| 5527 xassert (n == 1); | |
| 5528 } | |
| 5529 #endif /* GLYPH_DEBUG */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5530 |
| 24995 | 5531 c->faces_by_id[i] = face; |
| 5532 } | |
| 5533 | |
| 5534 | |
| 5535 /* Remove face FACE from cache C. */ | |
| 5536 | |
| 5537 static void | |
| 5538 uncache_face (c, face) | |
| 5539 struct face_cache *c; | |
| 5540 struct face *face; | |
| 5541 { | |
| 5542 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5543 |
| 24995 | 5544 if (face->prev) |
| 5545 face->prev->next = face->next; | |
| 5546 else | |
| 5547 c->buckets[i] = face->next; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5548 |
| 24995 | 5549 if (face->next) |
| 5550 face->next->prev = face->prev; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5551 |
| 24995 | 5552 c->faces_by_id[face->id] = NULL; |
| 5553 if (face->id == c->used) | |
| 5554 --c->used; | |
| 5555 } | |
| 5556 | |
| 5557 | |
| 5558 /* Look up a realized face with face attributes ATTR in the face cache | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5559 of frame F. The face will be used to display character C. Value |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5560 is the ID of the face found. If no suitable face is found, realize |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5561 a new one. In that case, if C is a multibyte character, BASE_FACE |
|
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
5562 is a face that has the same attributes. */ |
| 24995 | 5563 |
| 5564 INLINE int | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5565 lookup_face (f, attr, c, base_face) |
| 24995 | 5566 struct frame *f; |
| 5567 Lisp_Object *attr; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5568 int c; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5569 struct face *base_face; |
| 24995 | 5570 { |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5571 struct face_cache *cache = FRAME_FACE_CACHE (f); |
| 24995 | 5572 unsigned hash; |
| 5573 int i; | |
| 5574 struct face *face; | |
| 5575 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5576 xassert (cache != NULL); |
| 24995 | 5577 check_lface_attrs (attr); |
| 5578 | |
| 5579 /* Look up ATTR in the face cache. */ | |
| 5580 hash = lface_hash (attr); | |
| 5581 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5582 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5583 for (face = cache->buckets[i]; face; face = face->next) |
| 24995 | 5584 if (face->hash == hash |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5585 && (!FRAME_WINDOW_P (f) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5586 || FACE_SUITABLE_FOR_CHAR_P (face, c)) |
| 24995 | 5587 && lface_equal_p (face->lface, attr)) |
| 5588 break; | |
| 5589 | |
| 5590 /* If not found, realize a new face. */ | |
| 5591 if (face == NULL) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5592 face = realize_face (cache, attr, c, base_face, -1); |
| 24995 | 5593 |
| 5594 #if GLYPH_DEBUG | |
| 5595 xassert (face == FACE_FROM_ID (f, face->id)); | |
| 28409 | 5596 |
| 5597 /* When this function is called from face_for_char (in this case, C is | |
| 5598 a multibyte character), a fontset of a face returned by | |
| 5599 realize_face is not yet set, i.e. FACE_SUITABLE_FOR_CHAR_P (FACE, | |
| 5600 C) is not sutisfied. The fontset is set for this face by | |
| 5601 face_for_char later. */ | |
|
28349
26f2a2e9a2b5
(lookup_face): Don't assert FACE_SUITABLE_FOR_CHAR_P.
Gerd Moellmann <gerd@gnu.org>
parents:
28263
diff
changeset
|
5602 #if 0 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5603 if (FRAME_WINDOW_P (f)) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5604 xassert (FACE_SUITABLE_FOR_CHAR_P (face, c)); |
|
28349
26f2a2e9a2b5
(lookup_face): Don't assert FACE_SUITABLE_FOR_CHAR_P.
Gerd Moellmann <gerd@gnu.org>
parents:
28263
diff
changeset
|
5605 #endif |
| 24995 | 5606 #endif /* GLYPH_DEBUG */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5607 |
| 24995 | 5608 return face->id; |
|
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5609 } |
| 24995 | 5610 |
| 5611 | |
| 5612 /* Return the face id of the realized face for named face SYMBOL on | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5613 frame F suitable for displaying character C. Value is -1 if the |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5614 face couldn't be determined, which might happen if the default face |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5615 isn't realized and cannot be realized. */ |
| 24995 | 5616 |
| 5617 int | |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5618 lookup_named_face (f, symbol, c, signal_p) |
| 24995 | 5619 struct frame *f; |
| 5620 Lisp_Object symbol; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5621 int c; |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5622 int signal_p; |
| 24995 | 5623 { |
| 5624 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 5625 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; | |
| 5626 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 5627 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5628 if (default_face == NULL) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5629 { |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5630 if (!realize_basic_faces (f)) |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5631 return -1; |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5632 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5633 } |
|
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5634 |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5635 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p)) |
|
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5636 return -1; |
|
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5637 |
| 24995 | 5638 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
|
5639 merge_face_vectors (f, symbol_attrs, attrs, 0); |
|
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5640 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5641 return lookup_face (f, attrs, c, NULL); |
| 24995 | 5642 } |
| 5643 | |
| 5644 | |
| 5645 /* Return the ID of the realized ASCII face of Lisp face with ID | |
| 5646 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
| 5647 | |
| 5648 int | |
| 5649 ascii_face_of_lisp_face (f, lface_id) | |
| 5650 struct frame *f; | |
| 5651 int lface_id; | |
| 5652 { | |
| 5653 int face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5654 |
| 24995 | 5655 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
| 5656 { | |
| 5657 Lisp_Object face_name = lface_id_to_name[lface_id]; | |
|
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5658 face_id = lookup_named_face (f, face_name, 0, 1); |
| 24995 | 5659 } |
| 5660 else | |
| 5661 face_id = -1; | |
| 5662 | |
| 5663 return face_id; | |
| 5664 } | |
| 5665 | |
| 5666 | |
| 5667 /* Return a face for charset ASCII that is like the face with id | |
| 5668 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
| 5669 STEPS < 0 means larger. Value is the id of the face. */ | |
| 5670 | |
| 5671 int | |
| 5672 smaller_face (f, face_id, steps) | |
| 5673 struct frame *f; | |
| 5674 int face_id, steps; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5675 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5676 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 5677 struct face *face; |
| 5678 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 5679 int pt, last_pt, last_height; | |
| 5680 int delta; | |
| 5681 int new_face_id; | |
| 5682 struct face *new_face; | |
| 5683 | |
| 5684 /* If not called for an X frame, just return the original face. */ | |
| 5685 if (FRAME_TERMCAP_P (f)) | |
| 5686 return face_id; | |
| 5687 | |
| 5688 /* Try in increments of 1/2 pt. */ | |
| 5689 delta = steps < 0 ? 5 : -5; | |
| 5690 steps = abs (steps); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5691 |
| 24995 | 5692 face = FACE_FROM_ID (f, face_id); |
| 5693 bcopy (face->lface, attrs, sizeof attrs); | |
| 5694 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
| 5695 new_face_id = face_id; | |
| 5696 last_height = FONT_HEIGHT (face->font); | |
| 5697 | |
| 5698 while (steps | |
| 5699 && pt + delta > 0 | |
| 5700 /* Give up if we cannot find a font within 10pt. */ | |
| 5701 && abs (last_pt - pt) < 100) | |
| 5702 { | |
| 5703 /* Look up a face for a slightly smaller/larger font. */ | |
| 5704 pt += delta; | |
| 5705 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5706 new_face_id = lookup_face (f, attrs, 0, NULL); |
| 24995 | 5707 new_face = FACE_FROM_ID (f, new_face_id); |
| 5708 | |
| 5709 /* 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
|
5710 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
|
5711 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
| 24995 | 5712 { |
| 5713 --steps; | |
| 5714 last_height = FONT_HEIGHT (new_face->font); | |
| 5715 last_pt = pt; | |
| 5716 } | |
| 5717 } | |
| 5718 | |
| 5719 return new_face_id; | |
| 5720 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5721 #else /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 5722 |
| 5723 return face_id; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5724 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5725 #endif /* not HAVE_WINDOW_SYSTEM */ |
| 24995 | 5726 } |
| 5727 | |
| 5728 | |
| 5729 /* Return a face for charset ASCII that is like the face with id | |
| 5730 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
|
5731 |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
5732 int |
| 24995 | 5733 face_with_height (f, face_id, height) |
| 5734 struct frame *f; | |
| 5735 int face_id; | |
| 5736 int height; | |
| 5737 { | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5738 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 5739 struct face *face; |
| 5740 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 5741 | |
| 5742 if (FRAME_TERMCAP_P (f) | |
| 5743 || height <= 0) | |
| 5744 return face_id; | |
| 5745 | |
| 5746 face = FACE_FROM_ID (f, face_id); | |
| 5747 bcopy (face->lface, attrs, sizeof attrs); | |
| 5748 attrs[LFACE_HEIGHT_INDEX] = make_number (height); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5749 face_id = lookup_face (f, attrs, 0, NULL); |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5750 #endif /* HAVE_WINDOW_SYSTEM */ |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5751 |
| 24995 | 5752 return face_id; |
| 5753 } | |
| 5754 | |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5755 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5756 /* Return the face id of the realized face for named face SYMBOL on |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5757 frame F suitable for displaying character C, and use attributes of |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5758 the face FACE_ID for attributes that aren't completely specified by |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5759 SYMBOL. This is like lookup_named_face, except that the default |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5760 attributes come from FACE_ID, not from the default face. FACE_ID |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5761 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
|
5762 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5763 int |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5764 lookup_derived_face (f, symbol, c, face_id) |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5765 struct frame *f; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5766 Lisp_Object symbol; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5767 int c; |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5768 int face_id; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5769 { |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5770 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5771 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
|
5772 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
|
5773 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5774 if (!default_face) |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5775 abort (); |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5776 |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5777 get_lface_attributes (f, symbol, symbol_attrs, 1); |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5778 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
|
5779 merge_face_vectors (f, symbol_attrs, attrs, 0); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5780 return lookup_face (f, attrs, c, default_face); |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5781 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5782 |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5783 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
|
5784 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
|
5785 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
|
5786 (plist) |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5787 Lisp_Object plist; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5788 { |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5789 Lisp_Object lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5790 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
|
5791 Qunspecified); |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5792 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
|
5793 1, 0); |
|
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5794 return lface; |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5795 } |
|
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5796 |
| 24995 | 5797 |
| 5798 | |
| 5799 /*********************************************************************** | |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5800 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
|
5801 ***********************************************************************/ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5802 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5803 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5804 /* 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
|
5805 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
|
5806 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
|
5807 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5808 #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
|
5809 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5810 #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
|
5811 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5812 /* 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
|
5813 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
|
5814 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5815 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
|
5816 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
|
5817 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
|
5818 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5819 \(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
|
5820 \(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
|
5821 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5822 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
|
5823 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
|
5824 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
|
5825 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
|
5826 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
|
5827 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5828 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
|
5829 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5830 /* 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
|
5831 face. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5832 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
|
5833 && 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
|
5834 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
|
5835 || (!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
|
5836 && 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
|
5837 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
|
5838 || (!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
|
5839 && 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
|
5840 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
|
5841 || (!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
|
5842 && 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
|
5843 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
|
5844 || (!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
|
5845 && 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
|
5846 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
|
5847 || (!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
|
5848 && 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
|
5849 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
|
5850 || (!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
|
5851 && 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
|
5852 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
|
5853 || (!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
|
5854 && 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
|
5855 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
|
5856 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5857 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5858 /* 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
|
5859 "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
|
5860 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
|
5861 || !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
|
5862 || !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
|
5863 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5864 || !UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5865 || !UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX])) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5866 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5867 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
|
5868 Lisp_Object merged_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
|
5869 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5870 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
|
5871 |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5872 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
|
5873 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5874 face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0)); |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5875 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5876 if (! face) |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5877 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
|
5878 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5879 /* 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
|
5880 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
|
5881 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5882 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5883 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5884 /* 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
|
5885 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5886 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5887 |
|
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5888 #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
|
5889 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5890 /* 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
|
5891 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
|
5892 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5893 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
|
5894 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
|
5895 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
|
5896 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5897 \(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
|
5898 \(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
|
5899 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5900 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
|
5901 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
|
5902 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
|
5903 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
|
5904 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
|
5905 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5906 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
|
5907 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
|
5908 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
|
5909 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
|
5910 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
|
5911 { |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5912 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
|
5913 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
|
5914 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
|
5915 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
|
5916 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
|
5917 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
|
5918 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5919 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5920 /* 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
|
5921 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
|
5922 (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
|
5923 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
|
5924 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
|
5925 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
|
5926 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
|
5927 specifies. */ |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5928 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
|
5929 || !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
|
5930 || !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
|
5931 || !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
|
5932 || !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
|
5933 || !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
|
5934 || !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
|
5935 || !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
|
5936 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5937 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5938 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5939 /* 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
|
5940 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5941 /* font weight (bold/dim) */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5942 weight = face_numeric_weight (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
|
5943 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
|
5944 { |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5945 int def_weight = face_numeric_weight (def_attrs[LFACE_WEIGHT_INDEX]); |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5946 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5947 if (weight > XLFD_WEIGHT_MEDIUM) |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5948 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5949 if (def_weight > XLFD_WEIGHT_MEDIUM) |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5950 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
|
5951 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
|
5952 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5953 else if (weight < XLFD_WEIGHT_MEDIUM) |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5954 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5955 if (def_weight < XLFD_WEIGHT_MEDIUM) |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5956 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
|
5957 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
|
5958 } |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5959 else if (def_weight == XLFD_WEIGHT_MEDIUM) |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5960 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
|
5961 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5962 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5963 /* underlining */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5964 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
|
5965 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
|
5966 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5967 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
|
5968 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
|
5969 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
|
5970 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
|
5971 else |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5972 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
|
5973 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5974 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5975 /* inverse video */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5976 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
|
5977 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
|
5978 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5979 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
|
5980 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
|
5981 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5982 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
|
5983 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5984 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5985 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5986 /* Color testing. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5987 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5988 /* 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
|
5989 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
|
5990 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
|
5991 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
|
5992 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
|
5993 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5994 /* 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
|
5995 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
|
5996 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
|
5997 { |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5998 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
|
5999 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6000 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
|
6001 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
|
6002 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
|
6003 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
|
6004 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
|
6005 > 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
|
6006 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
|
6007 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6008 /* 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
|
6009 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6010 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
|
6011 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
|
6012 && (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
|
6013 <= 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
|
6014 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6015 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6016 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6017 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6018 /* 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
|
6019 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
|
6020 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
|
6021 { |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6022 Lisp_Object def_bg = 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
|
6023 |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6024 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
|
6025 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
|
6026 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
|
6027 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
|
6028 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
|
6029 > 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
|
6030 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
|
6031 else |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6032 /* 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
|
6033 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6034 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
|
6035 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
|
6036 && (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
|
6037 <= 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
|
6038 return 0; |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6039 } |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6040 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6041 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6042 /* 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
|
6043 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
|
6044 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
|
6045 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
|
6046 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
|
6047 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6048 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
|
6049 = (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
|
6050 - 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
|
6051 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
|
6052 || 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
|
6053 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6054 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6055 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6056 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6057 /* 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
|
6058 given colors. */ |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6059 if (test_caps != 0 && |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6060 ! tty_capable_p (f, test_caps, fg_tty_color.pixel, bg_tty_color.pixel)) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6061 return 0; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6062 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6063 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6064 /* 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
|
6065 return 1; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6066 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6067 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6068 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6069 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
|
6070 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
|
6071 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
|
6072 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
|
6073 The optional argument DISPLAY can be a display name, a frame, or |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6074 nil (meaning the selected frame's display) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6075 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6076 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
|
6077 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
|
6078 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
|
6079 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6080 \(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
|
6081 \(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
|
6082 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6083 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
|
6084 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
|
6085 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
|
6086 satisfied by the tty display code's automatic substitution of a `dim' |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6087 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
|
6088 (attributes, display) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6089 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
|
6090 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6091 int supports, i; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6092 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
|
6093 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
|
6094 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
|
6095 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
|
6096 |
|
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6097 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
|
6098 /* 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
|
6099 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
|
6100 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
|
6101 return Qnil; |
|
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6102 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6103 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
|
6104 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
|
6105 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
|
6106 frame = display; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6107 else |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6108 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6109 /* 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
|
6110 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
|
6111 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6112 frame = Qnil; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6113 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
|
6114 { |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6115 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
|
6116 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
|
6117 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
|
6118 display))) |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6119 break; |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6120 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6121 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6122 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6123 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
|
6124 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
|
6125 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6126 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
|
6127 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
|
6128 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
|
6129 |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6130 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
|
6131 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
|
6132 { |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6133 if (! realize_basic_faces (f)) |
|
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
6134 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
|
6135 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
|
6136 } |
|
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6137 |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6138 /* 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
|
6139 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
|
6140 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
|
6141 #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
|
6142 else |
|
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6143 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
|
6144 #endif |
|
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6145 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6146 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
|
6147 } |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6148 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6149 |
|
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6150 /*********************************************************************** |
| 24995 | 6151 Font selection |
| 6152 ***********************************************************************/ | |
| 6153 | |
| 6154 DEFUN ("internal-set-font-selection-order", | |
| 6155 Finternal_set_font_selection_order, | |
| 6156 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
|
6157 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
|
6158 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
|
6159 `:height', `:weight', and `:slant'. Face attributes appearing |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6160 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
|
6161 `: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
|
6162 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
|
6163 Value is ORDER. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6164 (order) |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6165 Lisp_Object order; |
| 24995 | 6166 { |
| 6167 Lisp_Object list; | |
| 6168 int i; | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6169 int indices[DIM (font_sort_order)]; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6170 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6171 CHECK_LIST (order); |
| 24995 | 6172 bzero (indices, sizeof indices); |
| 6173 i = 0; | |
| 6174 | |
| 6175 for (list = order; | |
| 6176 CONSP (list) && i < DIM (indices); | |
| 6177 list = XCDR (list), ++i) | |
| 6178 { | |
| 6179 Lisp_Object attr = XCAR (list); | |
| 6180 int xlfd; | |
| 6181 | |
| 6182 if (EQ (attr, QCwidth)) | |
| 6183 xlfd = XLFD_SWIDTH; | |
| 6184 else if (EQ (attr, QCheight)) | |
| 6185 xlfd = XLFD_POINT_SIZE; | |
| 6186 else if (EQ (attr, QCweight)) | |
| 6187 xlfd = XLFD_WEIGHT; | |
| 6188 else if (EQ (attr, QCslant)) | |
| 6189 xlfd = XLFD_SLANT; | |
| 6190 else | |
| 6191 break; | |
| 6192 | |
| 6193 if (indices[i] != 0) | |
| 6194 break; | |
| 6195 indices[i] = xlfd; | |
| 6196 } | |
| 6197 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6198 if (!NILP (list) || i != DIM (indices)) |
| 24995 | 6199 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
|
6200 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
|
6201 if (indices[i] == 0) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6202 signal_error ("Invalid font sort order", order); |
| 24995 | 6203 |
| 6204 if (bcmp (indices, font_sort_order, sizeof indices) != 0) | |
| 6205 { | |
| 6206 bcopy (indices, font_sort_order, sizeof font_sort_order); | |
| 6207 free_all_realized_faces (Qnil); | |
| 6208 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6209 |
| 24995 | 6210 return Qnil; |
| 6211 } | |
| 6212 | |
| 6213 | |
| 6214 DEFUN ("internal-set-alternative-font-family-alist", | |
| 6215 Finternal_set_alternative_font_family_alist, | |
| 6216 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
|
6217 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
|
6218 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6219 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
|
6220 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
|
6221 (alist) |
| 24995 | 6222 Lisp_Object alist; |
| 6223 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6224 CHECK_LIST (alist); |
| 24995 | 6225 Vface_alternative_font_family_alist = alist; |
| 6226 free_all_realized_faces (Qnil); | |
| 6227 return alist; | |
| 6228 } | |
| 6229 | |
| 6230 | |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6231 DEFUN ("internal-set-alternative-font-registry-alist", |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6232 Finternal_set_alternative_font_registry_alist, |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6233 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
|
6234 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
|
6235 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6236 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
|
6237 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
|
6238 (alist) |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6239 Lisp_Object alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6240 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6241 CHECK_LIST (alist); |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6242 Vface_alternative_font_registry_alist = alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6243 free_all_realized_faces (Qnil); |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6244 return alist; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6245 } |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6246 |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6247 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6248 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 6249 |
| 6250 /* Value is non-zero if FONT is the name of a scalable font. The | |
| 6251 X11R6 XLFD spec says that point size, pixel size, and average width | |
| 6252 are zero for scalable fonts. Intlfonts contain at least one | |
| 6253 scalable font ("*-muleindian-1") for which this isn't true, so we | |
| 6254 just test average width. */ | |
| 6255 | |
| 6256 static int | |
| 6257 font_scalable_p (font) | |
| 6258 struct font_name *font; | |
| 6259 { | |
| 6260 char *s = font->fields[XLFD_AVGWIDTH]; | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6261 return (*s == '0' && *(s + 1) == '\0') |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6262 #ifdef WINDOWSNT |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6263 /* Windows implementation of XLFD is slightly broken for backward |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6264 compatibility with previous broken versions, so test for |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6265 wildcards as well as 0. */ |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6266 || *s == '*' |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6267 #endif |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6268 ; |
| 24995 | 6269 } |
| 6270 | |
| 6271 | |
|
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6272 /* 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
|
6273 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6274 #define FONT_POINT_SIZE_QUANTUM 5 |
|
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6275 |
| 24995 | 6276 /* Value is non-zero if FONT1 is a better match for font attributes |
| 6277 VALUES than FONT2. VALUES is an array of face attribute values in | |
| 6278 font sort order. COMPARE_PT_P zero means don't compare point | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6279 sizes. AVGWIDTH, if not zero, is a specified font average width |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6280 to compare with. */ |
| 24995 | 6281 |
| 6282 static int | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6283 better_font_p (values, font1, font2, compare_pt_p, avgwidth) |
| 24995 | 6284 int *values; |
| 6285 struct font_name *font1, *font2; | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6286 int compare_pt_p, avgwidth; |
| 24995 | 6287 { |
| 6288 int i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6289 |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6290 for (i = 0; i < DIM (font_sort_order); ++i) |
| 24995 | 6291 { |
| 6292 int xlfd_idx = font_sort_order[i]; | |
| 6293 | |
| 6294 if (compare_pt_p || xlfd_idx != XLFD_POINT_SIZE) | |
| 6295 { | |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6296 int delta1, delta2; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6297 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6298 if (xlfd_idx == XLFD_POINT_SIZE) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6299 { |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6300 delta1 = abs (values[i] - (font1->numeric[xlfd_idx] |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6301 / font1->rescale_ratio)); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6302 delta2 = abs (values[i] - (font2->numeric[xlfd_idx] |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6303 / font2->rescale_ratio)); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6304 if (abs (delta1 - delta2) < FONT_POINT_SIZE_QUANTUM) |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6305 continue; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6306 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6307 else |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6308 { |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6309 delta1 = abs (values[i] - font1->numeric[xlfd_idx]); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6310 delta2 = abs (values[i] - font2->numeric[xlfd_idx]); |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6311 } |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6312 |
| 24995 | 6313 if (delta1 > delta2) |
| 6314 return 0; | |
| 6315 else if (delta1 < delta2) | |
| 6316 return 1; | |
| 6317 else | |
| 6318 { | |
| 6319 /* The difference may be equal because, e.g., the face | |
| 6320 specifies `italic' but we have only `regular' and | |
| 6321 `oblique'. Prefer `oblique' in this case. */ | |
| 6322 if ((xlfd_idx == XLFD_WEIGHT || xlfd_idx == XLFD_SLANT) | |
| 6323 && font1->numeric[xlfd_idx] > values[i] | |
| 6324 && font2->numeric[xlfd_idx] < values[i]) | |
| 6325 return 1; | |
| 6326 } | |
| 6327 } | |
| 6328 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6329 |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6330 if (avgwidth) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6331 { |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6332 int delta1 = abs (avgwidth - font1->numeric[XLFD_AVGWIDTH]); |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6333 int delta2 = abs (avgwidth - font2->numeric[XLFD_AVGWIDTH]); |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6334 if (delta1 > delta2) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6335 return 0; |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6336 else if (delta1 < delta2) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6337 return 1; |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6338 } |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6339 |
|
52200
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6340 if (! compare_pt_p) |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6341 { |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6342 /* We prefer a real scalable font; i.e. not what autoscaled. */ |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6343 int auto_scaled_1 = (font1->numeric[XLFD_POINT_SIZE] == 0 |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6344 && font1->numeric[XLFD_RESY] > 0); |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6345 int auto_scaled_2 = (font2->numeric[XLFD_POINT_SIZE] == 0 |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6346 && font2->numeric[XLFD_RESY] > 0); |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6347 |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6348 if (auto_scaled_1 != auto_scaled_2) |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6349 return auto_scaled_2; |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6350 } |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6351 |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6352 return font1->registry_priority < font2->registry_priority; |
| 24995 | 6353 } |
| 6354 | |
| 6355 | |
| 6356 /* Value is non-zero if FONT is an exact match for face attributes in | |
| 6357 SPECIFIED. SPECIFIED is an array of face attribute values in font | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6358 sort order. AVGWIDTH, if non-zero, is an average width to compare |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6359 with. */ |
| 24995 | 6360 |
| 6361 static int | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6362 exact_face_match_p (specified, font, avgwidth) |
| 24995 | 6363 int *specified; |
| 6364 struct font_name *font; | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6365 int avgwidth; |
| 24995 | 6366 { |
| 6367 int i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6368 |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6369 for (i = 0; i < DIM (font_sort_order); ++i) |
| 24995 | 6370 if (specified[i] != font->numeric[font_sort_order[i]]) |
| 6371 break; | |
| 6372 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6373 return (i == DIM (font_sort_order) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6374 && (avgwidth <= 0 |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6375 || avgwidth == font->numeric[XLFD_AVGWIDTH])); |
| 24995 | 6376 } |
| 6377 | |
| 6378 | |
| 6379 /* Value is the name of a scaled font, generated from scalable font | |
| 6380 FONT on frame F. SPECIFIED_PT is the point-size to scale FONT to. | |
| 6381 Value is allocated from heap. */ | |
| 6382 | |
| 6383 static char * | |
| 6384 build_scalable_font_name (f, font, specified_pt) | |
| 6385 struct frame *f; | |
| 6386 struct font_name *font; | |
| 6387 int specified_pt; | |
| 6388 { | |
|
51237
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6389 char pixel_size[20]; |
| 24995 | 6390 int pixel_value; |
| 6391 double resy = FRAME_X_DISPLAY_INFO (f)->resy; | |
| 6392 double pt; | |
| 6393 | |
| 6394 /* If scalable font is for a specific resolution, compute | |
| 6395 the point size we must specify from the resolution of | |
| 6396 the display and the specified resolution of the font. */ | |
| 6397 if (font->numeric[XLFD_RESY] != 0) | |
| 6398 { | |
| 6399 pt = resy / font->numeric[XLFD_RESY] * specified_pt + 0.5; | |
| 34882 | 6400 pixel_value = font->numeric[XLFD_RESY] / (PT_PER_INCH * 10.0) * pt; |
| 24995 | 6401 } |
| 6402 else | |
| 6403 { | |
| 6404 pt = specified_pt; | |
| 34882 | 6405 pixel_value = resy / (PT_PER_INCH * 10.0) * pt; |
| 24995 | 6406 } |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6407 /* We may need a font of the different size. */ |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6408 pixel_value *= font->rescale_ratio; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6409 |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6410 /* We should keep POINT_SIZE 0. Otherwise, X server can't open a |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6411 font of the specified PIXEL_SIZE. */ |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6412 #if 0 |
|
51237
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6413 { /* Set point size of the font. */ |
|
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6414 char point_size[20]; |
|
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6415 sprintf (point_size, "%d", (int) pt); |
|
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6416 font->fields[XLFD_POINT_SIZE] = point_size; |
|
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6417 font->numeric[XLFD_POINT_SIZE] = pt; |
|
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6418 } |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6419 #endif |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6420 |
| 24995 | 6421 /* Set pixel size. */ |
| 6422 sprintf (pixel_size, "%d", pixel_value); | |
| 6423 font->fields[XLFD_PIXEL_SIZE] = pixel_size; | |
| 6424 font->numeric[XLFD_PIXEL_SIZE] = pixel_value; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6425 |
| 24995 | 6426 /* If font doesn't specify its resolution, use the |
| 6427 resolution of the display. */ | |
| 6428 if (font->numeric[XLFD_RESY] == 0) | |
| 6429 { | |
| 6430 char buffer[20]; | |
| 6431 sprintf (buffer, "%d", (int) resy); | |
| 6432 font->fields[XLFD_RESY] = buffer; | |
| 6433 font->numeric[XLFD_RESY] = resy; | |
| 6434 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6435 |
| 24995 | 6436 if (strcmp (font->fields[XLFD_RESX], "0") == 0) |
| 6437 { | |
| 6438 char buffer[20]; | |
| 6439 int resx = FRAME_X_DISPLAY_INFO (f)->resx; | |
| 6440 sprintf (buffer, "%d", resx); | |
| 6441 font->fields[XLFD_RESX] = buffer; | |
| 6442 font->numeric[XLFD_RESX] = resx; | |
| 6443 } | |
| 6444 | |
| 6445 return build_font_name (font); | |
| 6446 } | |
| 6447 | |
| 6448 | |
| 6449 /* Value is non-zero if we are allowed to use scalable font FONT. We | |
| 6450 can't run a Lisp function here since this function may be called | |
| 6451 with input blocked. */ | |
| 6452 | |
| 6453 static int | |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6454 may_use_scalable_font_p (font) |
|
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
6455 const char *font; |
| 24995 | 6456 { |
| 6457 if (EQ (Vscalable_fonts_allowed, Qt)) | |
| 6458 return 1; | |
| 6459 else if (CONSP (Vscalable_fonts_allowed)) | |
| 6460 { | |
| 6461 Lisp_Object tail, regexp; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6462 |
| 24995 | 6463 for (tail = Vscalable_fonts_allowed; CONSP (tail); tail = XCDR (tail)) |
| 6464 { | |
| 6465 regexp = XCAR (tail); | |
| 6466 if (STRINGP (regexp) | |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6467 && fast_c_string_match_ignore_case (regexp, font) >= 0) |
| 24995 | 6468 return 1; |
| 6469 } | |
| 6470 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6471 |
| 24995 | 6472 return 0; |
| 6473 } | |
| 6474 | |
| 6475 | |
| 6476 | |
|
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6477 /* Return the name of the best matching font for face attributes ATTRS |
|
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6478 in the array of font_name structures FONTS which contains NFONTS |
|
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6479 elements. WIDTH_RATIO is a factor with which to multiply average |
|
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6480 widths if ATTRS specifies such a width. |
|
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6481 |
|
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6482 Value is a font name which is allocated from the heap. FONTS is |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6483 freed by this function. |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6484 |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6485 If NEEDS_OVERSTRIKE is non-zero, a boolean is returned in it to |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6486 indicate whether the resulting font should be drawn using overstrike |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6487 to simulate bold-face. */ |
| 24995 | 6488 |
| 6489 static char * | |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6490 best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike) |
| 24995 | 6491 struct frame *f; |
| 6492 Lisp_Object *attrs; | |
| 6493 struct font_name *fonts; | |
| 6494 int nfonts; | |
|
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6495 int width_ratio; |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6496 int *needs_overstrike; |
| 24995 | 6497 { |
| 6498 char *font_name; | |
| 6499 struct font_name *best; | |
|
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
6500 int i, pt = 0; |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6501 int specified[5]; |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6502 int exact_p, avgwidth; |
| 24995 | 6503 |
| 6504 if (nfonts == 0) | |
| 6505 return NULL; | |
| 6506 | |
| 6507 /* Make specified font attributes available in `specified', | |
| 6508 indexed by sort order. */ | |
| 6509 for (i = 0; i < DIM (font_sort_order); ++i) | |
| 6510 { | |
| 6511 int xlfd_idx = font_sort_order[i]; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6512 |
| 24995 | 6513 if (xlfd_idx == XLFD_SWIDTH) |
| 6514 specified[i] = face_numeric_swidth (attrs[LFACE_SWIDTH_INDEX]); | |
| 6515 else if (xlfd_idx == XLFD_POINT_SIZE) | |
| 6516 specified[i] = pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
| 6517 else if (xlfd_idx == XLFD_WEIGHT) | |
| 6518 specified[i] = face_numeric_weight (attrs[LFACE_WEIGHT_INDEX]); | |
| 6519 else if (xlfd_idx == XLFD_SLANT) | |
| 6520 specified[i] = face_numeric_slant (attrs[LFACE_SLANT_INDEX]); | |
| 6521 else | |
| 6522 abort (); | |
| 6523 } | |
| 6524 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6525 avgwidth = (UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX]) |
|
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6526 ? 0 |
|
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6527 : XFASTINT (attrs[LFACE_AVGWIDTH_INDEX]) * width_ratio); |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6528 |
| 24995 | 6529 exact_p = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6530 |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6531 if (needs_overstrike) |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6532 *needs_overstrike = 0; |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6533 |
| 24995 | 6534 /* Start with the first non-scalable font in the list. */ |
| 6535 for (i = 0; i < nfonts; ++i) | |
| 6536 if (!font_scalable_p (fonts + i)) | |
| 6537 break; | |
| 6538 | |
| 6539 /* Find the best match among the non-scalable fonts. */ | |
| 6540 if (i < nfonts) | |
| 6541 { | |
| 6542 best = fonts + i; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6543 |
| 24995 | 6544 for (i = 1; i < nfonts; ++i) |
| 6545 if (!font_scalable_p (fonts + i) | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6546 && better_font_p (specified, fonts + i, best, 1, avgwidth)) |
| 24995 | 6547 { |
| 6548 best = fonts + i; | |
| 6549 | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6550 exact_p = exact_face_match_p (specified, best, avgwidth); |
| 24995 | 6551 if (exact_p) |
| 6552 break; | |
| 6553 } | |
| 6554 } | |
| 6555 else | |
| 6556 best = NULL; | |
| 6557 | |
| 6558 /* Unless we found an exact match among non-scalable fonts, see if | |
| 6559 we can find a better match among scalable fonts. */ | |
| 6560 if (!exact_p) | |
| 6561 { | |
| 6562 /* A scalable font is better if | |
| 6563 | |
| 6564 1. its weight, slant, swidth attributes are better, or. | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6565 |
| 24995 | 6566 2. the best non-scalable font doesn't have the required |
| 6567 point size, and the scalable fonts weight, slant, swidth | |
| 6568 isn't worse. */ | |
| 6569 | |
| 6570 int non_scalable_has_exact_height_p; | |
| 6571 | |
| 6572 if (best && best->numeric[XLFD_POINT_SIZE] == pt) | |
| 6573 non_scalable_has_exact_height_p = 1; | |
| 6574 else | |
| 6575 non_scalable_has_exact_height_p = 0; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6576 |
| 24995 | 6577 for (i = 0; i < nfonts; ++i) |
| 6578 if (font_scalable_p (fonts + i)) | |
| 6579 { | |
| 6580 if (best == NULL | |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6581 || better_font_p (specified, fonts + i, best, 0, 0) |
| 24995 | 6582 || (!non_scalable_has_exact_height_p |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6583 && !better_font_p (specified, best, fonts + i, 0, 0))) |
|
52200
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6584 { |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6585 non_scalable_has_exact_height_p = 1; |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6586 best = fonts + i; |
|
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6587 } |
| 24995 | 6588 } |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6589 |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6590 if (needs_overstrike) |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6591 { |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6592 enum xlfd_weight want_weight = specified[XLFD_WEIGHT]; |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6593 enum xlfd_weight got_weight = best->numeric[XLFD_WEIGHT]; |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6594 |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6595 if (want_weight > XLFD_WEIGHT_MEDIUM && want_weight > got_weight) |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6596 { |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6597 /* We want a bold font, but didn't get one; try to use |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6598 overstriking instead to simulate bold-face. However, |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6599 don't overstrike an already-bold fontn unless the |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6600 desired weight grossly exceeds the available weight. */ |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6601 if (got_weight > XLFD_WEIGHT_MEDIUM) |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6602 *needs_overstrike = (got_weight - want_weight) > 2; |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6603 else |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6604 *needs_overstrike = 1; |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6605 } |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6606 } |
| 24995 | 6607 } |
| 6608 | |
| 6609 if (font_scalable_p (best)) | |
| 6610 font_name = build_scalable_font_name (f, best, pt); | |
| 6611 else | |
| 6612 font_name = build_font_name (best); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6613 |
| 24995 | 6614 /* Free font_name structures. */ |
| 6615 free_font_names (fonts, nfonts); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6616 |
| 24995 | 6617 return font_name; |
| 6618 } | |
| 6619 | |
| 6620 | |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6621 /* Get a list of matching fonts on frame F, considering FAMILY |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6622 and alternative font families from Vface_alternative_font_registry_alist. |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6623 |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6624 FAMILY is the font family whose alternatives are considered. |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6625 |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6626 REGISTRY, if a string, specifies a font registry and encoding to |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6627 match. A value of nil means include fonts of any registry and |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6628 encoding. |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6629 |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6630 Return in *FONTS a pointer to a vector of font_name structures for |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6631 the fonts matched. Value is the number of fonts found. */ |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6632 |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6633 static int |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6634 try_alternative_families (f, family, registry, fonts) |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6635 struct frame *f; |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6636 Lisp_Object family, registry; |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6637 struct font_name **fonts; |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6638 { |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6639 Lisp_Object alter; |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6640 int nfonts = 0; |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6641 |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6642 nfonts = font_list (f, Qnil, family, registry, fonts); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6643 if (nfonts == 0) |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6644 { |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6645 /* Try alternative font families. */ |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6646 alter = Fassoc (family, Vface_alternative_font_family_alist); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6647 if (CONSP (alter)) |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6648 { |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6649 for (alter = XCDR (alter); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6650 CONSP (alter) && nfonts == 0; |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6651 alter = XCDR (alter)) |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6652 { |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6653 if (STRINGP (XCAR (alter))) |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6654 nfonts = font_list (f, Qnil, XCAR (alter), registry, fonts); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6655 } |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6656 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6657 |
|
49864
a2add8cdc33a
(try_alternative_families): Try all scalable fonts if
Kenichi Handa <handa@m17n.org>
parents:
49863
diff
changeset
|
6658 /* Try all scalable fonts before giving up. */ |
|
a2add8cdc33a
(try_alternative_families): Try all scalable fonts if
Kenichi Handa <handa@m17n.org>
parents:
49863
diff
changeset
|
6659 if (nfonts == 0 && ! EQ (Vscalable_fonts_allowed, Qt)) |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6660 { |
|
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
6661 int count = SPECPDL_INDEX (); |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6662 specbind (Qscalable_fonts_allowed, Qt); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6663 nfonts = try_alternative_families (f, family, registry, fonts); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6664 unbind_to (count, Qnil); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6665 } |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6666 } |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6667 return nfonts; |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6668 } |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6669 |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6670 |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6671 /* Get a list of matching fonts on frame F. |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6672 |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6673 FAMILY, if a string, specifies a font family derived from the fontset. |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6674 It is only used if the face does not specify any family in ATTRS or |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6675 if we cannot find any font of the face's family. |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6676 |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6677 REGISTRY, if a string, specifies a font registry and encoding to |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6678 match. A value of nil means include fonts of any registry and |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6679 encoding. |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6680 |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6681 If PREFER_FACE_FAMILY is nonzero, perfer face's family to FAMILY. |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6682 Otherwise, prefer FAMILY. |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6683 |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6684 Return in *FONTS a pointer to a vector of font_name structures for |
|
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6685 the fonts matched. Value is the number of fonts found. */ |
| 24995 | 6686 |
| 6687 static int | |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6688 try_font_list (f, attrs, family, registry, fonts, prefer_face_family) |
| 24995 | 6689 struct frame *f; |
| 6690 Lisp_Object *attrs; | |
|
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6691 Lisp_Object family, registry; |
| 24995 | 6692 struct font_name **fonts; |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6693 int prefer_face_family; |
| 24995 | 6694 { |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6695 int nfonts = 0; |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6696 Lisp_Object face_family = attrs[LFACE_FAMILY_INDEX]; |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6697 Lisp_Object try_family; |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6698 |
|
47639
a7c8409f5cad
(try_font_list): Pay attention to the case that FAMILY is nil.
Kenichi Handa <handa@m17n.org>
parents:
47618
diff
changeset
|
6699 try_family = (prefer_face_family || NILP (family)) ? face_family : family; |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6700 |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6701 if (STRINGP (try_family)) |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6702 nfonts = try_alternative_families (f, try_family, registry, fonts); |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6703 |
| 45848 | 6704 #ifdef MAC_OS |
| 6705 /* When realizing the default face and a font spec does not matched | |
| 6706 exactly, Emacs looks for ones with the same registry as the | |
| 6707 default font. On the Mac, this is mac-roman, which does not work | |
| 6708 if the family is -etl-fixed, e.g. The following widens the | |
| 6709 choices and fixes that problem. */ | |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6710 if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6711 && xstricmp (SDATA (registry), "mac-roman") == 0) |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6712 nfonts = try_alternative_families (f, try_family, Qnil, fonts); |
| 45848 | 6713 #endif |
| 6714 | |
|
47639
a7c8409f5cad
(try_font_list): Pay attention to the case that FAMILY is nil.
Kenichi Handa <handa@m17n.org>
parents:
47618
diff
changeset
|
6715 if (EQ (try_family, family)) |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6716 family = face_family; |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6717 |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6718 if (nfonts == 0 && STRINGP (family)) |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6719 nfonts = try_alternative_families (f, family, registry, fonts); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6720 |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6721 /* Try font family of the default face or "fixed". */ |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6722 if (nfonts == 0) |
|
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6723 { |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6724 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6725 if (default_face) |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6726 family = default_face->lface[LFACE_FAMILY_INDEX]; |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6727 else |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6728 family = build_string ("fixed"); |
|
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6729 nfonts = font_list (f, Qnil, family, registry, fonts); |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6730 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6731 |
|
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6732 /* Try any family with the given registry. */ |
|
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6733 if (nfonts == 0) |
|
52203
0941be5b523e
(try_font_list): Call try_alternative_families to try any family
Kenichi Handa <handa@m17n.org>
parents:
52200
diff
changeset
|
6734 nfonts = try_alternative_families (f, Qnil, registry, fonts); |
| 24995 | 6735 |
| 6736 return nfonts; | |
| 6737 } | |
| 6738 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6739 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6740 /* 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
|
6741 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
|
6742 attribute of ATTRS doesn't name a fontset. */ |
| 24995 | 6743 |
| 6744 static int | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6745 face_fontset (attrs) |
| 24995 | 6746 Lisp_Object *attrs; |
| 6747 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6748 Lisp_Object name; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6749 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6750 name = attrs[LFACE_FONT_INDEX]; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6751 if (!STRINGP (name)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6752 return -1; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6753 return fs_query_fontset (name, 0); |
| 24995 | 6754 } |
| 6755 | |
| 6756 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6757 /* Choose a name of font to use on frame F to display character C with |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6758 Lisp face attributes specified by ATTRS. The font name is |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6759 determined by the font-related attributes in ATTRS and the name |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6760 pattern for C in FONTSET. Value is the font name which is |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6761 allocated from the heap and must be freed by the caller, or NULL if |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6762 we can get no information about the font name of C. It is assured |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6763 that we always get some information for a single byte |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6764 character. |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6765 |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6766 If NEEDS_OVERSTRIKE is non-zero, a boolean is returned in it to |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6767 indicate whether the resulting font should be drawn using overstrike |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6768 to simulate bold-face. */ |
| 24995 | 6769 |
| 6770 static char * | |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6771 choose_face_font (f, attrs, fontset, c, needs_overstrike) |
| 24995 | 6772 struct frame *f; |
| 6773 Lisp_Object *attrs; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6774 int fontset, c; |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6775 int *needs_overstrike; |
| 24995 | 6776 { |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6777 Lisp_Object pattern; |
| 24995 | 6778 char *font_name = NULL; |
| 6779 struct font_name *fonts; | |
|
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6780 int nfonts, width_ratio; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6781 |
|
50412
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6782 if (needs_overstrike) |
|
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6783 *needs_overstrike = 0; |
|
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6784 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6785 /* Get (foundry and) family name and registry (and encoding) name of |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6786 a font for C. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6787 pattern = fontset_font_pattern (f, fontset, c); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6788 if (NILP (pattern)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6789 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6790 xassert (!SINGLE_BYTE_CHAR_P (c)); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6791 return NULL; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6792 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6793 |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6794 /* If what we got is a name pattern, return it. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6795 if (STRINGP (pattern)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6796 return xstrdup (SDATA (pattern)); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6797 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6798 /* Get a list of fonts matching that pattern and choose the |
| 24995 | 6799 best match for the specified face attributes from it. */ |
|
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6800 nfonts = try_font_list (f, attrs, XCAR (pattern), XCDR (pattern), &fonts, |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6801 (SINGLE_BYTE_CHAR_P (c) |
|
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6802 || CHAR_CHARSET (c) == charset_latin_iso8859_1)); |
|
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6803 width_ratio = (SINGLE_BYTE_CHAR_P (c) |
|
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6804 ? 1 |
|
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6805 : CHARSET_WIDTH (CHAR_CHARSET (c))); |
|
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6806 font_name = best_matching_font (f, attrs, fonts, nfonts, width_ratio, |
|
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6807 needs_overstrike); |
| 24995 | 6808 return font_name; |
| 6809 } | |
| 6810 | |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6811 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 6812 |
| 6813 | |
| 6814 | |
| 6815 /*********************************************************************** | |
| 6816 Face Realization | |
| 6817 ***********************************************************************/ | |
| 6818 | |
| 6819 /* Realize basic faces on frame F. Value is zero if frame parameters | |
| 6820 of F don't contain enough information needed to realize the default | |
| 6821 face. */ | |
| 6822 | |
| 6823 static int | |
| 6824 realize_basic_faces (f) | |
| 2342 | 6825 struct frame *f; |
| 24995 | 6826 { |
| 6827 int success_p = 0; | |
|
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
6828 int count = SPECPDL_INDEX (); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
6829 |
|
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
6830 /* 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
|
6831 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
|
6832 BLOCK_INPUT; |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6833 specbind (Qscalable_fonts_allowed, Qt); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6834 |
| 24995 | 6835 if (realize_default_face (f)) |
| 6836 { | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6837 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
|
6838 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
|
6839 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
| 41129 | 6840 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
| 25546 | 6841 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
|
6842 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
|
6843 realize_named_face (f, Qborder, BORDER_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6844 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6845 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
|
6846 realize_named_face (f, Qmenu, MENU_FACE_ID); |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
6847 |
|
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
6848 /* 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
|
6849 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
|
6850 { |
|
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
6851 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
|
6852 #ifdef USE_X_TOOLKIT |
|
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
6853 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
|
6854 #endif |
|
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
6855 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6856 |
| 24995 | 6857 success_p = 1; |
| 6858 } | |
| 6859 | |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6860 unbind_to (count, Qnil); |
|
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
6861 UNBLOCK_INPUT; |
| 24995 | 6862 return success_p; |
| 6863 } | |
| 6864 | |
| 6865 | |
| 6866 /* Realize the default face on frame F. If the face is not fully | |
| 6867 specified, make it fully-specified. Attributes of the default face | |
| 6868 that are not explicitly specified are taken from frame parameters. */ | |
| 6869 | |
| 6870 static int | |
| 6871 realize_default_face (f) | |
| 6872 struct frame *f; | |
| 6873 { | |
| 6874 struct face_cache *c = FRAME_FACE_CACHE (f); | |
| 6875 Lisp_Object lface; | |
| 6876 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6877 Lisp_Object frame_font; | |
| 6878 struct face *face; | |
| 6879 | |
| 6880 /* If the `default' face is not yet known, create it. */ | |
| 6881 lface = lface_from_face_name (f, Qdefault, 0); | |
| 6882 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
|
6883 { |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6884 Lisp_Object frame; |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6885 XSETFRAME (frame, f); |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6886 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
|
6887 } |
|
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6888 |
| 24995 | 6889 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6890 #ifdef HAVE_WINDOW_SYSTEM |
|
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6891 if (FRAME_WINDOW_P (f)) |
| 24995 | 6892 { |
| 6893 /* Set frame_font to the value of the `font' frame parameter. */ | |
| 6894 frame_font = Fassq (Qfont, f->param_alist); | |
| 6895 xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font))); | |
| 6896 frame_font = XCDR (frame_font); | |
|
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
6897 set_lface_from_font_name (f, lface, frame_font, |
|
c1f65dfc56eb
Fix some of the font/face problems.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
6898 f->default_face_done_p, 1); |
|
c1f65dfc56eb
Fix some of the font/face problems.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
6899 f->default_face_done_p = 1; |
| 24995 | 6900 } |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6901 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 6902 |
|
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6903 if (!FRAME_WINDOW_P (f)) |
| 24995 | 6904 { |
| 6905 LFACE_FAMILY (lface) = build_string ("default"); | |
| 6906 LFACE_SWIDTH (lface) = Qnormal; | |
| 6907 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
|
6908 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
|
6909 LFACE_WEIGHT (lface) = Qnormal; |
|
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
6910 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
|
6911 LFACE_SLANT (lface) = Qnormal; |
|
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6912 LFACE_AVGWIDTH (lface) = Qunspecified; |
| 24995 | 6913 } |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6914 |
| 24995 | 6915 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
| 6916 LFACE_UNDERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6917 |
| 24995 | 6918 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
| 6919 LFACE_OVERLINE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6920 |
| 24995 | 6921 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
| 6922 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6923 |
| 24995 | 6924 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
| 6925 LFACE_BOX (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6926 |
| 24995 | 6927 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
| 6928 LFACE_INVERSE (lface) = Qnil; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6929 |
| 24995 | 6930 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
| 6931 { | |
| 6932 /* This function is called so early that colors are not yet | |
| 6933 set in the frame parameter list. */ | |
| 6934 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
|
6935 |
| 24995 | 6936 if (CONSP (color) && STRINGP (XCDR (color))) |
| 6937 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
|
6938 else if (FRAME_WINDOW_P (f)) |
| 24995 | 6939 return 0; |
| 35443 | 6940 else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
6941 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
|
6942 else |
| 24995 | 6943 abort (); |
| 6944 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6945 |
| 24995 | 6946 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
| 6947 { | |
| 6948 /* This function is called so early that colors are not yet | |
| 6949 set in the frame parameter list. */ | |
| 6950 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
| 6951 if (CONSP (color) && STRINGP (XCDR (color))) | |
| 6952 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
|
6953 else if (FRAME_WINDOW_P (f)) |
| 24995 | 6954 return 0; |
| 35443 | 6955 else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
|
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
6956 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
|
6957 else |
| 24995 | 6958 abort (); |
| 6959 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6960 |
| 24995 | 6961 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
| 6962 LFACE_STIPPLE (lface) = Qnil; | |
| 6963 | |
| 6964 /* Realize the face; it must be fully-specified now. */ | |
| 6965 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
| 6966 check_lface (lface); | |
| 6967 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6968 face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); |
| 24995 | 6969 return 1; |
| 6970 } | |
| 6971 | |
| 6972 | |
| 6973 /* Realize basic faces other than the default face in face cache C. | |
| 6974 SYMBOL is the face name, ID is the face id the realized face must | |
| 6975 have. The default face must have been realized already. */ | |
| 6976 | |
| 6977 static void | |
| 6978 realize_named_face (f, symbol, id) | |
| 6979 struct frame *f; | |
| 6980 Lisp_Object symbol; | |
| 6981 int id; | |
| 6982 { | |
| 6983 struct face_cache *c = FRAME_FACE_CACHE (f); | |
| 6984 Lisp_Object lface = lface_from_face_name (f, symbol, 0); | |
| 6985 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 6986 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; | |
| 6987 struct face *new_face; | |
| 6988 | |
| 6989 /* The default face must exist and be fully specified. */ | |
| 6990 get_lface_attributes (f, Qdefault, attrs, 1); | |
| 6991 check_lface_attrs (attrs); | |
| 6992 xassert (lface_fully_specified_p (attrs)); | |
| 6993 | |
| 6994 /* If SYMBOL isn't know as a face, create it. */ | |
| 6995 if (NILP (lface)) | |
| 6996 { | |
| 6997 Lisp_Object frame; | |
| 6998 XSETFRAME (frame, f); | |
| 6999 lface = Finternal_make_lisp_face (symbol, frame); | |
| 7000 } | |
| 7001 | |
| 7002 /* Merge SYMBOL's face with the default face. */ | |
| 7003 get_lface_attributes (f, symbol, symbol_attrs, 1); | |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7004 merge_face_vectors (f, symbol_attrs, attrs, 0); |
| 24995 | 7005 |
| 7006 /* Realize the face. */ | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7007 new_face = realize_face (c, attrs, 0, NULL, id); |
| 24995 | 7008 } |
| 7009 | |
| 7010 | |
| 7011 /* Realize the fully-specified face with attributes ATTRS in face | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7012 cache CACHE for character C. If C is a multibyte character, |
|
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7013 BASE_FACE is a face that has the same attributes. Otherwise, |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7014 BASE_FACE is ignored. If FORMER_FACE_ID is non-negative, it is an |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7015 ID of face to remove before caching the new face. Value is a |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7016 pointer to the newly created realized face. */ |
| 24995 | 7017 |
| 7018 static struct face * | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7019 realize_face (cache, attrs, c, base_face, former_face_id) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7020 struct face_cache *cache; |
| 24995 | 7021 Lisp_Object *attrs; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7022 int c; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7023 struct face *base_face; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7024 int former_face_id; |
| 24995 | 7025 { |
| 7026 struct face *face; | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7027 |
| 24995 | 7028 /* LFACE must be fully specified. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7029 xassert (cache != NULL); |
| 24995 | 7030 check_lface_attrs (attrs); |
| 7031 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7032 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
|
7033 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7034 /* Remove the former face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7035 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
|
7036 uncache_face (cache, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7037 free_realized_face (cache->f, former_face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7038 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7039 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7040 if (FRAME_WINDOW_P (cache->f)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7041 face = realize_x_face (cache, attrs, c, base_face); |
| 35443 | 7042 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7043 face = realize_tty_face (cache, attrs, c); |
| 24995 | 7044 else |
| 7045 abort (); | |
| 7046 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7047 /* Insert the new face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7048 cache_face (cache, face, lface_hash (attrs)); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7049 #ifdef HAVE_WINDOW_SYSTEM |
|
28544
b42146066357
(realize_face): Change FRAME_X_P to FRAME_WINDOW_P.
Jason Rumney <jasonr@gnu.org>
parents:
28529
diff
changeset
|
7050 if (FRAME_WINDOW_P (cache->f) && face->font == NULL) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7051 load_face_font (cache->f, face, c); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7052 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 7053 return face; |
| 7054 } | |
| 7055 | |
| 7056 | |
| 7057 /* Realize the fully-specified face with attributes ATTRS in face | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7058 cache CACHE for character C. Do it for X frame CACHE->f. If C is |
|
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7059 a multibyte character, BASE_FACE is a face that has the same |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7060 attributes. Otherwise, BASE_FACE is ignored. If the new face |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7061 doesn't share font with the default face, a fontname is allocated |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7062 from the heap and set in `font_name' of the new face, but it is not |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7063 yet loaded here. Value is a pointer to the newly created realized |
|
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7064 face. */ |
| 24995 | 7065 |
| 7066 static struct face * | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7067 realize_x_face (cache, attrs, c, base_face) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7068 struct face_cache *cache; |
| 24995 | 7069 Lisp_Object *attrs; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7070 int c; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7071 struct face *base_face; |
| 24995 | 7072 { |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
7073 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 7074 struct face *face, *default_face; |
|
26875
d6aa11f2a4af
(choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents:
26759
diff
changeset
|
7075 struct frame *f; |
| 24995 | 7076 Lisp_Object stipple, overline, strike_through, box; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7077 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7078 xassert (FRAME_WINDOW_P (cache->f)); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7079 xassert (SINGLE_BYTE_CHAR_P (c) |
|
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7080 || base_face); |
| 24995 | 7081 |
| 7082 /* Allocate a new realized face. */ | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7083 face = make_realized_face (attrs); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7084 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7085 f = cache->f; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7086 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7087 /* If C is a multibyte character, we share all face attirbutes with |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7088 BASE_FACE including the realized fontset. But, we must load a |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7089 different font. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7090 if (!SINGLE_BYTE_CHAR_P (c)) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7091 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7092 bcopy (base_face, face, sizeof *face); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7093 face->gc = 0; |
|
29394
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7094 |
|
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7095 /* Don't try to free the colors copied bitwise from BASE_FACE. */ |
|
40555
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
7096 face->colors_copied_bitwise_p = 1; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7097 |
|
29394
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7098 /* to force realize_face to load font */ |
|
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7099 face->font = NULL; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7100 return face; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7101 } |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7102 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7103 /* Now we are realizing a face for ASCII (and unibyte) characters. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7104 |
| 24995 | 7105 /* Determine the font to use. Most of the time, the font will be |
| 7106 the same as the font of the default face, so try that first. */ | |
| 7107 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 7108 if (default_face | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7109 && FACE_SUITABLE_FOR_CHAR_P (default_face, c) |
| 24995 | 7110 && lface_same_font_attributes_p (default_face->lface, attrs)) |
| 7111 { | |
| 7112 face->font = default_face->font; | |
| 7113 face->fontset = default_face->fontset; | |
| 7114 face->font_info_id = default_face->font_info_id; | |
| 7115 face->font_name = default_face->font_name; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7116 face->ascii_face = face; |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7117 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7118 /* But, as we can't share the fontset, make a new realized |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7119 fontset that has the same base fontset as of the default |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7120 face. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7121 face->fontset |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7122 = make_fontset_for_ascii_face (f, default_face->fontset); |
| 24995 | 7123 } |
| 7124 else | |
| 7125 { | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7126 /* 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
|
7127 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
|
7128 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
|
7129 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
|
7130 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
|
7131 are constructed from ATTRS. */ |
|
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7132 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
|
7133 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7134 if ((fontset == -1) && default_face) |
|
30211
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7135 fontset = default_face->fontset; |
|
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7136 face->fontset = make_fontset_for_ascii_face (f, fontset); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7137 face->font = NULL; /* to force realize_face to load font */ |
| 24995 | 7138 } |
| 7139 | |
| 7140 /* Load colors, and set remaining attributes. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7141 |
| 24995 | 7142 load_face_colors (f, face, attrs); |
| 7143 | |
| 7144 /* Set up box. */ | |
| 7145 box = attrs[LFACE_BOX_INDEX]; | |
| 7146 if (STRINGP (box)) | |
| 7147 { | |
| 7148 /* A simple box of line width 1 drawn in color given by | |
| 7149 the string. */ | |
| 7150 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX], | |
| 7151 LFACE_BOX_INDEX); | |
| 7152 face->box = FACE_SIMPLE_BOX; | |
| 7153 face->box_line_width = 1; | |
| 7154 } | |
| 7155 else if (INTEGERP (box)) | |
| 7156 { | |
| 7157 /* Simple box of specified line width in foreground color of the | |
| 7158 face. */ | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
7159 xassert (XINT (box) != 0); |
| 24995 | 7160 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
|
7161 face->box_line_width = XINT (box); |
| 24995 | 7162 face->box_color = face->foreground; |
| 7163 face->box_color_defaulted_p = 1; | |
| 7164 } | |
| 7165 else if (CONSP (box)) | |
| 7166 { | |
| 7167 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW | |
| 7168 being one of `raised' or `sunken'. */ | |
| 7169 face->box = FACE_SIMPLE_BOX; | |
| 7170 face->box_color = face->foreground; | |
| 7171 face->box_color_defaulted_p = 1; | |
| 7172 face->box_line_width = 1; | |
| 7173 | |
| 7174 while (CONSP (box)) | |
| 7175 { | |
| 7176 Lisp_Object keyword, value; | |
| 7177 | |
| 7178 keyword = XCAR (box); | |
| 7179 box = XCDR (box); | |
| 7180 | |
| 7181 if (!CONSP (box)) | |
| 7182 break; | |
| 7183 value = XCAR (box); | |
| 7184 box = XCDR (box); | |
| 7185 | |
| 7186 if (EQ (keyword, QCline_width)) | |
| 7187 { | |
|
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
7188 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
|
7189 face->box_line_width = XINT (value); |
| 24995 | 7190 } |
| 7191 else if (EQ (keyword, QCcolor)) | |
| 7192 { | |
| 7193 if (STRINGP (value)) | |
| 7194 { | |
| 7195 face->box_color = load_color (f, face, value, | |
| 7196 LFACE_BOX_INDEX); | |
| 7197 face->use_box_color_for_shadows_p = 1; | |
| 7198 } | |
| 7199 } | |
| 7200 else if (EQ (keyword, QCstyle)) | |
| 7201 { | |
| 7202 if (EQ (value, Qreleased_button)) | |
| 7203 face->box = FACE_RAISED_BOX; | |
| 7204 else if (EQ (value, Qpressed_button)) | |
| 7205 face->box = FACE_SUNKEN_BOX; | |
| 7206 } | |
| 7207 } | |
| 7208 } | |
| 7209 | |
| 7210 /* Text underline, overline, strike-through. */ | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7211 |
| 24995 | 7212 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt)) |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7213 { |
| 24995 | 7214 /* Use default color (same as foreground color). */ |
| 7215 face->underline_p = 1; | |
| 7216 face->underline_defaulted_p = 1; | |
| 7217 face->underline_color = 0; | |
| 7218 } | |
| 7219 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 7220 { | |
| 7221 /* Use specified color. */ | |
| 7222 face->underline_p = 1; | |
| 7223 face->underline_defaulted_p = 0; | |
| 7224 face->underline_color | |
| 7225 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX], | |
| 7226 LFACE_UNDERLINE_INDEX); | |
| 7227 } | |
| 7228 else if (NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 7229 { | |
| 7230 face->underline_p = 0; | |
| 7231 face->underline_defaulted_p = 0; | |
| 7232 face->underline_color = 0; | |
| 7233 } | |
| 7234 | |
| 7235 overline = attrs[LFACE_OVERLINE_INDEX]; | |
| 7236 if (STRINGP (overline)) | |
| 7237 { | |
| 7238 face->overline_color | |
| 7239 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX], | |
| 7240 LFACE_OVERLINE_INDEX); | |
| 7241 face->overline_p = 1; | |
| 7242 } | |
| 7243 else if (EQ (overline, Qt)) | |
| 7244 { | |
| 7245 face->overline_color = face->foreground; | |
| 7246 face->overline_color_defaulted_p = 1; | |
| 7247 face->overline_p = 1; | |
| 7248 } | |
| 7249 | |
| 7250 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX]; | |
| 7251 if (STRINGP (strike_through)) | |
| 7252 { | |
| 7253 face->strike_through_color | |
| 7254 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX], | |
| 7255 LFACE_STRIKE_THROUGH_INDEX); | |
| 7256 face->strike_through_p = 1; | |
| 7257 } | |
| 7258 else if (EQ (strike_through, Qt)) | |
| 7259 { | |
| 7260 face->strike_through_color = face->foreground; | |
| 7261 face->strike_through_color_defaulted_p = 1; | |
| 7262 face->strike_through_p = 1; | |
| 7263 } | |
| 7264 | |
| 7265 stipple = attrs[LFACE_STIPPLE_INDEX]; | |
| 7266 if (!NILP (stipple)) | |
| 7267 face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h); | |
| 7268 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7269 xassert (FACE_SUITABLE_FOR_CHAR_P (face, c)); |
| 24995 | 7270 return face; |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
7271 #endif /* HAVE_WINDOW_SYSTEM */ |
| 24995 | 7272 } |
| 7273 | |
| 7274 | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7275 /* 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
|
7276 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
|
7277 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
|
7278 default foreground/background colors. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7279 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7280 static void |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7281 map_tty_color (f, face, idx, defaulted) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7282 struct frame *f; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7283 struct face *face; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7284 enum lface_attribute_index idx; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7285 int *defaulted; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7286 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7287 Lisp_Object frame, color, def; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7288 int foreground_p = idx == LFACE_FOREGROUND_INDEX; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7289 unsigned long default_pixel, default_other_pixel, pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7290 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7291 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
|
7292 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7293 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7294 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7295 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7296 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7297 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7298 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7299 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7300 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7301 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7302 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
7303 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7304 XSETFRAME (frame, f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7305 color = face->lface[idx]; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
7306 |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7307 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
|
7308 && SCHARS (color) |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7309 && CONSP (Vtty_defined_color_alist) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7310 && (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
|
7311 CONSP (def))) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7312 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7313 /* 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
|
7314 (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
|
7315 pixel = XINT (XCAR (XCDR (def))); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7316 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7317 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7318 if (pixel == default_pixel && STRINGP (color)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7319 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7320 pixel = load_color (f, face, color, idx); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7321 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7322 #if defined (MSDOS) || defined (WINDOWSNT) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7323 /* 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
|
7324 use the foreground color defined by the frame. */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7325 #ifdef MSDOS |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7326 if (FRAME_MSDOS_P (f)) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7327 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7328 #endif /* MSDOS */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7329 if (pixel == default_pixel |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7330 || pixel == FACE_TTY_DEFAULT_COLOR) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7331 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7332 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7333 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7334 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7335 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7336 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7337 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7338 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7339 else if (pixel == default_other_pixel) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7340 { |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7341 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7342 pixel = FRAME_BACKGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7343 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7344 pixel = FRAME_FOREGROUND_PIXEL (f); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7345 face->lface[idx] = tty_color_name (f, pixel); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7346 *defaulted = 1; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7347 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7348 #ifdef MSDOS |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7349 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7350 #endif |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7351 #endif /* MSDOS or WINDOWSNT */ |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7352 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7353 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7354 if (foreground_p) |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7355 face->foreground = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7356 else |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7357 face->background = pixel; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7358 } |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7359 |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7360 |
| 24995 | 7361 /* Realize the fully-specified face with attributes ATTRS in face |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7362 cache CACHE for character C. Do it for TTY frame CACHE->f. Value is a |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7363 pointer to the newly created realized face. */ |
| 24995 | 7364 |
| 7365 static struct face * | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7366 realize_tty_face (cache, attrs, c) |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7367 struct face_cache *cache; |
| 24995 | 7368 Lisp_Object *attrs; |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7369 int c; |
| 24995 | 7370 { |
| 7371 struct face *face; | |
| 7372 int weight, slant; | |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7373 int face_colors_defaulted = 0; |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7374 struct frame *f = cache->f; |
| 24995 | 7375 |
| 7376 /* Frame must be a termcap frame. */ | |
| 35443 | 7377 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
|
7378 |
| 24995 | 7379 /* Allocate a new realized face. */ |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7380 face = make_realized_face (attrs); |
| 35443 | 7381 face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" : "tty"; |
| 24995 | 7382 |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7383 /* Map face attributes to TTY appearances. We map slant to |
| 24995 | 7384 dimmed text because we want italic text to appear differently |
| 7385 and because dimmed text is probably used infrequently. */ | |
| 7386 weight = face_numeric_weight (attrs[LFACE_WEIGHT_INDEX]); | |
| 7387 slant = face_numeric_slant (attrs[LFACE_SLANT_INDEX]); | |
| 7388 | |
| 7389 if (weight > XLFD_WEIGHT_MEDIUM) | |
| 7390 face->tty_bold_p = 1; | |
| 7391 if (weight < XLFD_WEIGHT_MEDIUM || slant != XLFD_SLANT_ROMAN) | |
| 7392 face->tty_dim_p = 1; | |
| 7393 if (!NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
| 7394 face->tty_underline_p = 1; | |
| 7395 if (!NILP (attrs[LFACE_INVERSE_INDEX])) | |
| 7396 face->tty_reverse_p = 1; | |
| 7397 | |
| 7398 /* Map color names to color indices. */ | |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7399 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
|
7400 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
|
7401 |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7402 /* 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
|
7403 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
|
7404 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
|
7405 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
|
7406 { |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7407 unsigned long tem = face->foreground; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7408 face->foreground = face->background; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7409 face->background = tem; |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7410 } |
|
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7411 |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7412 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
|
7413 && face->tty_bold_p |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7414 && 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
|
7415 && 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
|
7416 face->tty_bold_p = 0; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7417 |
| 24995 | 7418 return face; |
| 7419 } | |
| 7420 | |
| 7421 | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7422 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
|
7423 Ftty_suppress_bold_inverse_default_colors, |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7424 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
|
7425 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
|
7426 SUPPRESS non-nil means suppress it. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7427 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
|
7428 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
|
7429 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
|
7430 is non-nil. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7431 (suppress) |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7432 Lisp_Object suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7433 { |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7434 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
|
7435 ++face_change_count; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7436 return suppress; |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7437 } |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7438 |
|
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7439 |
| 24995 | 7440 |
| 7441 /*********************************************************************** | |
| 7442 Computing Faces | |
| 7443 ***********************************************************************/ | |
| 7444 | |
| 7445 /* Return the ID of the face to use to display character CH with face | |
| 7446 property PROP on frame F in current_buffer. */ | |
| 7447 | |
| 7448 int | |
| 7449 compute_char_face (f, ch, prop) | |
| 7450 struct frame *f; | |
| 7451 int ch; | |
| 7452 Lisp_Object prop; | |
| 7453 { | |
| 7454 int face_id; | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7455 |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7456 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
|
7457 ch = 0; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7458 |
| 24995 | 7459 if (NILP (prop)) |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7460 { |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7461 struct face *face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7462 face_id = FACE_FOR_CHAR (f, face, ch); |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7463 } |
| 24995 | 7464 else |
| 7465 { | |
| 7466 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 7467 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
| 7468 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
|
7469 merge_face_ref (f, prop, attrs, 1, 0); |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7470 face_id = lookup_face (f, attrs, ch, NULL); |
| 24995 | 7471 } |
| 7472 | |
| 7473 return face_id; | |
| 7474 } | |
| 7475 | |
| 7476 /* Return the face ID associated with buffer position POS for | |
| 7477 displaying ASCII characters. Return in *ENDPTR the position at | |
| 7478 which a different face is needed, as far as text properties and | |
| 7479 overlays are concerned. W is a window displaying current_buffer. | |
| 7480 | |
| 7481 REGION_BEG, REGION_END delimit the region, so it can be | |
| 7482 highlighted. | |
| 7483 | |
| 7484 LIMIT is a position not to scan beyond. That is to limit the time | |
| 7485 this function can take. | |
| 7486 | |
| 7487 If MOUSE is non-zero, use the character's mouse-face, not its face. | |
| 7488 | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7489 The face returned is suitable for displaying ASCII characters. */ |
| 24995 | 7490 |
| 7491 int | |
| 7492 face_at_buffer_position (w, pos, region_beg, region_end, | |
| 7493 endptr, limit, mouse) | |
| 2391 | 7494 struct window *w; |
| 2342 | 7495 int pos; |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7496 int region_beg, region_end; |
| 2342 | 7497 int *endptr; |
|
5084
863e092a5891
(compute_char_face): Accept new arg LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
7498 int limit; |
|
6615
96ddf85642d1
(compute_char_face): New arg MOUSE.
Richard M. Stallman <rms@gnu.org>
parents:
5858
diff
changeset
|
7499 int mouse; |
| 2342 | 7500 { |
| 24995 | 7501 struct frame *f = XFRAME (w->frame); |
| 7502 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
|
7503 Lisp_Object prop, position; |
| 24995 | 7504 int i, noverlays; |
| 2342 | 7505 Lisp_Object *overlay_vec; |
| 2391 | 7506 Lisp_Object frame; |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7507 int endpos; |
| 24995 | 7508 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
| 7509 Lisp_Object limit1, end; | |
| 7510 struct face *default_face; | |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7511 |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7512 /* 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
|
7513 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
|
7514 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
| 2391 | 7515 |
|
9284
a969e0eefaf5
(compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9186
diff
changeset
|
7516 XSETFRAME (frame, f); |
| 24995 | 7517 XSETFASTINT (position, pos); |
| 2342 | 7518 |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7519 endpos = ZV; |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7520 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
|
7521 endpos = region_beg; |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7522 |
| 24995 | 7523 /* Get the `face' or `mouse_face' text property at POS, and |
| 7524 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
|
7525 prop = Fget_text_property (position, propname, w->buffer); |
| 24995 | 7526 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
| 7527 end = Fnext_single_property_change (position, propname, w->buffer, limit1); | |
| 7528 if (INTEGERP (end)) | |
| 7529 endpos = XINT (end); | |
| 7530 | |
| 7531 /* 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
|
7532 { |
|
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7533 int next_overlay; |
|
55654
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
7534 |
|
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
7535 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
|
7536 if (next_overlay < endpos) |
|
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7537 endpos = next_overlay; |
|
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7538 } |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7539 |
|
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7540 *endptr = endpos; |
| 2342 | 7541 |
| 24995 | 7542 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
|
7543 |
| 24995 | 7544 /* Optimize common cases where we can use the default face. */ |
| 7545 if (noverlays == 0 | |
| 7546 && NILP (prop) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7547 && !(pos >= region_beg && pos < region_end)) |
| 24995 | 7548 return DEFAULT_FACE_ID; |
| 7549 | |
| 7550 /* Begin with attributes from the default face. */ | |
| 7551 bcopy (default_face->lface, attrs, sizeof attrs); | |
| 7552 | |
| 7553 /* Merge in attributes specified via text properties. */ | |
| 7554 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
|
7555 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 7556 |
| 7557 /* 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
|
7558 noverlays = sort_overlays (overlay_vec, noverlays, w); |
| 2342 | 7559 for (i = 0; i < noverlays; i++) |
| 7560 { | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7561 Lisp_Object oend; |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7562 int oendpos; |
|
9186
45bac5feb065
(compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents:
9184
diff
changeset
|
7563 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7564 prop = Foverlay_get (overlay_vec[i], propname); |
| 24995 | 7565 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
|
7566 merge_face_ref (f, prop, attrs, 1, 0); |
| 2342 | 7567 |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7568 oend = OVERLAY_END (overlay_vec[i]); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7569 oendpos = OVERLAY_POSITION (oend); |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7570 if (oendpos < endpos) |
|
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7571 endpos = oendpos; |
| 2342 | 7572 } |
| 7573 | |
| 24995 | 7574 /* 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
|
7575 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
|
7576 { |
|
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7577 merge_named_face (f, Qregion, attrs, 0); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7578 |
|
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7579 if (region_end < endpos) |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7580 endpos = region_end; |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7581 } |
|
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7582 |
| 2342 | 7583 *endptr = endpos; |
| 7584 | |
| 24995 | 7585 /* 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
|
7586 or realize a new one for ASCII characters. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7587 return lookup_face (f, attrs, 0, NULL); |
| 2342 | 7588 } |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7589 |
| 24995 | 7590 |
| 7591 /* 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
|
7592 window W, for ASCII characters. |
| 24995 | 7593 |
| 7594 If STRING is an overlay string, it comes from position BUFPOS in | |
| 7595 current_buffer, otherwise BUFPOS is zero to indicate that STRING is | |
| 7596 not an overlay string. W must display the current buffer. | |
| 7597 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
|
7598 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
|
7599 |
|
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
7600 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
|
7601 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
|
7602 |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7603 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
|
7604 |
| 24995 | 7605 Set *ENDPTR to the next position where to check for faces in |
| 7606 STRING; -1 if the face is constant from POS to the end of the | |
| 7607 string. | |
| 7608 | |
| 7609 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
|
7610 for displaying ASCII characters. */ |
| 24995 | 7611 |
| 7612 int | |
| 7613 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
|
7614 region_end, endptr, base_face_id, mouse_p) |
| 24995 | 7615 struct window *w; |
| 7616 Lisp_Object string; | |
| 7617 int pos, bufpos; | |
| 7618 int region_beg, region_end; | |
| 7619 int *endptr; | |
| 7620 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
|
7621 int mouse_p; |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7622 { |
| 24995 | 7623 Lisp_Object prop, position, end, limit; |
| 7624 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
| 7625 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
| 7626 struct face *base_face; | |
| 7627 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
|
7628 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface; |
| 24995 | 7629 |
| 7630 /* Get the value of the face property at the current position within | |
| 7631 STRING. Value is nil if there is no face property. */ | |
| 7632 XSETFASTINT (position, pos); | |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7633 prop = Fget_text_property (position, prop_name, string); |
| 24995 | 7634 |
| 7635 /* Get the next position at which to check for faces. Value of end | |
| 7636 is nil if face is constant all the way to the end of the string. | |
| 7637 Otherwise it is a string position where to check faces next. | |
| 7638 Limit is the maximum position up to which to check for property | |
| 7639 changes in Fnext_single_property_change. Strings are usually | |
| 7640 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
|
7641 XSETFASTINT (limit, SCHARS (string)); |
|
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7642 end = Fnext_single_property_change (position, prop_name, string, limit); |
| 24995 | 7643 if (INTEGERP (end)) |
| 7644 *endptr = XFASTINT (end); | |
|
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7645 else |
| 24995 | 7646 *endptr = -1; |
| 7647 | |
| 7648 base_face = FACE_FROM_ID (f, base_face_id); | |
| 7649 xassert (base_face); | |
| 7650 | |
| 7651 /* Optimize the default case that there is no face property and we | |
| 7652 are not in the region. */ | |
| 7653 if (NILP (prop) | |
| 7654 && (base_face_id != DEFAULT_FACE_ID | |
| 7655 /* BUFPOS <= 0 means STRING is not an overlay string, so | |
| 7656 that the region doesn't have to be taken into account. */ | |
| 7657 || bufpos <= 0 | |
| 7658 || bufpos < region_beg | |
| 7659 || bufpos >= region_end) | |
| 7660 && (multibyte_p | |
| 7661 /* We can't realize faces for different charsets differently | |
| 7662 if we don't have fonts, so we can stop here if not working | |
| 7663 on a window-system frame. */ | |
| 7664 || !FRAME_WINDOW_P (f) | |
|
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7665 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0))) |
| 24995 | 7666 return base_face->id; |
| 7667 | |
| 7668 /* Begin with attributes from the base face. */ | |
| 7669 bcopy (base_face->lface, attrs, sizeof attrs); | |
| 7670 | |
| 7671 /* Merge in attributes specified via text properties. */ | |
| 7672 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
|
7673 merge_face_ref (f, prop, attrs, 1, 0); |
| 24995 | 7674 |
| 7675 /* If in the region, merge in the region face. */ | |
| 7676 if (bufpos | |
| 7677 && bufpos >= region_beg | |
| 7678 && 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
|
7679 merge_named_face (f, Qregion, attrs, 0); |
| 24995 | 7680 |
| 7681 /* 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
|
7682 or realize a new one for ASCII characters. */ |
|
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7683 return lookup_face (f, attrs, 0, NULL); |
|
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
7684 } |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
7685 |
|
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
7686 |
| 2336 | 7687 |
| 24995 | 7688 /*********************************************************************** |
| 7689 Tests | |
| 7690 ***********************************************************************/ | |
| 7691 | |
| 7692 #if GLYPH_DEBUG | |
| 7693 | |
| 7694 /* Print the contents of the realized face FACE to stderr. */ | |
| 7695 | |
| 7696 static void | |
| 7697 dump_realized_face (face) | |
| 7698 struct face *face; | |
| 2336 | 7699 { |
| 24995 | 7700 fprintf (stderr, "ID: %d\n", face->id); |
| 7701 #ifdef HAVE_X_WINDOWS | |
| 7702 fprintf (stderr, "gc: %d\n", (int) face->gc); | |
| 7703 #endif | |
| 7704 fprintf (stderr, "foreground: 0x%lx (%s)\n", | |
| 7705 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
|
7706 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
| 24995 | 7707 fprintf (stderr, "background: 0x%lx (%s)\n", |
| 7708 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
|
7709 SDATA (face->lface[LFACE_BACKGROUND_INDEX])); |
| 24995 | 7710 fprintf (stderr, "font_name: %s (%s)\n", |
| 7711 face->font_name, | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7712 SDATA (face->lface[LFACE_FAMILY_INDEX])); |
| 24995 | 7713 #ifdef HAVE_X_WINDOWS |
| 7714 fprintf (stderr, "font = %p\n", face->font); | |
| 7715 #endif | |
| 7716 fprintf (stderr, "font_info_id = %d\n", face->font_info_id); | |
| 7717 fprintf (stderr, "fontset: %d\n", face->fontset); | |
| 7718 fprintf (stderr, "underline: %d (%s)\n", | |
| 7719 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
|
7720 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))); |
| 24995 | 7721 fprintf (stderr, "hash: %d\n", face->hash); |
| 7722 fprintf (stderr, "charset: %d\n", face->charset); | |
| 7723 } | |
| 7724 | |
| 7725 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7726 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
|
7727 (n) |
| 24995 | 7728 Lisp_Object n; |
| 7729 { | |
| 7730 if (NILP (n)) | |
| 2336 | 7731 { |
| 24995 | 7732 int i; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7733 |
| 24995 | 7734 fprintf (stderr, "font selection order: "); |
| 7735 for (i = 0; i < DIM (font_sort_order); ++i) | |
| 7736 fprintf (stderr, "%d ", font_sort_order[i]); | |
| 7737 fprintf (stderr, "\n"); | |
| 7738 | |
| 7739 fprintf (stderr, "alternative fonts: "); | |
| 7740 debug_print (Vface_alternative_font_family_alist); | |
| 7741 fprintf (stderr, "\n"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7742 |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
7743 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i) |
| 24995 | 7744 Fdump_face (make_number (i)); |
| 2336 | 7745 } |
| 24995 | 7746 else |
| 7747 { | |
| 7748 struct face *face; | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
7749 CHECK_NUMBER (n); |
|
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
7750 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n)); |
| 24995 | 7751 if (face == NULL) |
| 7752 error ("Not a valid face"); | |
| 7753 dump_realized_face (face); | |
| 7754 } | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7755 |
| 2336 | 7756 return Qnil; |
| 7757 } | |
| 7758 | |
| 7759 | |
| 24995 | 7760 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
|
7761 0, 0, 0, doc: /* */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7762 () |
| 2336 | 7763 { |
| 24995 | 7764 fprintf (stderr, "number of colors = %d\n", ncolors_allocated); |
| 7765 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated); | |
| 7766 fprintf (stderr, "number of GCs = %d\n", ngcs); | |
| 2336 | 7767 return Qnil; |
| 7768 } | |
| 24995 | 7769 |
| 7770 #endif /* GLYPH_DEBUG != 0 */ | |
| 7771 | |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
7772 |
|
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
7773 |
| 24995 | 7774 /*********************************************************************** |
| 7775 Initialization | |
| 7776 ***********************************************************************/ | |
|
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
7777 |
| 2336 | 7778 void |
| 2391 | 7779 syms_of_xfaces () |
| 2336 | 7780 { |
| 2391 | 7781 Qface = intern ("face"); |
| 7782 staticpro (&Qface); | |
| 57107 | 7783 Qface_no_inherit = intern ("face-no-inherit"); |
| 7784 staticpro (&Qface_no_inherit); | |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
7785 Qbitmap_spec_p = intern ("bitmap-spec-p"); |
|
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
7786 staticpro (&Qbitmap_spec_p); |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7787 Qframe_update_face_colors = intern ("frame-update-face-colors"); |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7788 staticpro (&Qframe_update_face_colors); |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7789 |
| 24995 | 7790 /* Lisp face attribute keywords. */ |
| 7791 QCfamily = intern (":family"); | |
| 7792 staticpro (&QCfamily); | |
| 7793 QCheight = intern (":height"); | |
| 7794 staticpro (&QCheight); | |
| 7795 QCweight = intern (":weight"); | |
| 7796 staticpro (&QCweight); | |
| 7797 QCslant = intern (":slant"); | |
| 7798 staticpro (&QCslant); | |
| 7799 QCunderline = intern (":underline"); | |
| 7800 staticpro (&QCunderline); | |
| 7801 QCinverse_video = intern (":inverse-video"); | |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7802 staticpro (&QCinverse_video); |
| 24995 | 7803 QCreverse_video = intern (":reverse-video"); |
| 7804 staticpro (&QCreverse_video); | |
| 7805 QCforeground = intern (":foreground"); | |
| 7806 staticpro (&QCforeground); | |
| 7807 QCbackground = intern (":background"); | |
| 7808 staticpro (&QCbackground); | |
| 7809 QCstipple = intern (":stipple");; | |
| 7810 staticpro (&QCstipple); | |
| 7811 QCwidth = intern (":width"); | |
| 7812 staticpro (&QCwidth); | |
| 7813 QCfont = intern (":font"); | |
| 7814 staticpro (&QCfont); | |
| 7815 QCbold = intern (":bold"); | |
| 7816 staticpro (&QCbold); | |
| 7817 QCitalic = intern (":italic"); | |
| 7818 staticpro (&QCitalic); | |
| 7819 QCoverline = intern (":overline"); | |
| 7820 staticpro (&QCoverline); | |
| 7821 QCstrike_through = intern (":strike-through"); | |
| 7822 staticpro (&QCstrike_through); | |
| 7823 QCbox = intern (":box"); | |
| 7824 staticpro (&QCbox); | |
| 31178 | 7825 QCinherit = intern (":inherit"); |
| 7826 staticpro (&QCinherit); | |
| 24995 | 7827 |
| 7828 /* Symbols used for Lisp face attribute values. */ | |
| 7829 QCcolor = intern (":color"); | |
| 7830 staticpro (&QCcolor); | |
| 7831 QCline_width = intern (":line-width"); | |
| 7832 staticpro (&QCline_width); | |
| 7833 QCstyle = intern (":style"); | |
| 7834 staticpro (&QCstyle); | |
| 7835 Qreleased_button = intern ("released-button"); | |
| 7836 staticpro (&Qreleased_button); | |
| 7837 Qpressed_button = intern ("pressed-button"); | |
| 7838 staticpro (&Qpressed_button); | |
| 7839 Qnormal = intern ("normal"); | |
| 7840 staticpro (&Qnormal); | |
| 7841 Qultra_light = intern ("ultra-light"); | |
| 7842 staticpro (&Qultra_light); | |
| 7843 Qextra_light = intern ("extra-light"); | |
| 7844 staticpro (&Qextra_light); | |
| 7845 Qlight = intern ("light"); | |
| 7846 staticpro (&Qlight); | |
| 7847 Qsemi_light = intern ("semi-light"); | |
| 7848 staticpro (&Qsemi_light); | |
| 7849 Qsemi_bold = intern ("semi-bold"); | |
| 7850 staticpro (&Qsemi_bold); | |
| 7851 Qbold = intern ("bold"); | |
| 7852 staticpro (&Qbold); | |
| 7853 Qextra_bold = intern ("extra-bold"); | |
| 7854 staticpro (&Qextra_bold); | |
| 7855 Qultra_bold = intern ("ultra-bold"); | |
| 7856 staticpro (&Qultra_bold); | |
| 7857 Qoblique = intern ("oblique"); | |
| 7858 staticpro (&Qoblique); | |
| 7859 Qitalic = intern ("italic"); | |
| 7860 staticpro (&Qitalic); | |
| 7861 Qreverse_oblique = intern ("reverse-oblique"); | |
| 7862 staticpro (&Qreverse_oblique); | |
| 7863 Qreverse_italic = intern ("reverse-italic"); | |
| 7864 staticpro (&Qreverse_italic); | |
| 7865 Qultra_condensed = intern ("ultra-condensed"); | |
| 7866 staticpro (&Qultra_condensed); | |
| 7867 Qextra_condensed = intern ("extra-condensed"); | |
| 7868 staticpro (&Qextra_condensed); | |
| 7869 Qcondensed = intern ("condensed"); | |
| 7870 staticpro (&Qcondensed); | |
| 7871 Qsemi_condensed = intern ("semi-condensed"); | |
| 7872 staticpro (&Qsemi_condensed); | |
| 7873 Qsemi_expanded = intern ("semi-expanded"); | |
| 7874 staticpro (&Qsemi_expanded); | |
| 7875 Qexpanded = intern ("expanded"); | |
| 7876 staticpro (&Qexpanded); | |
| 7877 Qextra_expanded = intern ("extra-expanded"); | |
| 7878 staticpro (&Qextra_expanded); | |
| 7879 Qultra_expanded = intern ("ultra-expanded"); | |
| 7880 staticpro (&Qultra_expanded); | |
| 7881 Qbackground_color = intern ("background-color"); | |
| 7882 staticpro (&Qbackground_color); | |
| 7883 Qforeground_color = intern ("foreground-color"); | |
| 7884 staticpro (&Qforeground_color); | |
| 7885 Qunspecified = intern ("unspecified"); | |
| 7886 staticpro (&Qunspecified); | |
| 7887 | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7888 Qface_alias = intern ("face-alias"); |
|
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7889 staticpro (&Qface_alias); |
| 24995 | 7890 Qdefault = intern ("default"); |
| 7891 staticpro (&Qdefault); | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
7892 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
|
7893 staticpro (&Qtool_bar); |
| 24995 | 7894 Qregion = intern ("region"); |
| 7895 staticpro (&Qregion); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7896 Qfringe = intern ("fringe"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7897 staticpro (&Qfringe); |
| 25546 | 7898 Qheader_line = intern ("header-line"); |
| 7899 staticpro (&Qheader_line); | |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7900 Qscroll_bar = intern ("scroll-bar"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7901 staticpro (&Qscroll_bar); |
|
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
7902 Qmenu = intern ("menu"); |
|
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
7903 staticpro (&Qmenu); |
|
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7904 Qcursor = intern ("cursor"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7905 staticpro (&Qcursor); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7906 Qborder = intern ("border"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7907 staticpro (&Qborder); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7908 Qmouse = intern ("mouse"); |
|
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7909 staticpro (&Qmouse); |
|
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
7910 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
|
7911 staticpro (&Qmode_line_inactive); |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7912 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
|
7913 staticpro (&Qtty_color_desc); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
7914 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
|
7915 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
|
7916 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
|
7917 staticpro (&Qtty_color_by_index); |
|
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7918 Qtty_color_alist = intern ("tty-color-alist"); |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7919 staticpro (&Qtty_color_alist); |
|
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
7920 Qscalable_fonts_allowed = intern ("scalable-fonts-allowed"); |
|
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
7921 staticpro (&Qscalable_fonts_allowed); |
| 24995 | 7922 |
|
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
7923 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil); |
|
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
7924 staticpro (&Vparam_value_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
7925 Vface_alternative_font_family_alist = Qnil; |
|
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
7926 staticpro (&Vface_alternative_font_family_alist); |
|
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
7927 Vface_alternative_font_registry_alist = Qnil; |
|
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
7928 staticpro (&Vface_alternative_font_registry_alist); |
|
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
7929 |
| 24995 | 7930 defsubr (&Sinternal_make_lisp_face); |
| 7931 defsubr (&Sinternal_lisp_face_p); | |
| 7932 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
|
7933 #ifdef HAVE_WINDOW_SYSTEM |
| 24995 | 7934 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
|
7935 #endif |
|
27120
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
7936 defsubr (&Scolor_gray_p); |
|
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
7937 defsubr (&Scolor_supported_p); |
|
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
7938 defsubr (&Sface_attribute_relative_p); |
|
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
7939 defsubr (&Smerge_face_attribute); |
| 24995 | 7940 defsubr (&Sinternal_get_lisp_face_attribute); |
| 7941 defsubr (&Sinternal_lisp_face_attribute_values); | |
| 7942 defsubr (&Sinternal_lisp_face_equal_p); | |
| 7943 defsubr (&Sinternal_lisp_face_empty_p); | |
| 7944 defsubr (&Sinternal_copy_lisp_face); | |
| 7945 defsubr (&Sinternal_merge_in_global_face); | |
| 7946 defsubr (&Sface_font); | |
| 7947 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
|
7948 defsubr (&Sdisplay_supports_face_attributes_p); |
|
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
7949 defsubr (&Scolor_distance); |
| 24995 | 7950 defsubr (&Sinternal_set_font_selection_order); |
| 7951 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
|
7952 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
|
7953 defsubr (&Sface_attributes_as_vector); |
| 24995 | 7954 #if GLYPH_DEBUG |
| 7955 defsubr (&Sdump_face); | |
| 7956 defsubr (&Sshow_face_resources); | |
| 7957 #endif /* GLYPH_DEBUG */ | |
| 7958 defsubr (&Sclear_face_cache); | |
|
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7959 defsubr (&Stty_suppress_bold_inverse_default_colors); |
| 24995 | 7960 |
|
29711
913fab478495
(syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents:
29599
diff
changeset
|
7961 #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
|
7962 defsubr (&Sdump_colors); |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
7963 #endif |
|
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
7964 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7965 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
|
7966 doc: /* *Limit for font matching. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7967 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
|
7968 that number of fonts when searching for a matching font. */); |
| 25270 | 7969 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
| 7970 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7971 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
|
7972 doc: /* List of global face definitions (for internal use only.) */); |
| 24995 | 7973 Vface_new_frame_defaults = Qnil; |
|
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7974 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7975 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
|
7976 doc: /* *Default stipple pattern used on monochrome displays. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7977 This stipple pattern is used on monochrome displays |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7978 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
|
7979 See `set-face-stipple' for possible values for this variable. */); |
| 24995 | 7980 Vface_default_stipple = build_string ("gray3"); |
| 7981 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7982 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
|
7983 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
|
7984 Vtty_defined_color_alist = Qnil; |
|
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7985 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7986 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
|
7987 doc: /* Allowed scalable fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7988 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
|
7989 A value of t means allow any scalable font. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7990 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
|
7991 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
|
7992 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
|
7993 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
|
7994 Vscalable_fonts_allowed = Qnil; |
|
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
7995 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7996 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
|
7997 doc: /* List of ignored fonts. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7998 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
|
7999 ignore. */); |
|
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
8000 Vface_ignored_fonts = Qnil; |
|
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
8001 |
|
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8002 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
|
8003 doc: /* Alist of fonts vs the rescaling factors. |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8004 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
|
8005 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
|
8006 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
|
8007 \(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
|
8008 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
|
8009 Vface_font_rescale_alist = Qnil; |
|
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8010 |
|
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
8011 #ifdef HAVE_WINDOW_SYSTEM |
|
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
8012 defsubr (&Sbitmap_spec_p); |
| 24995 | 8013 defsubr (&Sx_list_fonts); |
| 8014 defsubr (&Sinternal_face_x_get_resource); | |
|
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
8015 defsubr (&Sx_family_fonts); |
| 24995 | 8016 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
|
8017 #endif /* HAVE_WINDOW_SYSTEM */ |
| 2336 | 8018 } |
| 52401 | 8019 |
| 8020 /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 | |
| 8021 (do not change this comment) */ |
