annotate src/xfaces.c @ 111700:3242c8febbd0

Bug 7458: Make key press like Left + right ctrl work when right is not control. Ditto Alt and Command. * src/nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask) (NSLeftAlternateKeyMask): New defines. (keyDown): Parse left and right keys separatly.
author Jan D. <jan.h.d@swipnet.se>
date Wed, 24 Nov 2010 08:50:08 +0100
parents 8bd4a845ba2a
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1 /* xfaces.c -- "Face" primitives.
111133
d9b0552c39a6 Remove duplicate definition of tty-defined-color-alist.
Glenn Morris <rgm@gnu.org>
parents: 109653
diff changeset
2
d9b0552c39a6 Remove duplicate definition of tty-defined-color-alist.
Glenn Morris <rgm@gnu.org>
parents: 109653
diff changeset
3 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
d9b0552c39a6 Remove duplicate definition of tty-defined-color-alist.
Glenn Morris <rgm@gnu.org>
parents: 109653
diff changeset
4 2005, 2006, 2007, 2008, 2009, 2010
d9b0552c39a6 Remove duplicate definition of tty-defined-color-alist.
Glenn Morris <rgm@gnu.org>
parents: 109653
diff changeset
5 Free Software Foundation, Inc.
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 This file is part of GNU Emacs.
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94938
diff changeset
9 GNU Emacs is free software: you can redistribute it and/or modify
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94938
diff changeset
11 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94938
diff changeset
12 (at your option) any later version.
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU Emacs is distributed in the hope that it will be useful,
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 GNU General Public License for more details.
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94938
diff changeset
20 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
22 /* New face implementation by Gerd Moellmann <gerd@gnu.org>. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
23
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
24 /* Faces.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
25
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
26 When using Emacs with X, the display style of characters can be
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
27 changed by defining `faces'. Each face can specify the following
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
28 display attributes:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
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
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
32 2. Font foundary name.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
33
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
34 3. Relative proportionate width, aka character set width or set
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
35 width (swidth), e.g. `semi-compressed'.
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
36
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
37 4. Font height in 1/10pt.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
38
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
39 5. Font weight, e.g. `bold'.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
40
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
41 6. Font slant, e.g. `italic'.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
42
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
43 7. Foreground color.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
44
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
45 8. Background color.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
46
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
47 9. Whether or not characters should be underlined, and in what color.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
48
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
49 10. Whether or not characters should be displayed in inverse video.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
50
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
51 11. A background stipple, a bitmap.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
52
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
53 12. Whether or not characters should be overlined, and in what color.
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
54
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
55 13. Whether or not characters should be strike-through, and in what
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
56 color.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
57
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
58 14. Whether or not a box should be drawn around characters, the box
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
59 type, and, for simple boxes, in what color.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
60
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
61 15. Font-spec, or nil. This is a special attribute.
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
62
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
63 A font-spec is a collection of font attributes (specs).
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
64
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
65 When this attribute is specified, the face uses a font matching
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
66 with the specs as is except for what overwritten by the specs in
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
67 the fontset (see below). In addition, the other font-related
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
68 attributes (1st thru 5th) are updated from the spec.
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
69
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
70 On the other hand, if one of the other font-related attributes are
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
71 specified, the correspoinding specs in this attribute is set to nil.
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
72
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
73 15. A face name or list of face names from which to inherit attributes.
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
74
35913
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
75 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
76 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
77 for example, can be matched exactly.
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
78
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
79 17. A fontset name. This is another special attribute.
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
80
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
81 A fontset is a mappings from characters to font-specs, and the
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
82 specs overwrite the font-spec in the 14th attribute.
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
83
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
84
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
85 Faces are frame-local by nature because Emacs allows to define the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
86 same named face (face names are symbols) differently for different
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
87 frames. Each frame has an alist of face definitions for all named
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
88 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
89 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
90 attributes mentioned above.
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
91
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
92 There is also a global face alist `Vface_new_frame_defaults'. Face
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
93 definitions from this list are used to initialize faces of newly
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
94 created frames.
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
95
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
96 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
97 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
98 the 14th are called `fully-specified'.
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
99
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
100
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
101 Face merging.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
102
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
103 The display style of a given character in the text is determined by
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
104 combining several faces. This process is called `face merging'.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
105 Any aspect of the display style that isn't specified by overlays or
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
106 text properties is taken from the `default' face. Since it is made
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
107 sure that the default face is always fully-specified, face merging
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
108 always results in a fully-specified face.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
109
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
110
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
111 Face realization.
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
112
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
113 After all face attributes for a character have been determined by
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
114 merging faces of that character, that face is `realized'. The
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
115 realization process maps face attributes to what is physically
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
116 available on the system where Emacs runs. The result is a
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
117 `realized face' in form of a struct face which is stored in the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
118 face cache of the frame on which it was realized.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
119
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
120 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
121 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
122 other words, for characters that have different font
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
123 specifications, different realized faces are needed to display
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
124 them.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
125
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
126 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
127 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
128 characters share the same font in a fontset.
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
129
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
130 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
131 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
132 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
133 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
134 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
135
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
136 Thus, all realized faces have a realized fontset.
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
137
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
138
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
139 Unibyte text.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
140
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
141 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
142 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
143 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
144 and raw 8-bit characters.
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
145
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
146
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
147 Font selection.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
148
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
149 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
150 given (character, face) combination.
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
151
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
152 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
153 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
154 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
155 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
156 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
157 default fontset determines a pattern for multibyte characters.
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
158
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
159 Available fonts on the system on which Emacs runs are then matched
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
160 against the font pattern. The result of font selection is the best
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
161 match for the given face attributes in this font list.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
162
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
163 Font selection can be influenced by the user.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
164
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
165 1. The user can specify the relative importance he gives the face
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
166 attributes width, height, weight, and slant by setting
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
167 face-font-selection-order (faces.el) to a list of face attribute
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
168 names. The default is '(:width :height :weight :slant), and means
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
169 that font selection first tries to find a good match for the font
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
170 width specified by a face, then---within fonts with that
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
171 width---tries to find a best match for the specified font height,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
172 etc.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
173
34629
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
174 2. Setting face-font-family-alternatives allows the user to
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
175 specify alternative font families to try if a family specified by a
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
176 face doesn't exist.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
177
34629
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
178 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
179 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
180 specifying a registry.
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
181
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
182 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
183 fonts.
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
184
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
185
36946
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 36942
diff changeset
186 Character composition.
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
187
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
188 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
189 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
190 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
191 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
192 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
193 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
194 the same.
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
195
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
196
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
197 Initialization of basic faces.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
198
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
199 The faces `default', `modeline' are considered `basic faces'.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
200 When redisplay happens the first time for a newly created frame,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
201 basic faces are realized for CHARSET_ASCII. Frame parameters are
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
202 used to fill in unspecified attributes of the default face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
203
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25890
diff changeset
204 #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
205 #include <stdio.h>
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 #include <sys/types.h>
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207 #include <sys/stat.h>
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
208 #include <stdio.h> /* This needs to be before termchar.h */
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104079
diff changeset
209 #include <setjmp.h>
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
210
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 #include "lisp.h"
88394
b954eee715da Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 43270
diff changeset
212 #include "character.h"
17047
6c586afaa572 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16051
diff changeset
213 #include "charset.h"
37700
0e6b93106f2a Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents: 37679
diff changeset
214 #include "keyboard.h"
18083
c361afa561c5 Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 17047
diff changeset
215 #include "frame.h"
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
216 #include "termhooks.h"
18083
c361afa561c5 Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 17047
diff changeset
217
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
218 #ifdef HAVE_X_WINDOWS
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 #include "xterm.h"
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
220 #ifdef USE_MOTIF
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
221 #include <Xm/Xm.h>
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
222 #include <Xm/XmStrDefs.h>
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
223 #endif /* USE_MOTIF */
31570
9eeff4863080 Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents: 31522
diff changeset
224 #endif /* HAVE_X_WINDOWS */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
225
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
226 #ifdef MSDOS
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
227 #include "dosfns.h"
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
228 #endif
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
229
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
230 #ifdef WINDOWSNT
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
231 #include "w32term.h"
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
232 #include "fontset.h"
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
233 /* 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
234 code with #ifdef blocks. */
37700
0e6b93106f2a Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents: 37679
diff changeset
235 #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
236 #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
237 #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
238 #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
239 #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
240 #define GCGraphicsExposures 0
31570
9eeff4863080 Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents: 31522
diff changeset
241 #endif /* WINDOWSNT */
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
242
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
243 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
244 #include "nsterm.h"
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
245 #undef FRAME_X_DISPLAY_INFO
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
246 #define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
247 #define x_display_info ns_display_info
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
248 #define FRAME_X_FONT_TABLE FRAME_NS_FONT_TABLE
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
249 #define check_x check_ns
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
250 #define GCGraphicsExposures 0
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
251 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
252
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 #include "buffer.h"
2391
226dcdb8ab67 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2342
diff changeset
254 #include "dispextern.h"
2438
b513de4de386 * xfaces.c: Doc fixes.
Jim Blandy <jimb@redhat.com>
parents: 2391
diff changeset
255 #include "blockinput.h"
2767
482fa0725db6 * xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents: 2743
diff changeset
256 #include "window.h"
8848
48b3ac951c53 Add #include "intervals.h"
Karl Heuer <kwzh@gnu.org>
parents: 8472
diff changeset
257 #include "intervals.h"
53226
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
258 #include "termchar.h"
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259
95128
9c4d21df23ff Include font.h unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 95044
diff changeset
260 #include "font.h"
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
261 #ifdef HAVE_WINDOW_SYSTEM
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
262 #include "fontset.h"
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
263 #endif /* HAVE_WINDOW_SYSTEM */
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
264
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
265 #ifdef HAVE_X_WINDOWS
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
266
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
267 /* 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
268 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
269 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
270 #included. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
271
3436
291f28da7ea1 Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents: 3401
diff changeset
272 #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
273 #include <time.h>
d968bcba16af * xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents: 3882
diff changeset
274 #undef USG
d968bcba16af * xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents: 3882
diff changeset
275 #include <X11/Xos.h>
d968bcba16af * xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents: 3882
diff changeset
276 #define USG
d968bcba16af * xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents: 3882
diff changeset
277 #define __TIMEVAL__
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
278 #else /* not XOS_NEEDS_TIME_H */
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279 #include <X11/Xos.h>
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
280 #endif /* not XOS_NEEDS_TIME_H */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
281
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
282 #endif /* HAVE_X_WINDOWS */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
283
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
284 #include <ctype.h>
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
285
34882
ddb3abae49ee (PT_PER_INCH): New macro.
Gerd Moellmann <gerd@gnu.org>
parents: 34629
diff changeset
286 /* Number of pt per inch (from the TeXbook). */
ddb3abae49ee (PT_PER_INCH): New macro.
Gerd Moellmann <gerd@gnu.org>
parents: 34629
diff changeset
287
ddb3abae49ee (PT_PER_INCH): New macro.
Gerd Moellmann <gerd@gnu.org>
parents: 34629
diff changeset
288 #define PT_PER_INCH 72.27
ddb3abae49ee (PT_PER_INCH): New macro.
Gerd Moellmann <gerd@gnu.org>
parents: 34629
diff changeset
289
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
290 /* Non-zero if face attribute ATTR is unspecified. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
291
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
292 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
293
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
294 /* Non-zero if face attribute ATTR is `ignore-defface'. */
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
295
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
296 #define IGNORE_DEFFACE_P(ATTR) EQ ((ATTR), Qignore_defface)
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
297
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
298 /* Value is the number of elements of VECTOR. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
299
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
300 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
301
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
302 /* Make a copy of string S on the stack using alloca. Value is a pointer
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
303 to the copy. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
304
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
305 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
306
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
307 /* Make a copy of the contents of Lisp string S on the stack using
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
308 alloca. Value is a pointer to the copy. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
309
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
310 #define LSTRDUPA(S) STRDUPA (SDATA ((S)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
311
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
312 /* Size of hash table of realized faces in face caches (should be a
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
313 prime number). */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
314
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
315 #define FACE_CACHE_BUCKETS_SIZE 1001
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
316
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
317 /* Keyword symbols used for face attribute names. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
318
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
319 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
320 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
321 Lisp_Object QCwidth, QCfont, QCbold, QCitalic;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
322 Lisp_Object QCreverse_video;
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
323 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit;
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
324 Lisp_Object QCfontset;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
325
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
326 /* Symbols used for attribute values. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
327
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
328 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
329 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
330 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
331 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
332 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
333 Lisp_Object Qultra_expanded;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
334 Lisp_Object Qreleased_button, Qpressed_button;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
335 Lisp_Object QCstyle, QCcolor, QCline_width;
27114
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
336 Lisp_Object Qunspecified;
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
337 Lisp_Object Qignore_defface;
27114
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
338
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
339 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg";
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
340
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
341 /* The name of the function to call when the background of the frame
63642
cb0d171c8273 Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents: 63594
diff changeset
342 has changed, frame_set_background_mode. */
cb0d171c8273 Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents: 63594
diff changeset
343
cb0d171c8273 Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents: 63594
diff changeset
344 Lisp_Object Qframe_set_background_mode;
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
345
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
346 /* Names of basic faces. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
347
26574
5510d0cc07c3 Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents: 26088
diff changeset
348 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
349 Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu;
63649
144440a09db1 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents: 63642
diff changeset
350 Lisp_Object Qmode_line_inactive, Qvertical_border;
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
351
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
352 /* The symbol `face-alias'. A symbols having that property is an
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
353 alias for another face. Value of the property is the name of
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
354 the aliased face. */
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
355
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
356 Lisp_Object Qface_alias;
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
357
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
358 /* Default stipple pattern used on monochrome displays. This stipple
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
359 pattern is used on monochrome displays instead of shades of gray
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
360 for a face background color. See `set-face-stipple' for possible
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
361 values for this variable. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
362
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
363 Lisp_Object Vface_default_stipple;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
364
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
365 /* Alist of alternative font families. Each element is of the form
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
366 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
367 try FAMILY1, then FAMILY2, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
368
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
369 Lisp_Object Vface_alternative_font_family_alist;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
370
33372
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
371 /* Alist of alternative font registries. Each element is of the form
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
372 (REGISTRY REGISTRY1 REGISTRY2...). If fonts of REGISTRY can't be
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
373 loaded, try REGISTRY1, then REGISTRY2, ... */
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
374
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
375 Lisp_Object Vface_alternative_font_registry_alist;
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
376
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
377 /* Allowed scalable fonts. A value of nil means don't allow any
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
378 scalable fonts. A value of t means allow the use of any scalable
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
379 font. Otherwise, value must be a list of regular expressions. A
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
380 font may be scaled if its name matches a regular expression in the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
381 list. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
382
37394
7847d9b8bbff (Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37206
diff changeset
383 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
384
34629
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
385 /* List of regular expressions that matches names of fonts to ignore. */
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
386
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
387 Lisp_Object Vface_ignored_fonts;
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
388
50515
98bdd2203d85 (Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 50412
diff changeset
389 /* Alist of font name patterns vs the rescaling factor. */
98bdd2203d85 (Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 50412
diff changeset
390
98bdd2203d85 (Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 50412
diff changeset
391 Lisp_Object Vface_font_rescale_alist;
98bdd2203d85 (Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 50412
diff changeset
392
25270
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
393 /* Maximum number of fonts to consider in font_list. If not an
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
394 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
395
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
396 Lisp_Object Vfont_list_limit;
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
397 #define DEFAULT_FONT_LIST_LIMIT 100
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
398
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
399 /* The symbols `foreground-color' and `background-color' which can be
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
400 used as part of a `face' property. This is for compatibility with
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
401 Emacs 20.2. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
402
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
403 Lisp_Object Qforeground_color, Qbackground_color;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
404
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
405 /* The symbols `face' and `mouse-face' used as text properties. */
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
406
23730
c71c3ac4b80a (Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents: 21766
diff changeset
407 Lisp_Object Qface;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
408
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
409 /* Property for basic faces which other faces cannot inherit. */
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
410
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
411 Lisp_Object Qface_no_inherit;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
412
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
413 /* Error symbol for wrong_type_argument in load_pixmap. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
414
25890
b10a34d40b55 (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25883
diff changeset
415 Lisp_Object Qbitmap_spec_p;
2391
226dcdb8ab67 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2342
diff changeset
416
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
417 /* Alist of global face definitions. Each element is of the form
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
418 (FACE . LFACE) where FACE is a symbol naming a face and LFACE
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
419 is a Lisp vector of face attributes. These faces are used
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
420 to initialize faces for new frames. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
421
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
422 Lisp_Object Vface_new_frame_defaults;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
423
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
424 /* Alist of face remappings. Each element is of the form:
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
425 (FACE REPLACEMENT...) which causes display of the face FACE to use
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
426 REPLACEMENT... instead. REPLACEMENT... is interpreted the same way
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
427 the value of a `face' text property is: it may be (1) A face name,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
428 (2) A list of face names, (3) A property-list of face attribute/value
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
429 pairs, or (4) A list of face names intermixed with lists containing
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
430 face attribute/value pairs.
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
431
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
432 Multiple entries in REPLACEMENT... are merged together to form the final
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
433 result, with faces or attributes earlier in the list taking precedence
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
434 over those that are later.
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
435
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
436 Face-name remapping cycles are suppressed; recursive references use
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
437 the underlying face instead of the remapped face. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
438
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
439 Lisp_Object Vface_remapping_alist;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
440
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
441 /* The next ID to assign to Lisp faces. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
442
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
443 static int next_lface_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
444
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
445 /* A vector mapping Lisp face Id's to face names. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
446
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
447 static Lisp_Object *lface_id_to_name;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
448 static int lface_id_to_name_size;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
449
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
450 /* 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
451
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
452 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
453
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
454 /* 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
455
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
456 Lisp_Object Qtty_color_alist;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
457
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
458 /* 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
459
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
460 Lisp_Object Vtty_defined_color_alist;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
461
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
462 /* Counter for calls to clear_face_cache. If this counter reaches
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
463 CLEAR_FONT_TABLE_COUNT, and a frame has more than
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
464 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
465
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
466 static int clear_font_table_count;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
467 #define CLEAR_FONT_TABLE_COUNT 100
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
468 #define CLEAR_FONT_TABLE_NFONTS 10
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
469
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
470 /* Non-zero means face attributes have been changed since the last
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
471 redisplay. Used in redisplay_internal. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
472
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
473 int face_change_count;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
474
28529
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
475 /* 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
476 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
477 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
478 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
479
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
480 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
481
31449
8797df6a9fa2 (Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31440
diff changeset
482 /* 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
483 Finternal_set_lisp_face_attribute. */
8797df6a9fa2 (Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31440
diff changeset
484
8797df6a9fa2 (Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31440
diff changeset
485 static Lisp_Object Vparam_value_alist;
8797df6a9fa2 (Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31440
diff changeset
486
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
487 /* The total number of colors currently allocated. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
488
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
489 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
490 static int ncolors_allocated;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
491 static int npixmaps_allocated;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
492 static int ngcs;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
493 #endif
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
494
38905
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
495 /* 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
496 been changed. */
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
497
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
498 int menu_face_changed_default;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
499
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
501 /* Function prototypes. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
502
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
503 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
504 struct named_merge_point;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
505
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
506 static void map_tty_color (struct frame *, struct face *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
507 enum lface_attribute_index, int *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
508 static Lisp_Object resolve_face_name (Lisp_Object, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
509 static void set_font_frame_param (Lisp_Object, Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
510 static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
511 int, struct named_merge_point *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
512 static int load_pixmap (struct frame *, Lisp_Object, unsigned *, unsigned *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
513 static struct frame *frame_or_selected_frame (Lisp_Object, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
514 static void load_face_colors (struct frame *, struct face *, Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
515 static void free_face_colors (struct frame *, struct face *);
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109494
diff changeset
516 static int face_color_gray_p (struct frame *, const char *);
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
517 static struct face *realize_face (struct face_cache *, Lisp_Object *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
518 int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
519 static struct face *realize_non_ascii_face (struct frame *, Lisp_Object,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
520 struct face *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
521 static struct face *realize_x_face (struct face_cache *, Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
522 static struct face *realize_tty_face (struct face_cache *, Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
523 static int realize_basic_faces (struct frame *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
524 static int realize_default_face (struct frame *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
525 static void realize_named_face (struct frame *, Lisp_Object, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
526 static int lface_fully_specified_p (Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
527 static int lface_equal_p (Lisp_Object *, Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
528 static unsigned hash_string_case_insensitive (Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
529 static unsigned lface_hash (Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
530 static int lface_same_font_attributes_p (Lisp_Object *, Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
531 static struct face_cache *make_face_cache (struct frame *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
532 static void clear_face_gcs (struct face_cache *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
533 static void free_face_cache (struct face_cache *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
534 static int face_fontset (Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
535 static void merge_face_vectors (struct frame *, Lisp_Object *, Lisp_Object*,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
536 struct named_merge_point *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
537 static int merge_face_ref (struct frame *, Lisp_Object, Lisp_Object *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
538 int, struct named_merge_point *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
539 static int set_lface_from_font (struct frame *, Lisp_Object, Lisp_Object,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
540 int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
541 static Lisp_Object lface_from_face_name (struct frame *, Lisp_Object, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
542 static struct face *make_realized_face (Lisp_Object *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
543 static void cache_face (struct face_cache *, struct face *, unsigned);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
544 static void uncache_face (struct face_cache *, struct face *);
2730
139740855fa6 * xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents: 2538
diff changeset
545
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
546 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
547
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
548 static GC x_create_gc (struct frame *, unsigned long, XGCValues *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
549 static void x_free_gc (struct frame *, GC);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
550
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
551 #ifdef USE_X_TOOLKIT
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
552 static void x_update_menu_appearance (struct frame *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
553
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
554 extern void free_frame_menubar (struct frame *);
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
555 #endif /* USE_X_TOOLKIT */
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
556
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
557 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
558
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
559
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
560 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
561 Utilities
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
562 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
563
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
564 #ifdef HAVE_X_WINDOWS
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
565
28354
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
566 #ifdef DEBUG_X_COLORS
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
567
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
568 /* 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
569 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
570 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
571 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
572 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
573 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
574 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
575 single display/screen. --gerd. */
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
576
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
577 /* Reference counts for pixel colors. */
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
578
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
579 int color_count[256];
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
580
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
581 /* Register color PIXEL as allocated. */
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
582
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
583 void
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
584 register_color (pixel)
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
585 unsigned long pixel;
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
586 {
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
587 xassert (pixel < 256);
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
588 ++color_count[pixel];
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
589 }
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
590
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
591
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
592 /* Register color PIXEL as deallocated. */
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
593
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
594 void
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
595 unregister_color (pixel)
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
596 unsigned long pixel;
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
597 {
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
598 xassert (pixel < 256);
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
599 if (color_count[pixel] > 0)
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
600 --color_count[pixel];
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
601 else
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
602 abort ();
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
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
605
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
606 /* Register N colors from PIXELS as deallocated. */
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 void
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
609 unregister_colors (pixels, n)
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
610 unsigned long *pixels;
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
611 int n;
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
612 {
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
613 int i;
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
614 for (i = 0; i < n; ++i)
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
615 unregister_color (pixels[i]);
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
616 }
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
617
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
618
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
619 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
620 doc: /* Dump currently allocated colors to stderr. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
621 (void)
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
622 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
623 int i, n;
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
624
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
625 fputc ('\n', stderr);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
626
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
627 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
628 if (color_count[i])
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
629 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
630 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
631 ++n;
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
632 if (n % 5 == 0)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
633 fputc ('\n', stderr);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
634 else
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
635 fputc ('\t', stderr);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
636 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
637
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
638 if (n % 5 != 0)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
639 fputc ('\n', stderr);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
640 return Qnil;
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
28354
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
643 #endif /* DEBUG_X_COLORS */
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
644
31570
9eeff4863080 Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents: 31522
diff changeset
645
27960
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
646 /* 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
647 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
648 is called. */
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
649
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
650 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
651 x_free_colors (struct frame *f, long unsigned int *pixels, int npixels)
27960
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
652 {
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
653 int class = FRAME_X_DISPLAY_INFO (f)->visual->class;
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
654
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
655 /* 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
656 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
657 if (class != StaticColor && class != StaticGray && class != TrueColor)
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
658 {
28354
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
659 #ifdef DEBUG_X_COLORS
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
660 unregister_colors (pixels, npixels);
28354
d6ae8188fa58 (register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents: 28349
diff changeset
661 #endif
35228
ae27a81ee8dc (x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents: 35040
diff changeset
662 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
663 pixels, npixels, 0);
27960
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
664 }
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
665 }
25a04100858d (x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27743
diff changeset
666
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
667
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
668 /* 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
669 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
670 is called. */
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
671
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
672 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
673 x_free_dpy_colors (Display *dpy, Screen *screen, Colormap cmap, long unsigned int *pixels, int npixels)
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
674 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
675 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
676 int class = dpyinfo->visual->class;
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
677
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
678 /* 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
679 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
680 if (class != StaticColor && class != StaticGray && class != TrueColor)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
681 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
682 #ifdef DEBUG_X_COLORS
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
683 unregister_colors (pixels, npixels);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
684 #endif
35228
ae27a81ee8dc (x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents: 35040
diff changeset
685 XFreeColors (dpy, cmap, pixels, npixels, 0);
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
686 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
687 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
688
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
689
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
690 /* Create and return a GC for use on frame F. GC values and mask
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
691 are given by XGCV and MASK. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
692
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
693 static INLINE GC
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
694 x_create_gc (struct frame *f, long unsigned int mask, XGCValues *xgcv)
2730
139740855fa6 * xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents: 2538
diff changeset
695 {
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
696 GC gc;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
697 BLOCK_INPUT;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
698 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
699 UNBLOCK_INPUT;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
700 IF_DEBUG (++ngcs);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
701 return gc;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
702 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
703
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
704
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
705 /* Free GC which was used on frame F. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
706
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
707 static INLINE void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
708 x_free_gc (struct frame *f, GC gc)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
709 {
84976
372151e622f3 (load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84801
diff changeset
710 eassert (interrupt_input_blocked);
59903
f2619addaa72 (x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents: 59458
diff changeset
711 IF_DEBUG (xassert (--ngcs >= 0));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
712 XFreeGC (FRAME_X_DISPLAY (f), gc);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
713 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
714
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
715 #endif /* HAVE_X_WINDOWS */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
716
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
717 #ifdef WINDOWSNT
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
718 /* W32 emulation of GCs */
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
719
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
720 static INLINE GC
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109372
diff changeset
721 x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv)
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
722 {
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
723 GC gc;
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
724 BLOCK_INPUT;
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
725 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
726 UNBLOCK_INPUT;
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
727 IF_DEBUG (++ngcs);
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
728 return gc;
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
729 }
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
730
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
731
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
732 /* 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
733
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
734 static INLINE void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109372
diff changeset
735 x_free_gc (struct frame *f, GC gc)
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
736 {
59903
f2619addaa72 (x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents: 59458
diff changeset
737 IF_DEBUG (xassert (--ngcs >= 0));
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
738 xfree (gc);
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
739 }
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
740
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
741 #endif /* WINDOWSNT */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
742
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
743 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
744 /* NS emulation of GCs */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
745
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
746 static INLINE GC
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109637
diff changeset
747 x_create_gc (struct frame *f,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109637
diff changeset
748 unsigned long mask,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109637
diff changeset
749 XGCValues *xgcv)
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
750 {
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
751 GC gc = xmalloc (sizeof (*gc));
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
752 if (gc)
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
753 memcpy (gc, xgcv, sizeof (XGCValues));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
754 return gc;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
755 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
756
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
757 static INLINE void
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109637
diff changeset
758 x_free_gc (struct frame *f, GC gc)
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
759 {
103624
3e06f0e66062 Remove useless if-before-xfree tests.
Jim Meyering <jim@meyering.net>
parents: 103359
diff changeset
760 xfree (gc);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
761 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
762 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
763
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
764 /* Like strcasecmp/stricmp. Used to compare parts of font names which
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
765 are in ISO8859-1. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
766
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
767 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
768 xstrcasecmp (const unsigned char *s1, const unsigned char *s2)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
769 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
770 while (*s1 && *s2)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
771 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
772 unsigned char c1 = tolower (*s1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
773 unsigned char c2 = tolower (*s2);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
774 if (c1 != c2)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
775 return c1 < c2 ? -1 : 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
776 ++s1, ++s2;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
777 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
778
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
779 if (*s1 == 0)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
780 return *s2 == 0 ? 0 : -1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
781 return 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
782 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
783
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
784
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
785 /* 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
786 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
787 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
788 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
789 Lisp function definitions. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
790
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
791 static INLINE struct frame *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
792 frame_or_selected_frame (Lisp_Object frame, int nparam)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
793 {
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
794 if (NILP (frame))
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
795 frame = selected_frame;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
796
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
797 CHECK_LIVE_FRAME (frame);
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
798 return XFRAME (frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
799 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
800
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
801
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
802 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
803 Frames and faces
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
804 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
805
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
806 /* 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
807
8e610355cb29 Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents: 9326
diff changeset
808 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
809 init_frame_faces (struct frame *f)
9529
8e610355cb29 Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents: 9326
diff changeset
810 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
811 /* Make a face cache, if F doesn't have one. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
812 if (FRAME_FACE_CACHE (f) == NULL)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
813 FRAME_FACE_CACHE (f) = make_face_cache (f);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
814
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
815 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
816 /* 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
817 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
818 {
100398
0941c26336f4 Update commentary.
Chong Yidong <cyd@stupidchicken.com>
parents: 100383
diff changeset
819 /* We initialize the image cache when creating the first frame
0941c26336f4 Update commentary.
Chong Yidong <cyd@stupidchicken.com>
parents: 100383
diff changeset
820 on a terminal, and not during terminal creation. This way,
0941c26336f4 Update commentary.
Chong Yidong <cyd@stupidchicken.com>
parents: 100383
diff changeset
821 `x-open-connection' on a tty won't create an image cache. */
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91900
diff changeset
822 if (FRAME_IMAGE_CACHE (f) == NULL)
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91900
diff changeset
823 FRAME_IMAGE_CACHE (f) = make_image_cache ();
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91900
diff changeset
824 ++FRAME_IMAGE_CACHE (f)->refcount;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
825 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
826 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
827
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
828 /* Realize basic faces. Must have enough information in frame
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
829 parameters to realize basic faces at this point. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
830 #ifdef HAVE_X_WINDOWS
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
831 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
832 #endif
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
833 #ifdef WINDOWSNT
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
834 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
835 #endif
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
836 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
837 if (!FRAME_NS_P (f) || FRAME_NS_WINDOW (f))
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
838 #endif
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
839 if (!realize_basic_faces (f))
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
840 abort ();
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
841 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
842
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
843
100666
dab9cf44bf3f In comments, write delete_frame instead of Fdelete_frame.
Martin Rudalics <rudalics@gmx.at>
parents: 100398
diff changeset
844 /* Free face cache of frame F. Called from delete_frame. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
845
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
846 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
847 free_frame_faces (struct frame *f)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
848 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
849 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
850
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
851 if (face_cache)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
852 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
853 free_face_cache (face_cache);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
854 FRAME_FACE_CACHE (f) = NULL;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
855 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
856
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
857 #ifdef HAVE_WINDOW_SYSTEM
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
858 if (FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
859 {
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91900
diff changeset
860 struct image_cache *image_cache = FRAME_IMAGE_CACHE (f);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
861 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
862 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
863 --image_cache->refcount;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
864 if (image_cache->refcount == 0)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
865 free_image_cache (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
866 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
867 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
868 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
869 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
870
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
871
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
872 /* 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
873 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
874 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
875 of named faces. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
876
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
877 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
878 recompute_basic_faces (struct frame *f)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
879 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
880 if (FRAME_FACE_CACHE (f))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
881 {
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
882 clear_face_cache (0);
26601
e23e3120d84f (set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 26594
diff changeset
883 if (!realize_basic_faces (f))
e23e3120d84f (set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 26594
diff changeset
884 abort ();
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
885 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
886 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
887
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
888
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
889 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
890 try to free unused fonts, too. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
891
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
892 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
893 clear_face_cache (int clear_fonts_p)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
894 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
895 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
896 Lisp_Object tail, frame;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
897 struct frame *f;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
898
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
899 if (clear_fonts_p
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
900 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
901 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
902 #if 0
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
903 /* Not yet implemented. */
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
904 clear_font_cache (frame);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
905 #endif
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
906
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
907 /* From time to time see if we can unload some fonts. This also
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
908 frees all realized faces on all frames. Fonts needed by
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
909 faces will be loaded again when faces are realized again. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
910 clear_font_table_count = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
911
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
912 FOR_EACH_FRAME (tail, frame)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
913 {
38434
86a4e78aeae0 (clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents: 38346
diff changeset
914 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
915 if (FRAME_WINDOW_P (f)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
916 && 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
917 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
918 }
8e610355cb29 Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents: 9326
diff changeset
919 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
920 else
13460
5513606156bc (unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
921 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
922 /* Clear GCs of realized faces. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
923 FOR_EACH_FRAME (tail, frame)
13460
5513606156bc (unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
924 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
925 f = XFRAME (frame);
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
926 if (FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
927 clear_face_gcs (FRAME_FACE_CACHE (f));
13460
5513606156bc (unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
928 }
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92109
diff changeset
929 clear_image_caches (Qnil);
13460
5513606156bc (unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
930 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
931 #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
932 }
139740855fa6 * xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents: 2538
diff changeset
933
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
934
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
935 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
936 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
937 Optional THOROUGHLY non-nil means try to free unused fonts, too. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
938 (Lisp_Object thoroughly)
35843
c032770ba567 (Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents: 35443
diff changeset
939 {
c032770ba567 (Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents: 35443
diff changeset
940 clear_face_cache (!NILP (thoroughly));
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
941 ++face_change_count;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
942 ++windows_or_buffers_changed;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
943 return Qnil;
2730
139740855fa6 * xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents: 2538
diff changeset
944 }
139740855fa6 * xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents: 2538
diff changeset
945
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
946
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
947 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
948 X Pixmaps
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
949 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
950
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
951 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
952
25890
b10a34d40b55 (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25883
diff changeset
953 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
954 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
955 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
956 \(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
957 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
958 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
959 \(WIDTH + 7)/8 bytes. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
960 (Lisp_Object object)
9564
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
961 {
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
962 int pixmap_p = 0;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
963
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
964 if (STRINGP (object))
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
965 /* 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
966 pixmap_p = 1;
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
967 else if (CONSP (object))
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
968 {
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
969 /* 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
970 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
971 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
972 Lisp_Object width, height, data;
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
973
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
974 height = width = data = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
975
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
976 if (CONSP (object))
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
977 {
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
978 width = XCAR (object);
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
979 object = XCDR (object);
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
980 if (CONSP (object))
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
981 {
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
982 height = XCAR (object);
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
983 object = XCDR (object);
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
984 if (CONSP (object))
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
985 data = XCAR (object);
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
986 }
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
987 }
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
988
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
989 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data))
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
990 {
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
991 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
992 / 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
993 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
994 pixmap_p = 1;
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
995 }
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
996 }
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
997
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
998 return pixmap_p ? Qt : Qnil;
9564
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
999 }
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1000
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1001
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1002 /* Load a bitmap according to NAME (which is either a file name or a
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1003 pixmap spec) for use on frame F. Value is the bitmap_id (see
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1004 xfns.c). If NAME is nil, return with a bitmap id of zero. If
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1005 bitmap cannot be loaded, display a message saying so, and return
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1006 zero. Store the bitmap width in *W_PTR and its height in *H_PTR,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1007 if these pointers are not null. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1008
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1009 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1010 load_pixmap (FRAME_PTR f, Lisp_Object name, unsigned int *w_ptr, unsigned int *h_ptr)
9564
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1011 {
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1012 int bitmap_id;
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1013
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1014 if (NILP (name))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1015 return 0;
9564
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1016
71845
085d9056841a (load_pixmap): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents: 71576
diff changeset
1017 CHECK_TYPE (!NILP (Fbitmap_spec_p (name)), Qbitmap_spec_p, name);
9564
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1018
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1019 BLOCK_INPUT;
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1020 if (CONSP (name))
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1021 {
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1022 /* Decode a bitmap spec into a bitmap. */
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1023
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1024 int h, w;
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1025 Lisp_Object bits;
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1026
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1027 w = XINT (Fcar (name));
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1028 h = XINT (Fcar (Fcdr (name)));
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1029 bits = Fcar (Fcdr (Fcdr (name)));
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1030
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1031 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
1032 w, h);
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1033 }
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1034 else
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1035 {
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1036 /* 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
1037 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
1038 }
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1039 UNBLOCK_INPUT;
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1040
9902
32ed712a45a3 (load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 9671
diff changeset
1041 if (bitmap_id < 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1042 {
72446
44f03dd44abf (load_pixmap): Add quotes in error message.
Richard M. Stallman <rms@gnu.org>
parents: 72170
diff changeset
1043 add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1044 bitmap_id = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1045
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1046 if (w_ptr)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1047 *w_ptr = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1048 if (h_ptr)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1049 *h_ptr = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1050 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1051 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1052 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1053 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1054 ++npixmaps_allocated;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1055 #endif
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1056 if (w_ptr)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1057 *w_ptr = x_bitmap_width (f, bitmap_id);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1058
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1059 if (h_ptr)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1060 *h_ptr = x_bitmap_height (f, bitmap_id);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1061 }
9564
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1062
1bfb920ab23e (intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents: 9529
diff changeset
1063 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
1064 }
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
1065
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1066 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1067
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9566
diff changeset
1068
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1070 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1071 X Colors
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1072 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1073
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1074 /* 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
1075 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
1076 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
1077
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1078 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1079 parse_rgb_list (Lisp_Object rgb_list, XColor *color)
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1080 {
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1081 #define PARSE_RGB_LIST_FIELD(field) \
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1082 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
1083 { \
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1084 color->field = XINT (XCAR (rgb_list)); \
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1085 rgb_list = XCDR (rgb_list); \
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1086 } \
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1087 else \
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1088 return 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1089
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1090 PARSE_RGB_LIST_FIELD (red);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1091 PARSE_RGB_LIST_FIELD (green);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1092 PARSE_RGB_LIST_FIELD (blue);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1093
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1094 return 1;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1095 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1096
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1097
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1098 /* 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
1099 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
1100 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
1101 returned in it. */
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1102
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1103 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1104 tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color, XColor *std_color)
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1105 {
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1106 Lisp_Object frame, color_desc;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1107
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1108 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
1109 return 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1110
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1111 XSETFRAME (frame, f);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1112
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1113 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
1114 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
1115 {
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1116 Lisp_Object rgb;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1117
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1118 if (! INTEGERP (XCAR (XCDR (color_desc))))
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1119 return 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1120
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1121 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
1122
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1123 rgb = XCDR (XCDR (color_desc));
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1124 if (! parse_rgb_list (rgb, tty_color))
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1125 return 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1126
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1127 /* Should we fill in STD_COLOR too? */
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1128 if (std_color)
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1129 {
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1130 /* 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
1131 *std_color = *tty_color;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1132
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1133 /* 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
1134 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
1135 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
1136 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
1137 if ((!STRINGP (XCAR (color_desc))
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1138 || 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
1139 && !NILP (Ffboundp (Qtty_color_standard_values)))
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1140 {
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1141 /* Look up STD_COLOR separately. */
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1142 rgb = call1 (Qtty_color_standard_values, color);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1143 if (! parse_rgb_list (rgb, std_color))
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1144 return 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1145 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1146 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1147
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1148 return 1;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1149 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1150 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
1151 /* 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
1152 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
1153 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
1154 load color" messages in the *Messages* buffer. */
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1155 return 1;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1156 else
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1157 /* 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
1158 return 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1159 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1160
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1161 /* 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
1162
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1163 int
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109494
diff changeset
1164 tty_defined_color (struct frame *f, const char *color_name,
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109494
diff changeset
1165 XColor *color_def, int alloc)
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1166 {
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1167 int status = 1;
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1168
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1169 /* Defaults. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48384
diff changeset
1170 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
1171 color_def->red = 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1172 color_def->blue = 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1173 color_def->green = 0;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1174
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1175 if (*color_name)
89554
15da46f6f0ac (face_numeric_value): Declare dim size_t.
Dave Love <fx@gnu.org>
parents: 89483
diff changeset
1176 status = tty_lookup_color (f, build_string (color_name), color_def, NULL);
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1177
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1178 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
1179 {
264b83a3a688 Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents: 26875
diff changeset
1180 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
1181 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
1182 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
1183 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
1184 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1185
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
1186 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
1187 status = 1;
2e020ab026b8 (tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents: 27695
diff changeset
1188
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1189 return status;
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1190 }
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1191
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1192
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1193 /* 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
1194 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
1195 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
1196
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1197 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
1198
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1199 int
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109494
diff changeset
1200 defined_color (struct frame *f, const char *color_name, XColor *color_def, int alloc)
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1201 {
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1202 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
1203 return tty_defined_color (f, color_name, color_def, alloc);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1204 #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
1205 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
1206 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
1207 #endif
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1208 #ifdef WINDOWSNT
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1209 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
1210 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
1211 #endif
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
1212 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
1213 else if (FRAME_NS_P (f))
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
1214 return ns_defined_color (f, color_name, color_def, alloc, 1);
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
1215 #endif
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1216 else
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1217 abort ();
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1218 }
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1219
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1220
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1221 /* 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
1222 Lisp string. */
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1223
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1224 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1225 tty_color_name (struct frame *f, int idx)
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1226 {
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1227 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
1228 {
27088
23bd823f11f4 (tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents: 26976
diff changeset
1229 Lisp_Object frame;
23bd823f11f4 (tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents: 26976
diff changeset
1230 Lisp_Object coldesc;
23bd823f11f4 (tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents: 26976
diff changeset
1231
23bd823f11f4 (tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents: 26976
diff changeset
1232 XSETFRAME (frame, f);
23bd823f11f4 (tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents: 26976
diff changeset
1233 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
1234
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1235 if (!NILP (coldesc))
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1236 return XCAR (coldesc);
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1237 }
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1238 #ifdef MSDOS
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1239 /* 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
1240 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
1241 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
1242 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
1243 #endif
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1244
27114
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
1245 if (idx == FACE_TTY_DEFAULT_FG_COLOR)
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
1246 return build_string (unspecified_fg);
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
1247 if (idx == FACE_TTY_DEFAULT_BG_COLOR)
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
1248 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
1249
27114
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
1250 return Qunspecified;
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1251 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1252
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1253
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1254 /* Return non-zero if COLOR_NAME is a shade of gray (or white or
65781
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1255 black) on frame F.
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1256
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1257 The criterion implemented here is not a terribly sophisticated one. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1258
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1259 static int
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109494
diff changeset
1260 face_color_gray_p (struct frame *f, const char *color_name)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1261 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1262 XColor color;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1263 int gray_p;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1264
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1265 if (defined_color (f, color_name, &color, 0))
65781
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1266 gray_p = (/* Any color sufficiently close to black counts as grey. */
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1267 (color.red < 5000 && color.green < 5000 && color.blue < 5000)
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1268 ||
85262
77d6e76160a6 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85114
diff changeset
1269 ((eabs (color.red - color.green)
65781
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1270 < max (color.red, color.green) / 20)
85262
77d6e76160a6 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85114
diff changeset
1271 && (eabs (color.green - color.blue)
65781
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1272 < max (color.green, color.blue) / 20)
85262
77d6e76160a6 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85114
diff changeset
1273 && (eabs (color.blue - color.red)
65781
d9e5cd5bce05 (face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents: 65713
diff changeset
1274 < max (color.blue, color.red) / 20)));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1275 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1276 gray_p = 0;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1277
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1278 return gray_p;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1279 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1280
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1281
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1282 /* Return non-zero if color COLOR_NAME can be displayed on frame F.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1283 BACKGROUND_P non-zero means the color will be used as background
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1284 color. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1285
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1286 static int
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109494
diff changeset
1287 face_color_supported_p (struct frame *f, const char *color_name, int background_p)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1288 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1289 Lisp_Object frame;
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1290 XColor not_used;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1291
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1292 XSETFRAME (frame, f);
54766
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1293 return
59924
3590dd3050ba (face_color_supported_p): Use HAVE_WINDOW_SYSTEM
Eli Zaretskii <eliz@gnu.org>
parents: 59905
diff changeset
1294 #ifdef HAVE_WINDOW_SYSTEM
54766
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1295 FRAME_WINDOW_P (f)
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1296 ? (!NILP (Fxw_display_color_p (frame))
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
1297 || xstrcasecmp (color_name, "black") == 0
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
1298 || xstrcasecmp (color_name, "white") == 0
54766
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1299 || (background_p
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1300 && face_color_gray_p (f, color_name))
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1301 || (!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
1302 && 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
1303 :
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1304 #endif
b87089cc7e4c (face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53901
diff changeset
1305 tty_defined_color (f, color_name, &not_used, 0);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1306 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1307
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1308
27100
9a0d8503806e (Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents: 27088
diff changeset
1309 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
1310 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
1311 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
1312 If FRAME is nil or omitted, use the selected frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1313 (Lisp_Object color, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1314 {
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1315 struct frame *f;
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1316
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
1317 CHECK_STRING (color);
53267
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1318 if (NILP (frame))
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1319 frame = selected_frame;
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1320 else
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1321 CHECK_FRAME (frame);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1322 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
1323 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1324 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1325
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1326
27100
9a0d8503806e (Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents: 27088
diff changeset
1327 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
1328 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
1329 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
1330 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
1331 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
1332 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
1333 COLOR must be a valid color name. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1334 (Lisp_Object color, Lisp_Object frame, Lisp_Object background_p)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1335 {
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1336 struct frame *f;
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1337
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
1338 CHECK_STRING (color);
53267
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1339 if (NILP (frame))
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1340 frame = selected_frame;
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1341 else
bec1d17789a6 (Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
1342 CHECK_FRAME (frame);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1343 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
1344 if (face_color_supported_p (f, SDATA (color), !NILP (background_p)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1345 return Qt;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1346 return Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1347 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1348
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1349
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1350 /* Load color with name NAME for use by face FACE on frame F.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1351 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1352 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1353 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1354 pixel color. If color cannot be loaded, display a message, and
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1355 return the foreground, background or underline color of F, but
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1356 record that fact in flags of the face so that we don't try to free
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1357 these colors. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1358
25114
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
1359 unsigned long
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1360 load_color (struct frame *f, struct face *face, Lisp_Object name, enum lface_attribute_index target_index)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1361 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1362 XColor color;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1363
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1364 xassert (STRINGP (name));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1365 xassert (target_index == LFACE_FOREGROUND_INDEX
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1366 || target_index == LFACE_BACKGROUND_INDEX
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1367 || target_index == LFACE_UNDERLINE_INDEX
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1368 || target_index == LFACE_OVERLINE_INDEX
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1369 || target_index == LFACE_STRIKE_THROUGH_INDEX
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1370 || target_index == LFACE_BOX_INDEX);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1371
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1372 /* if the color map is full, defined_color will return a best match
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1373 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
1374 if (!defined_color (f, SDATA (name), &color, 1))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1375 {
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
1376 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
1377
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1378 switch (target_index)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1379 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1380 case LFACE_FOREGROUND_INDEX:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1381 face->foreground_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1382 color.pixel = FRAME_FOREGROUND_PIXEL (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1383 break;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1384
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1385 case LFACE_BACKGROUND_INDEX:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1386 face->background_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1387 color.pixel = FRAME_BACKGROUND_PIXEL (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1388 break;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1389
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1390 case LFACE_UNDERLINE_INDEX:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1391 face->underline_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1392 color.pixel = FRAME_FOREGROUND_PIXEL (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1393 break;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1394
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1395 case LFACE_OVERLINE_INDEX:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1396 face->overline_color_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1397 color.pixel = FRAME_FOREGROUND_PIXEL (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1398 break;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1399
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1400 case LFACE_STRIKE_THROUGH_INDEX:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1401 face->strike_through_color_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1402 color.pixel = FRAME_FOREGROUND_PIXEL (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1403 break;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1404
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1405 case LFACE_BOX_INDEX:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1406 face->box_color_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1407 color.pixel = FRAME_FOREGROUND_PIXEL (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1408 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1409
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1410 default:
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1411 abort ();
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1412 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1413 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1414 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1415 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1416 ++ncolors_allocated;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1417 #endif
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1418
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1419 return color.pixel;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1420 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1421
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1422
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1423 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1424
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1425 /* Load colors for face FACE which is used on frame F. Colors are
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1426 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1427 of ATTRS. If the background color specified is not supported on F,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1428 try to emulate gray colors with a stipple from Vface_default_stipple. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1429
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1430 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1431 load_face_colors (struct frame *f, struct face *face, Lisp_Object *attrs)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1432 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1433 Lisp_Object fg, bg;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1434
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1435 bg = attrs[LFACE_BACKGROUND_INDEX];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1436 fg = attrs[LFACE_FOREGROUND_INDEX];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1437
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1438 /* Swap colors if face is inverse-video. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1439 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1440 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1441 Lisp_Object tmp;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1442 tmp = fg;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1443 fg = bg;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1444 bg = tmp;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1445 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1446
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1447 /* Check for support for foreground, not for background because
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1448 face_color_supported_p is smart enough to know that grays are
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1449 "supported" as background because we are supposed to use stipple
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1450 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
1451 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
1452 && !NILP (Fbitmap_spec_p (Vface_default_stipple)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1453 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1454 x_destroy_bitmap (f, face->stipple);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1455 face->stipple = load_pixmap (f, Vface_default_stipple,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1456 &face->pixmap_w, &face->pixmap_h);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1457 }
25092
79a5a567bdb0 (prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25062
diff changeset
1458
79a5a567bdb0 (prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25062
diff changeset
1459 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1460 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1461 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1462
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1463
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1464 /* Free color PIXEL on frame F. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1465
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1466 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1467 unload_color (struct frame *f, long unsigned int pixel)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1468 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1469 #ifdef HAVE_X_WINDOWS
38346
a86234ceb517 (unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents: 37798
diff changeset
1470 if (pixel != -1)
a86234ceb517 (unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents: 37798
diff changeset
1471 {
a86234ceb517 (unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents: 37798
diff changeset
1472 BLOCK_INPUT;
a86234ceb517 (unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents: 37798
diff changeset
1473 x_free_colors (f, &pixel, 1);
a86234ceb517 (unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents: 37798
diff changeset
1474 UNBLOCK_INPUT;
a86234ceb517 (unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents: 37798
diff changeset
1475 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1476 #endif
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1477 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1478
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1479
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1480 /* Free colors allocated for FACE. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1481
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1482 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1483 free_face_colors (struct frame *f, struct face *face)
3074
96b4623fdeb3 * xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents: 3065
diff changeset
1484 {
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
1485 /* PENDING(NS): need to do something here? */
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1486 #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
1487 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
1488 return;
dfc4450c2329 (realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents: 40532
diff changeset
1489
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1490 BLOCK_INPUT;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1491
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1492 if (!face->foreground_defaulted_p)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1493 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1494 x_free_colors (f, &face->foreground, 1);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1495 IF_DEBUG (--ncolors_allocated);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1496 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1497
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1498 if (!face->background_defaulted_p)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1499 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1500 x_free_colors (f, &face->background, 1);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1501 IF_DEBUG (--ncolors_allocated);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1502 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1503
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1504 if (face->underline_p
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1505 && !face->underline_defaulted_p)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1506 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1507 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
1508 IF_DEBUG (--ncolors_allocated);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1509 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1510
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1511 if (face->overline_p
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1512 && !face->overline_color_defaulted_p)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1513 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1514 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
1515 IF_DEBUG (--ncolors_allocated);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1516 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1517
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1518 if (face->strike_through_p
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1519 && !face->strike_through_color_defaulted_p)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1520 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1521 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
1522 IF_DEBUG (--ncolors_allocated);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1523 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1524
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1525 if (face->box != FACE_NO_BOX
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1526 && !face->box_color_defaulted_p)
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1527 {
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1528 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
1529 IF_DEBUG (--ncolors_allocated);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1530 }
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1531
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1532 UNBLOCK_INPUT;
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1533 #endif /* HAVE_X_WINDOWS */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1534 }
29599
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
1535
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1536 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1537
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1538
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1539
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1540 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1541 XLFD Font Names
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1542 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1543
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1544 /* An enumerator for each field of an XLFD font name. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1545
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1546 enum xlfd_field
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1547 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1548 XLFD_FOUNDRY,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1549 XLFD_FAMILY,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1550 XLFD_WEIGHT,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1551 XLFD_SLANT,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1552 XLFD_SWIDTH,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1553 XLFD_ADSTYLE,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1554 XLFD_PIXEL_SIZE,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1555 XLFD_POINT_SIZE,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1556 XLFD_RESX,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1557 XLFD_RESY,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1558 XLFD_SPACING,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1559 XLFD_AVGWIDTH,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1560 XLFD_REGISTRY,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1561 XLFD_ENCODING,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1562 XLFD_LAST
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1563 };
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1564
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1565 /* An enumerator for each possible slant value of a font. Taken from
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1566 the XLFD specification. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1567
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1568 enum xlfd_slant
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1569 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1570 XLFD_SLANT_UNKNOWN,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1571 XLFD_SLANT_ROMAN,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1572 XLFD_SLANT_ITALIC,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1573 XLFD_SLANT_OBLIQUE,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1574 XLFD_SLANT_REVERSE_ITALIC,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1575 XLFD_SLANT_REVERSE_OBLIQUE,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1576 XLFD_SLANT_OTHER
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1577 };
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1578
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1579 /* Relative font weight according to XLFD documentation. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1580
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1581 enum xlfd_weight
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1582 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1583 XLFD_WEIGHT_UNKNOWN,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1584 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1585 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1586 XLFD_WEIGHT_LIGHT, /* 30 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1587 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1588 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1589 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1590 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1591 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1592 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1593 };
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1594
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1595 /* Relative proportionate width. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1596
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1597 enum xlfd_swidth
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1598 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1599 XLFD_SWIDTH_UNKNOWN,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1600 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1601 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1602 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1603 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1604 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1605 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1606 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1607 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1608 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1609 };
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1610
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1611 /* Order by which font selection chooses fonts. The default values
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1612 mean `first, find a best match for the font width, then for the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1613 font height, then for weight, then for slant.' This variable can be
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1614 set via set-face-font-sort-order. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1615
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1616 static int font_sort_order[4];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1617
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1618 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1619
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1620 static enum font_property_index font_props_for_sorting[FONT_SIZE_INDEX];
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1621
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1622 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
1623 compare_fonts_by_sort_order (const void *v1, const void *v2)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1624 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1625 Lisp_Object font1 = *(Lisp_Object *) v1;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1626 Lisp_Object font2 = *(Lisp_Object *) v2;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1627 int i;
95375
e743691cff9c (Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 95373
diff changeset
1628
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1629 for (i = 0; i < FONT_SIZE_INDEX; i++)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1630 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1631 enum font_property_index idx = font_props_for_sorting[i];
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1632 Lisp_Object val1 = AREF (font1, idx), val2 = AREF (font2, idx);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1633 int result;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1634
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1635 if (idx <= FONT_REGISTRY_INDEX)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1636 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1637 if (STRINGP (val1))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1638 result = STRINGP (val2) ? strcmp (SDATA (val1), SDATA (val2)) : -1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1639 else
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1640 result = STRINGP (val2) ? 1 : 0;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1641 }
35369
aca9ba55cfcc (x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents: 35228
diff changeset
1642 else
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1643 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1644 if (INTEGERP (val1))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1645 result = INTEGERP (val2) ? XINT (val1) - XINT (val2) : -1;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1646 else
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1647 result = INTEGERP (val2) ? 1 : 0;
53354
605475ba45e3 (face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents: 53334
diff changeset
1648 }
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1649 if (result)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1650 return result;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1651 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1652 return 0;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1653 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1654
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
1655 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
1656 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
1657 If FAMILY is omitted or nil, list all families.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1658 Otherwise, FAMILY must be a string, possibly containing wildcards
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1659 `?' and `*'.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1660 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
1661 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
1662 SLANT FIXED-P FULL REGISTRY-AND-ENCODING].
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1663 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
1664 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
1665 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
1666 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
1667 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
1668 giving the registry and encoding of the font.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1669 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
1670 the face font sort order. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1671 (Lisp_Object family, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1672 {
106434
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1673 Lisp_Object font_spec, list, *drivers, vec;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1674 int i, nfonts, ndrivers;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1675 Lisp_Object result;
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
1676
95377
0c4bba8ae9f2 (Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents: 95375
diff changeset
1677 if (NILP (frame))
0c4bba8ae9f2 (Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents: 95375
diff changeset
1678 frame = selected_frame;
0c4bba8ae9f2 (Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents: 95375
diff changeset
1679 CHECK_LIVE_FRAME (frame);
0c4bba8ae9f2 (Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents: 95375
diff changeset
1680
0c4bba8ae9f2 (Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents: 95375
diff changeset
1681 font_spec = Ffont_spec (0, NULL);
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
1682 if (!NILP (family))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1683 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1684 CHECK_STRING (family);
95574
fa7d768bdd0b (Fx_family_fonts): Use font_parse_family_registry instead of
Kenichi Handa <handa@m17n.org>
parents: 95567
diff changeset
1685 font_parse_family_registry (family, Qnil, font_spec);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1686 }
106434
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1687
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1688 list = font_list_entities (frame, font_spec);
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1689 if (NILP (list))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1690 return Qnil;
106434
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1691
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1692 /* Sort the font entities. */
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1693 for (i = 0; i < 4; i++)
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1694 switch (font_sort_order[i])
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1695 {
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1696 case XLFD_SWIDTH:
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1697 font_props_for_sorting[i] = FONT_WIDTH_INDEX; break;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1698 case XLFD_POINT_SIZE:
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1699 font_props_for_sorting[i] = FONT_SIZE_INDEX; break;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1700 case XLFD_WEIGHT:
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1701 font_props_for_sorting[i] = FONT_WEIGHT_INDEX; break;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1702 default:
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1703 font_props_for_sorting[i] = FONT_SLANT_INDEX; break;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1704 }
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1705 font_props_for_sorting[i++] = FONT_FAMILY_INDEX;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1706 font_props_for_sorting[i++] = FONT_FOUNDRY_INDEX;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1707 font_props_for_sorting[i++] = FONT_ADSTYLE_INDEX;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1708 font_props_for_sorting[i++] = FONT_REGISTRY_INDEX;
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1709
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1710 ndrivers = XINT (Flength (list));
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1711 drivers = alloca (sizeof (Lisp_Object) * ndrivers);
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1712 for (i = 0; i < ndrivers; i++, list = XCDR (list))
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1713 drivers[i] = XCAR (list);
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1714 vec = Fvconcat (ndrivers, drivers);
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1715 nfonts = ASIZE (vec);
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1716
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1717 qsort (XVECTOR (vec)->contents, nfonts, sizeof (Lisp_Object),
de4084d806f6 * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents: 105942
diff changeset
1718 compare_fonts_by_sort_order);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1719
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1720 result = Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1721 for (i = nfonts - 1; i >= 0; --i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1722 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1723 Lisp_Object font = AREF (vec, i);
25270
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
1724 Lisp_Object v = Fmake_vector (make_number (8), Qnil);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1725 int point;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1726 Lisp_Object spacing;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1727
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1728 ASET (v, 0, AREF (font, FONT_FAMILY_INDEX));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1729 ASET (v, 1, FONT_WIDTH_SYMBOLIC (font));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1730 point = PIXEL_TO_POINT (XINT (AREF (font, FONT_SIZE_INDEX)) * 10,
95377
0c4bba8ae9f2 (Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents: 95375
diff changeset
1731 XFRAME (frame)->resy);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1732 ASET (v, 2, make_number (point));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1733 ASET (v, 3, FONT_WEIGHT_SYMBOLIC (font));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1734 ASET (v, 4, FONT_SLANT_SYMBOLIC (font));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1735 spacing = Ffont_get (font, QCspacing);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1736 ASET (v, 5, (NILP (spacing) || EQ (spacing, Qp)) ? Qnil : Qt);
95377
0c4bba8ae9f2 (Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents: 95375
diff changeset
1737 ASET (v, 6, Ffont_xlfd_name (font, Qnil));
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1738 ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX));
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1739
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1740 result = Fcons (v, result);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1741 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1742
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1743 return result;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1744 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1745
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1746 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
1747 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
1748 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
1749 the same size as FACE on FRAME.
101292
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
1750
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
1751 PATTERN should be a string containing a font name in the XLFD,
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
1752 Fontconfig, or GTK format. A font name given in the XLFD format may
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
1753 contain wildcard characters:
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1754 the * character matches any substring, and
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1755 the ? character matches any single character.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1756 PATTERN is case-insensitive.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1757
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1758 The return value is a list of strings, suitable as arguments to
95375
e743691cff9c (Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 95373
diff changeset
1759 `set-face-font'.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1760
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1761 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
1762 even if they match PATTERN and FACE.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1763 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
1764 fonts to match. The first MAXIMUM fonts are reported.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
1765 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
1766 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
1767 the WIDTH times as wide as FACE on FRAME. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1768 (Lisp_Object pattern, Lisp_Object face, Lisp_Object frame, Lisp_Object maximum, Lisp_Object width)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1769 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1770 struct frame *f;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1771 int size, avgwidth;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1772
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1773 check_x ();
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
1774 CHECK_STRING (pattern);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1775
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1776 if (! NILP (maximum))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1777 CHECK_NATNUM (maximum);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1778
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1779 if (!NILP (width))
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
1780 CHECK_NUMBER (width);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1781
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1782 /* We can't simply call check_x_frame because this function may be
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1783 called before any frame is created. */
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1784 if (NILP (frame))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1785 frame = selected_frame;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1786 f = frame_or_selected_frame (frame, 2);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1787 if (! FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1788 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1789 /* Perhaps we have not yet created any frame. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1790 f = NULL;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1791 frame = Qnil;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1792 face = Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1793 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1794
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1795 /* Determine the width standard for comparison with the fonts we find. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1796
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1797 if (NILP (face))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1798 size = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1799 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1800 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1801 /* This is of limited utility since it works with character
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1802 widths. Keep it for compatibility. --gerd. */
90054
f2ebccfa87d4 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
parents: 90044 58439
diff changeset
1803 int face_id = lookup_named_face (f, face, 0);
33275
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
1804 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
1805 ? NULL
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
1806 : 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
1807
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
1808 if (face && face->font)
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1809 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1810 size = face->font->pixel_size;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1811 avgwidth = face->font->average_width;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1812 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1813 else
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1814 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1815 size = FRAME_FONT (f)->pixel_size;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1816 avgwidth = FRAME_FONT (f)->average_width;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1817 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1818 if (!NILP (width))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1819 avgwidth *= XINT (width);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1820 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1821
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1822 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1823 Lisp_Object font_spec;
95373
4ab9c6d31251 (Fx_list_fonts): Make it return a list of font names.
Kenichi Handa <handa@m17n.org>
parents: 95294
diff changeset
1824 Lisp_Object args[2], tail;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1825
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1826 font_spec = font_spec_from_name (pattern);
101292
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
1827 if (!FONTP (font_spec))
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
1828 signal_error ("Invalid font name", pattern);
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
1829
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1830 if (size)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1831 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1832 Ffont_put (font_spec, QCsize, make_number (size));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1833 Ffont_put (font_spec, QCavgwidth, make_number (avgwidth));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1834 }
96263
9775da34ea47 (Fx_list_fonts): Call Flist_fonts with the arg PREFER.
Kenichi Handa <handa@m17n.org>
parents: 96027
diff changeset
1835 args[0] = Flist_fonts (font_spec, frame, maximum, font_spec);
95373
4ab9c6d31251 (Fx_list_fonts): Make it return a list of font names.
Kenichi Handa <handa@m17n.org>
parents: 95294
diff changeset
1836 for (tail = args[0]; CONSP (tail); tail = XCDR (tail))
103054
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1837 {
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1838 Lisp_Object font_entity;
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1839
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1840 font_entity = XCAR (tail);
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1841 if ((NILP (AREF (font_entity, FONT_SIZE_INDEX))
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1842 || XINT (AREF (font_entity, FONT_SIZE_INDEX)) == 0)
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1843 && ! NILP (AREF (font_spec, FONT_SIZE_INDEX)))
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1844 {
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1845 /* This is a scalable font. For backward compatibility,
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1846 we set the specified size. */
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1847 font_entity = Fcopy_font_spec (font_entity);
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1848 ASET (font_entity, FONT_SIZE_INDEX,
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1849 AREF (font_spec, FONT_SIZE_INDEX));
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1850 }
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1851 XSETCAR (tail, Ffont_xlfd_name (font_entity, Qnil));
c98dbbb65bad (Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents: 102989
diff changeset
1852 }
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1853 if (NILP (frame))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1854 /* We don't have to check fontsets. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1855 return args[0];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1856 args[1] = list_fontsets (f, pattern, size);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1857 return Fnconc (2, args);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1858 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1859 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1860
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
1861 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1862
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1863
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1864 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1865 Lisp Faces
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1866 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1867
35913
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
1868 /* 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
1869
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
1870 #define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX)
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
1871 #define LFACE_FOUNDRY(LFACE) AREF ((LFACE), LFACE_FOUNDRY_INDEX)
35913
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
1872 #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
1873 #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
1874 #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
1875 #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
1876 #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
1877 #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
1878 #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
1879 #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
1880 #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
1881 #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
1882 #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
1883 #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
1884 #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
1885 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX)
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
1886 #define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1887
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1888 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1889 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1890
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1891 #define LFACEP(LFACE) \
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1892 (VECTORP (LFACE) \
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1893 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \
35913
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
1894 && EQ (AREF (LFACE, 0), Qface))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1895
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
1896
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1897 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1898
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1899 /* Check consistency of Lisp face attribute vector ATTRS. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1900
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1901 static void
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1902 check_lface_attrs (attrs)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1903 Lisp_Object *attrs;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1904 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1905 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1906 || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1907 || STRINGP (attrs[LFACE_FAMILY_INDEX]));
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
1908 xassert (UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX])
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
1909 || IGNORE_DEFFACE_P (attrs[LFACE_FOUNDRY_INDEX])
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
1910 || STRINGP (attrs[LFACE_FOUNDRY_INDEX]));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1911 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1912 || IGNORE_DEFFACE_P (attrs[LFACE_SWIDTH_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1913 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1914 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1915 || IGNORE_DEFFACE_P (attrs[LFACE_HEIGHT_INDEX])
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
1916 || INTEGERP (attrs[LFACE_HEIGHT_INDEX])
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
1917 || FLOATP (attrs[LFACE_HEIGHT_INDEX])
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
1918 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX]));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1919 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1920 || IGNORE_DEFFACE_P (attrs[LFACE_WEIGHT_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1921 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1922 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1923 || IGNORE_DEFFACE_P (attrs[LFACE_SLANT_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1924 || SYMBOLP (attrs[LFACE_SLANT_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1925 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1926 || IGNORE_DEFFACE_P (attrs[LFACE_UNDERLINE_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1927 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1928 || STRINGP (attrs[LFACE_UNDERLINE_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1929 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1930 || IGNORE_DEFFACE_P (attrs[LFACE_OVERLINE_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1931 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1932 || STRINGP (attrs[LFACE_OVERLINE_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1933 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1934 || IGNORE_DEFFACE_P (attrs[LFACE_STRIKE_THROUGH_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1935 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1936 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1937 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1938 || IGNORE_DEFFACE_P (attrs[LFACE_BOX_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1939 || SYMBOLP (attrs[LFACE_BOX_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1940 || STRINGP (attrs[LFACE_BOX_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1941 || INTEGERP (attrs[LFACE_BOX_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1942 || CONSP (attrs[LFACE_BOX_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1943 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1944 || IGNORE_DEFFACE_P (attrs[LFACE_INVERSE_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1945 || SYMBOLP (attrs[LFACE_INVERSE_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1946 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1947 || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1948 || STRINGP (attrs[LFACE_FOREGROUND_INDEX]));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1949 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1950 || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1951 || STRINGP (attrs[LFACE_BACKGROUND_INDEX]));
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
1952 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1953 || IGNORE_DEFFACE_P (attrs[LFACE_INHERIT_INDEX])
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
1954 || NILP (attrs[LFACE_INHERIT_INDEX])
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
1955 || SYMBOLP (attrs[LFACE_INHERIT_INDEX])
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
1956 || CONSP (attrs[LFACE_INHERIT_INDEX]));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1957 #ifdef HAVE_WINDOW_SYSTEM
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1958 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1959 || IGNORE_DEFFACE_P (attrs[LFACE_STIPPLE_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1960 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX])
25890
b10a34d40b55 (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25883
diff changeset
1961 || !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
1962 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX])
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
1963 || IGNORE_DEFFACE_P (attrs[LFACE_FONT_INDEX])
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
1964 || FONTP (attrs[LFACE_FONT_INDEX]));
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
1965 xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX])
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
1966 || STRINGP (attrs[LFACE_FONTSET_INDEX]));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1967 #endif
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1968 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1969
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1970
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1971 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1972
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1973 static void
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1974 check_lface (lface)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1975 Lisp_Object lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1976 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1977 if (!NILP (lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1978 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1979 xassert (LFACEP (lface));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1980 check_lface_attrs (XVECTOR (lface)->contents);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1981 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1982 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1983
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1984 #else /* GLYPH_DEBUG == 0 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1985
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1986 #define check_lface_attrs(attrs) (void) 0
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1987 #define check_lface(lface) (void) 0
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1988
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1989 #endif /* GLYPH_DEBUG == 0 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1990
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
1991
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
1992
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
1993 /* 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
1994
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
1995 enum named_merge_point_kind
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
1996 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
1997 NAMED_MERGE_POINT_NORMAL,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
1998 NAMED_MERGE_POINT_REMAP
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
1999 };
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2000
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2001 /* 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
2002 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
2003 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
2004 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
2005 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
2006 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
2007 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
2008 {
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2009 Lisp_Object face_name;
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2010 enum named_merge_point_kind named_merge_point_kind;
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2011 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
2012 };
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2013
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2014
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2015 /* 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
2016 otherwise add NEW_NAMED_MERGE_POINT, which is initialized using
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2017 FACE_NAME and NAMED_MERGE_POINT_KIND, as the head of the linked list
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2018 pointed to by NAMED_MERGE_POINTS, and return 1. */
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2019
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2020 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
2021 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
2022 Lisp_Object face_name,
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2023 enum named_merge_point_kind named_merge_point_kind,
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2024 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
2025 {
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2026 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
2027
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2028 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
2029 if (EQ (face_name, prev->face_name))
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2030 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2031 if (prev->named_merge_point_kind == named_merge_point_kind)
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2032 /* A cycle, so fail. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2033 return 0;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2034 else if (prev->named_merge_point_kind == NAMED_MERGE_POINT_REMAP)
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2035 /* A remap `hides ' any previous normal merge points
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2036 (because the remap means that it's actually different face),
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2037 so as we know the current merge point must be normal, we
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2038 can just assume it's OK. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2039 break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2040 }
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2041
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2042 new_named_merge_point->face_name = face_name;
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2043 new_named_merge_point->named_merge_point_kind = named_merge_point_kind;
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2044 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
2045
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2046 *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
2047
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2048 return 1;
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2049 }
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2050
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2051
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2052
83761
7ea6f31ba76e (internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
2053 #if 0 /* Seems to be unused. */
83287
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2054 static Lisp_Object
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2055 internal_resolve_face_name (nargs, args)
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2056 int nargs;
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2057 Lisp_Object *args;
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2058 {
83761
7ea6f31ba76e (internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
2059 return Fget (args[0], args[1]);
83287
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2060 }
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2061
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2062 static Lisp_Object
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2063 resolve_face_name_error (ignore)
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2064 Lisp_Object ignore;
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2065 {
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2066 return Qnil;
b4b67a7fcbe0 Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents: 83276
diff changeset
2067 }
83761
7ea6f31ba76e (internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
2068 #endif
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2069
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
2070 /* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it
61914
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2071 to make it a symbol. If FACE_NAME is an alias for another face,
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2072 return that face's name.
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2073
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2074 Return default face in case of errors. */
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2075
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2076 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2077 resolve_face_name (Lisp_Object face_name, int signal_p)
61914
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2078 {
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2079 Lisp_Object orig_face;
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2080 Lisp_Object tortoise, hare;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2081
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2082 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
2083 face_name = intern (SDATA (face_name));
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2084
61914
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2085 if (NILP (face_name) || !SYMBOLP (face_name))
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2086 return face_name;
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2087
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2088 orig_face = face_name;
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2089 tortoise = hare = face_name;
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2090
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2091 while (1)
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2092 {
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2093 face_name = hare;
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2094 hare = Fget (hare, Qface_alias);
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2095 if (NILP (hare) || !SYMBOLP (hare))
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2096 break;
61914
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2097
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2098 face_name = hare;
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2099 hare = Fget (hare, Qface_alias);
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2100 if (NILP (hare) || !SYMBOLP (hare))
61647
a39c60b30e5a (resolve_face_name): Use Fsafe_get to avoid redisplay
Kim F. Storm <storm@cua.dk>
parents: 61628
diff changeset
2101 break;
61914
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2102
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2103 tortoise = Fget (tortoise, Qface_alias);
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2104 if (EQ (hare, tortoise))
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2105 {
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2106 if (signal_p)
71992
760807463226 * xfaces.c (signal_error): Move to eval.c.
Kim F. Storm <storm@cua.dk>
parents: 71845
diff changeset
2107 xsignal1 (Qcircular_list, orig_face);
61914
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2108 return Qdefault;
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2109 }
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2110 }
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2111
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2112 return face_name;
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2113 }
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2114
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2115
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2116 /* 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
2117 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
2118 a symbol (apparently Emacs 20.2 allowed strings as face names in
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2119 face text properties; Ediff uses that). If SIGNAL_P is non-zero,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2120 signal an error if FACE_NAME is not a valid face name. If SIGNAL_P
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2121 is zero, value is nil if FACE_NAME is not a valid face name. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2122 static INLINE Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2123 lface_from_face_name_no_resolve (struct frame *f, Lisp_Object face_name, int signal_p)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2124 {
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2125 Lisp_Object lface;
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2126
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2127 if (f)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2128 lface = assq_no_quit (face_name, f->face_alist);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2129 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2130 lface = assq_no_quit (face_name, Vface_new_frame_defaults);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2131
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2132 if (CONSP (lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2133 lface = XCDR (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2134 else if (signal_p)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2135 signal_error ("Invalid face", face_name);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2136
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2137 check_lface (lface);
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2138
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2139 return lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2140 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2141
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2142 /* Return the face definition of FACE_NAME on frame F. F null means
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2143 return the definition for new frames. FACE_NAME may be a string or
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2144 a symbol (apparently Emacs 20.2 allowed strings as face names in
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2145 face text properties; Ediff uses that). If FACE_NAME is an alias
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2146 for another face, return that face's definition. If SIGNAL_P is
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2147 non-zero, signal an error if FACE_NAME is not a valid face name.
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2148 If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2149 name. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2150 static INLINE Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2151 lface_from_face_name (struct frame *f, Lisp_Object face_name, int signal_p)
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2152 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2153 face_name = resolve_face_name (face_name, signal_p);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2154 return lface_from_face_name_no_resolve (f, face_name, signal_p);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2155 }
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2156
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2157
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2158 /* Get face attributes of face FACE_NAME from frame-local faces on
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2159 frame F. Store the resulting attributes in ATTRS which must point
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2160 to a vector of Lisp_Objects of size LFACE_VECTOR_SIZE. If SIGNAL_P
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2161 is non-zero, signal an error if FACE_NAME does not name a face.
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2162 Otherwise, value is zero if FACE_NAME is not a face. */
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2163
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2164 static INLINE int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2165 get_lface_attributes_no_remap (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int signal_p)
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2166 {
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2167 Lisp_Object lface;
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2168
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2169 lface = lface_from_face_name_no_resolve (f, face_name, signal_p);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2170
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2171 if (! NILP (lface))
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2172 memcpy (attrs, XVECTOR (lface)->contents,
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2173 LFACE_VECTOR_SIZE * sizeof *attrs);
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2174
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2175 return !NILP (lface);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2176 }
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2177
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2178 /* Get face attributes of face FACE_NAME from frame-local faces on frame
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2179 F. Store the resulting attributes in ATTRS which must point to a
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2180 vector of Lisp_Objects of size LFACE_VECTOR_SIZE. If FACE_NAME is an
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2181 alias for another face, use that face's definition. If SIGNAL_P is
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2182 non-zero, signal an error if FACE_NAME does not name a face.
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2183 Otherwise, value is zero if FACE_NAME is not a face. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2184
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2185 static INLINE int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2186 get_lface_attributes (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int signal_p, struct named_merge_point *named_merge_points)
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2187 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2188 Lisp_Object face_remapping;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2189
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2190 face_name = resolve_face_name (face_name, signal_p);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2191
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2192 /* See if SYMBOL has been remapped to some other face (usually this
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2193 is done buffer-locally). */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2194 face_remapping = assq_no_quit (face_name, Vface_remapping_alist);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2195 if (CONSP (face_remapping))
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2196 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2197 struct named_merge_point named_merge_point;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2198
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2199 if (push_named_merge_point (&named_merge_point,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2200 face_name, NAMED_MERGE_POINT_REMAP,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2201 &named_merge_points))
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2202 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2203 int i;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2204
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2205 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2206 attrs[i] = Qunspecified;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2207
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2208 return merge_face_ref (f, XCDR (face_remapping), attrs,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2209 signal_p, named_merge_points);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2210 }
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2211 }
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2212
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2213 /* Default case, no remapping. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2214 return get_lface_attributes_no_remap (f, face_name, attrs, signal_p);
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2215 }
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2216
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2217
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2218 /* Non-zero if all attributes in face attribute vector ATTRS are
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2219 specified, i.e. are non-nil. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2220
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2221 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2222 lface_fully_specified_p (Lisp_Object *attrs)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2223 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2224 int i;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2225
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2226 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2227 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX)
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96675
diff changeset
2228 if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i])))
31202
1733db535955 (lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents: 31178
diff changeset
2229 break;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2230
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2231 return i == LFACE_VECTOR_SIZE;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2232 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2233
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
2234 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2235
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2236 /* Set font-related attributes of Lisp face LFACE from FONT-OBJECT.
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2237 If FORCE_P is zero, set only unspecified attributes of LFACE. The
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2238 exception is `font' attribute. It is set to FONT_OBJECT regardless
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2239 of FORCE_P. */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2240
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2241 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2242 set_lface_from_font (struct frame *f, Lisp_Object lface, Lisp_Object font_object, int force_p)
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2243 {
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2244 Lisp_Object val;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2245 struct font *font = XFONT_OBJECT (font_object);
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2246
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2247 /* Set attributes only if unspecified, otherwise face defaults for
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2248 new frames would never take effect. If the font doesn't have a
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2249 specific property, set a normal value for that. */
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2250
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2251 if (force_p || UNSPECIFIEDP (LFACE_FAMILY (lface)))
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2252 {
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2253 Lisp_Object family = AREF (font_object, FONT_FAMILY_INDEX);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2254
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2255 LFACE_FAMILY (lface) = SYMBOL_NAME (family);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2256 }
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2257
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2258 if (force_p || UNSPECIFIEDP (LFACE_FOUNDRY (lface)))
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2259 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2260 Lisp_Object foundry = AREF (font_object, FONT_FOUNDRY_INDEX);
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2261
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2262 LFACE_FOUNDRY (lface) = SYMBOL_NAME (foundry);
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2263 }
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2264
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2265 if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface)))
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2266 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2267 int pt = PIXEL_TO_POINT (font->pixel_size * 10, f->resy);
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2268
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2269 xassert (pt > 0);
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2270 LFACE_HEIGHT (lface) = make_number (pt);
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2271 }
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2272
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2273 if (force_p || UNSPECIFIEDP (LFACE_WEIGHT (lface)))
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2274 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2275 val = FONT_WEIGHT_FOR_FACE (font_object);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2276 LFACE_WEIGHT (lface) = ! NILP (val) ? val :Qnormal;
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2277 }
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2278 if (force_p || UNSPECIFIEDP (LFACE_SLANT (lface)))
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2279 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2280 val = FONT_SLANT_FOR_FACE (font_object);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2281 LFACE_SLANT (lface) = ! NILP (val) ? val : Qnormal;
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2282 }
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2283 if (force_p || UNSPECIFIEDP (LFACE_SWIDTH (lface)))
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2284 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2285 val = FONT_WIDTH_FOR_FACE (font_object);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2286 LFACE_SWIDTH (lface) = ! NILP (val) ? val : Qnormal;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2287 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2288
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2289 LFACE_FONT (lface) = font_object;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2290 return 1;
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2291 }
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
2292
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
2293 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2294
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2295
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2296 /* Merges the face height FROM with the face height TO, and returns the
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2297 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
2298 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
2299 `relative' heights; the returned value is always an absolute height
100817
9ea6227529f4 Remove obsolete comment.
Chong Yidong <cyd@stupidchicken.com>
parents: 100816
diff changeset
2300 unless both FROM and TO are relative. */
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2301
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2302 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2303 merge_face_heights (Lisp_Object from, Lisp_Object to, Lisp_Object invalid)
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2304 {
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2305 Lisp_Object result = invalid;
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2306
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2307 if (INTEGERP (from))
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2308 /* 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
2309 result = from;
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2310 else if (FLOATP (from))
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2311 /* 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
2312 {
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2313 if (INTEGERP (to))
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2314 /* relative X absolute => absolute */
41518
ee7c1fe5feaf (merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41129
diff changeset
2315 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
2316 else if (FLOATP (to))
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2317 /* relative X relative => relative */
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2318 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
2319 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
2320 result = from;
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2321 }
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2322 else if (FUNCTIONP (from))
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2323 /* FROM is a function, which use to adjust TO. */
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2324 {
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2325 /* Call function with current height as argument.
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2326 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
2327 Lisp_Object args[2];
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2328
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2329 args[0] = from;
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2330 args[1] = to;
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2331 result = safe_call (2, args);
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2332
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2333 /* 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
2334 if (INTEGERP (to) && !INTEGERP (result))
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2335 result = invalid;
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2336 }
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2337
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
2338 return result;
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2339 }
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2340
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2341
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2342 /* 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
2343 store the resulting attributes in TO, which must be already be
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2344 completely specified and contain only absolute attributes. Every
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2345 specified attribute of FROM overrides the corresponding attribute of
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2346 TO; relative attributes in FROM are merged with the absolute value in
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2347 TO and replace it. NAMED_MERGE_POINTS is used internally to detect
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2348 loops in face inheritance/remapping; it should be 0 when called from
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2349 other places. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2350
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2351 static INLINE void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2352 merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to, struct named_merge_point *named_merge_points)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2353 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2354 int i;
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2355
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2356 /* If FROM inherits from some other faces, merge their attributes into
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2357 TO before merging FROM's direct attributes. Note that an :inherit
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2358 attribute of `unspecified' is the same as one of nil; we never
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2359 merge :inherit attributes, so nil is more correct, but lots of
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2360 other code uses `unspecified' as a generic value for face attributes. */
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2361 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX])
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2362 && !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
2363 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points);
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2364
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2365 i = LFACE_FONT_INDEX;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2366 if (!UNSPECIFIEDP (from[i]))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2367 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2368 if (!UNSPECIFIEDP (to[i]))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2369 to[i] = Fmerge_font_spec (from[i], to[i]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2370 else
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2371 to[i] = Fcopy_font_spec (from[i]);
102989
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2372 if (! NILP (AREF (to[i], FONT_FOUNDRY_INDEX)))
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2373 to[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FOUNDRY_INDEX));
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2374 if (! NILP (AREF (to[i], FONT_FAMILY_INDEX)))
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2375 to[LFACE_FAMILY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FAMILY_INDEX));
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2376 if (! NILP (AREF (to[i], FONT_WEIGHT_INDEX)))
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2377 to[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (to[i]);
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2378 if (! NILP (AREF (to[i], FONT_SLANT_INDEX)))
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2379 to[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (to[i]);
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2380 if (! NILP (AREF (to[i], FONT_WIDTH_INDEX)))
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2381 to[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (to[i]);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2382 ASET (to[i], FONT_SIZE_INDEX, Qnil);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2383 }
31221
5bd6bdf3d3cf (merge_face_vectors):
Miles Bader <miles@gnu.org>
parents: 31202
diff changeset
2384
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2385 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2386 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
2387 {
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
2388 if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2389 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2390 to[i] = merge_face_heights (from[i], to[i], to[i]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2391 font_clear_prop (to, FONT_SIZE_INDEX);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2392 }
102989
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2393 else if (i != LFACE_FONT_INDEX
42574e6202e2 (merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents: 102232
diff changeset
2394 && ! EQ (to[i], from[i]))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2395 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2396 to[i] = from[i];
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2397 if (i >= LFACE_FAMILY_INDEX && i <=LFACE_SLANT_INDEX)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2398 font_clear_prop (to,
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2399 (i == LFACE_FAMILY_INDEX ? FONT_FAMILY_INDEX
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2400 : i == LFACE_FOUNDRY_INDEX ? FONT_FOUNDRY_INDEX
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2401 : i == LFACE_SWIDTH_INDEX ? FONT_WIDTH_INDEX
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2402 : i == LFACE_HEIGHT_INDEX ? FONT_SIZE_INDEX
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2403 : i == LFACE_WEIGHT_INDEX ? FONT_WEIGHT_INDEX
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2404 : FONT_SLANT_INDEX));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2405 }
40838
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
2406 }
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2407
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2408 /* TO is always an absolute face, which should inherit from nothing.
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2409 We blindly copy the :inherit attribute above and fix it up here. */
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2410 to[LFACE_INHERIT_INDEX] = Qnil;
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2411 }
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2412
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2413 /* 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
2414 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
2415 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
2416 merging succeeded. */
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2417
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2418 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2419 merge_named_face (struct frame *f, Lisp_Object face_name, Lisp_Object *to, struct named_merge_point *named_merge_points)
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2420 {
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2421 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
2422
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2423 if (push_named_merge_point (&named_merge_point,
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2424 face_name, NAMED_MERGE_POINT_NORMAL,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2425 &named_merge_points))
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2426 {
57997
7a44d300ed6f (merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents: 57107
diff changeset
2427 struct gcpro gcpro1;
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2428 Lisp_Object from[LFACE_VECTOR_SIZE];
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
2429 int ok = get_lface_attributes (f, face_name, from, 0, named_merge_points);
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2430
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2431 if (ok)
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2432 {
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2433 GCPRO1 (named_merge_point.face_name);
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2434 merge_face_vectors (f, from, to, named_merge_points);
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2435 UNGCPRO;
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2436 }
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2437
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
2438 return ok;
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2439 }
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2440 else
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2441 return 0;
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2442 }
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2443
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2444
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2445 /* 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
2446 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
2447 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
2448 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
2449 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
2450 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
2451
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2452 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
2453 specifications. Each face specification can be:
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2454
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2455 1. A symbol or string naming a Lisp face.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2456
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2457 2. A property list of the form (KEYWORD VALUE ...) where each
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2458 KEYWORD is a face attribute name, and value is an appropriate value
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2459 for that attribute.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2460
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2461 3. Conses or the form (FOREGROUND-COLOR . COLOR) or
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2462 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2463 for compatibility with 20.2.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2464
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2465 Face specifications earlier in lists take precedence over later
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2466 specifications. */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2467
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2468 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
2469 merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to, int err_msgs, struct named_merge_point *named_merge_points)
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2470 {
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2471 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
2472
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2473 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
2474 {
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2475 Lisp_Object first = XCAR (face_ref);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2476
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2477 if (EQ (first, Qforeground_color)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2478 || EQ (first, Qbackground_color))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2479 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2480 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2481 . 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
2482 Lisp_Object color_name = XCDR (face_ref);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2483 Lisp_Object color = first;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2484
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2485 if (STRINGP (color_name))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2486 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2487 if (EQ (color, Qforeground_color))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2488 to[LFACE_FOREGROUND_INDEX] = color_name;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2489 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2490 to[LFACE_BACKGROUND_INDEX] = color_name;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2491 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2492 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2493 {
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2494 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
2495 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
2496 ok = 0;
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2497 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2498 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2499 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
2500 && *SDATA (SYMBOL_NAME (first)) == ':')
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2501 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2502 /* 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
2503 while (CONSP (face_ref) && CONSP (XCDR (face_ref)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2504 {
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2505 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
2506 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
2507 int err = 0;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2508
56694
d5801cbd92f5 (merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 56518
diff changeset
2509 /* 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
2510 if (EQ (value, Qunspecified))
d5801cbd92f5 (merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 56518
diff changeset
2511 ;
d5801cbd92f5 (merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 56518
diff changeset
2512 else if (EQ (keyword, QCfamily))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2513 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2514 if (STRINGP (value))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2515 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2516 to[LFACE_FAMILY_INDEX] = value;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2517 font_clear_prop (to, FONT_FAMILY_INDEX);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2518 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2519 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2520 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2521 }
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2522 else if (EQ (keyword, QCfoundry))
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2523 {
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2524 if (STRINGP (value))
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2525 {
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2526 to[LFACE_FOUNDRY_INDEX] = value;
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2527 font_clear_prop (to, FONT_FOUNDRY_INDEX);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2528 }
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2529 else
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2530 err = 1;
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2531 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2532 else if (EQ (keyword, QCheight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2533 {
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2534 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
2535 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil);
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2536
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2537 if (! NILP (new_height))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2538 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2539 to[LFACE_HEIGHT_INDEX] = new_height;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2540 font_clear_prop (to, FONT_SIZE_INDEX);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2541 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2542 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2543 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2544 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2545 else if (EQ (keyword, QCweight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2546 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2547 if (SYMBOLP (value) && FONT_WEIGHT_NAME_NUMERIC (value) >= 0)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2548 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2549 to[LFACE_WEIGHT_INDEX] = value;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2550 font_clear_prop (to, FONT_WEIGHT_INDEX);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2551 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2552 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2553 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2554 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2555 else if (EQ (keyword, QCslant))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2556 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2557 if (SYMBOLP (value) && FONT_SLANT_NAME_NUMERIC (value) >= 0)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2558 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2559 to[LFACE_SLANT_INDEX] = value;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2560 font_clear_prop (to, FONT_SLANT_INDEX);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2561 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2562 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2563 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2564 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2565 else if (EQ (keyword, QCunderline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2566 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2567 if (EQ (value, Qt)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2568 || NILP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2569 || STRINGP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2570 to[LFACE_UNDERLINE_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2571 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2572 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2573 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2574 else if (EQ (keyword, QCoverline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2575 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2576 if (EQ (value, Qt)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2577 || NILP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2578 || STRINGP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2579 to[LFACE_OVERLINE_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2580 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2581 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2582 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2583 else if (EQ (keyword, QCstrike_through))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2584 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2585 if (EQ (value, Qt)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2586 || NILP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2587 || STRINGP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2588 to[LFACE_STRIKE_THROUGH_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2589 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2590 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2591 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2592 else if (EQ (keyword, QCbox))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2593 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2594 if (EQ (value, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2595 value = make_number (1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2596 if (INTEGERP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2597 || STRINGP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2598 || CONSP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2599 || NILP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2600 to[LFACE_BOX_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2601 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2602 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2603 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2604 else if (EQ (keyword, QCinverse_video)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2605 || EQ (keyword, QCreverse_video))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2606 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2607 if (EQ (value, Qt) || NILP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2608 to[LFACE_INVERSE_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2609 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2610 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2611 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2612 else if (EQ (keyword, QCforeground))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2613 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2614 if (STRINGP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2615 to[LFACE_FOREGROUND_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2616 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2617 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2618 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2619 else if (EQ (keyword, QCbackground))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2620 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2621 if (STRINGP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2622 to[LFACE_BACKGROUND_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2623 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2624 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2625 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2626 else if (EQ (keyword, QCstipple))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2627 {
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
2628 #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
25890
b10a34d40b55 (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25883
diff changeset
2629 Lisp_Object pixmap_p = Fbitmap_spec_p (value);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2630 if (!NILP (pixmap_p))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2631 to[LFACE_STIPPLE_INDEX] = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2632 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2633 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2634 #endif
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2635 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2636 else if (EQ (keyword, QCwidth))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2637 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2638 if (SYMBOLP (value) && FONT_WIDTH_NAME_NUMERIC (value) >= 0)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2639 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2640 to[LFACE_SWIDTH_INDEX] = value;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2641 font_clear_prop (to, FONT_WIDTH_INDEX);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2642 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2643 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2644 err = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2645 }
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2646 else if (EQ (keyword, QCinherit))
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2647 {
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2648 /* 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
2649 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
2650 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
2651 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
2652 err = 1;
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2653 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2654 else
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2655 err = 1;
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2656
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2657 if (err)
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2658 {
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2659 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
2660 ok = 0;
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2661 }
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2662
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2663 face_ref = XCDR (XCDR (face_ref));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2664 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2665 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2666 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2667 {
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2668 /* 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
2669 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
2670 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
2671 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
2672
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2673 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
2674 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
2675
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2676 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
2677 ok = 0;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2678 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2679 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2680 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2681 {
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2682 /* 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
2683 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
2684 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
2685 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
2686 }
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2687
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
2688 return ok;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2689 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2690
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2691
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2692 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2693 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
2694 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
2695 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
2696 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
2697 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
2698 Value is a vector of face attributes. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2699 (Lisp_Object face, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2700 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2701 Lisp_Object global_lface, lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2702 struct frame *f;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2703 int i;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2704
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2705 CHECK_SYMBOL (face);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2706 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
2707
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2708 if (!NILP (frame))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2709 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2710 CHECK_LIVE_FRAME (frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2711 f = XFRAME (frame);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2712 lface = lface_from_face_name (f, face, 0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2713 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2714 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2715 f = NULL, lface = Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2716
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2717 /* Add a global definition if there is none. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2718 if (NILP (global_lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2719 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2720 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE),
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2721 Qunspecified);
91671
7d8392863f85 * xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91531
diff changeset
2722 ASET (global_lface, 0, Qface);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2723 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface),
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2724 Vface_new_frame_defaults);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2725
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2726 /* Assign the new Lisp face a unique ID. The mapping from Lisp
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2727 face id to Lisp face is given by the vector lface_id_to_name.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2728 The mapping from Lisp face to Lisp face id is given by the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2729 property `face' of the Lisp face name. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2730 if (next_lface_id == lface_id_to_name_size)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2731 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2732 int new_size = max (50, 2 * lface_id_to_name_size);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2733 int sz = new_size * sizeof *lface_id_to_name;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2734 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2735 lface_id_to_name_size = new_size;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2736 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2737
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2738 lface_id_to_name[next_lface_id] = face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2739 Fput (face, Qface, make_number (next_lface_id));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2740 ++next_lface_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2741 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2742 else if (f == NULL)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2743 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
91671
7d8392863f85 * xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91531
diff changeset
2744 ASET (global_lface, i, Qunspecified);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2745
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2746 /* Add a frame-local definition. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2747 if (f)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2748 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2749 if (NILP (lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2750 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2751 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE),
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2752 Qunspecified);
91671
7d8392863f85 * xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91531
diff changeset
2753 ASET (lface, 0, Qface);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2754 f->face_alist = Fcons (Fcons (face, lface), f->face_alist);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2755 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2756 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2757 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
91671
7d8392863f85 * xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91531
diff changeset
2758 ASET (lface, i, Qunspecified);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2759 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2760 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2761 lface = global_lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2762
43270
935816913346 (Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents: 43203
diff changeset
2763 /* 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
2764 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
2765 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
2766 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
2767 init_iterator will then free realized faces. */
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2768 if (NILP (Fget (face, Qface_no_inherit)))
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2769 {
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2770 ++face_change_count;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2771 ++windows_or_buffers_changed;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2772 }
43270
935816913346 (Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents: 43203
diff changeset
2773
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2774 xassert (LFACEP (lface));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2775 check_lface (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2776 return lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2777 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2778
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2779
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2780 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2781 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
2782 doc: /* Return non-nil if FACE names a face.
106436
7e3cef0b7f84 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 106434
diff changeset
2783 FACE should be a symbol or string.
64578
91757d0e430d (Finternal_lisp_face_p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64426
diff changeset
2784 If optional second argument FRAME is non-nil, check for the
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
2785 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
2786 Otherwise check for the existence of a global face. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2787 (Lisp_Object face, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2788 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2789 Lisp_Object lface;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2790
81146
8f50479e40d1 (Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents: 77903
diff changeset
2791 face = resolve_face_name (face, 1);
8f50479e40d1 (Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents: 77903
diff changeset
2792
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2793 if (!NILP (frame))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2794 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2795 CHECK_LIVE_FRAME (frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2796 lface = lface_from_face_name (XFRAME (frame), face, 0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2797 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2798 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2799 lface = lface_from_face_name (NULL, face, 0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2800
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2801 return lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2802 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2803
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2804
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2805 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2806 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
2807 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
2808 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
2809 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
2810 If NEW-FRAME is a frame, copy that data into the frame-local
95375
e743691cff9c (Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 95373
diff changeset
2811 definition of TO on NEW-FRAME. If NEW-FRAME is nil,
56176
21c659556daa (Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56063
diff changeset
2812 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
2813
21c659556daa (Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56063
diff changeset
2814 The value is TO. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2815 (Lisp_Object from, Lisp_Object to, Lisp_Object frame, Lisp_Object new_frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2816 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2817 Lisp_Object lface, copy;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2818
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2819 CHECK_SYMBOL (from);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2820 CHECK_SYMBOL (to);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2821
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2822 if (EQ (frame, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2823 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2824 /* Copy global definition of FROM. We don't make copies of
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2825 strings etc. because 20.2 didn't do it either. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2826 lface = lface_from_face_name (NULL, from, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2827 copy = Finternal_make_lisp_face (to, Qnil);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2828 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2829 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2830 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2831 /* 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
2832 if (NILP (new_frame))
21c659556daa (Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56063
diff changeset
2833 new_frame = frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2834 CHECK_LIVE_FRAME (frame);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2835 CHECK_LIVE_FRAME (new_frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2836 lface = lface_from_face_name (XFRAME (frame), from, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2837 copy = Finternal_make_lisp_face (to, new_frame);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2838 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2839
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2840 memcpy (XVECTOR (copy)->contents, XVECTOR (lface)->contents,
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2841 LFACE_VECTOR_SIZE * sizeof (Lisp_Object));
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2842
43270
935816913346 (Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents: 43203
diff changeset
2843 /* 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
2844 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
2845 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
2846 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
2847 init_iterator will then free realized faces. */
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2848 if (NILP (Fget (to, Qface_no_inherit)))
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2849 {
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2850 ++face_change_count;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2851 ++windows_or_buffers_changed;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
2852 }
43270
935816913346 (Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents: 43203
diff changeset
2853
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2854 return to;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2855 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2856
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2857
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2858 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2859 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
2860 doc: /* Set attribute ATTR of FACE to VALUE.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
2861 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
2862 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
2863 FRAME t means change the default for new frames.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
2864 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
2865 for new frames. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2866 (Lisp_Object face, Lisp_Object attr, Lisp_Object value, Lisp_Object frame)
6784
d41c216ccd27 (frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents: 6768
diff changeset
2867 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2868 Lisp_Object lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2869 Lisp_Object old_value = Qnil;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2870 /* Set one of enum font_property_index (> 0) if ATTR is one of
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2871 font-related attributes other than QCfont and QCfontset. */
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2872 enum font_property_index prop_index = 0;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2873
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2874 CHECK_SYMBOL (face);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2875 CHECK_SYMBOL (attr);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2876
61914
f658c441541a (resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents: 61726
diff changeset
2877 face = resolve_face_name (face, 1);
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
2878
31440
67f5b4186ed2 (Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents: 31292
diff changeset
2879 /* 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
2880 default for new frames. */
67f5b4186ed2 (Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents: 31292
diff changeset
2881 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
2882 {
67f5b4186ed2 (Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents: 31292
diff changeset
2883 Lisp_Object tail;
31570
9eeff4863080 Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents: 31522
diff changeset
2884 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
2885 FOR_EACH_FRAME (tail, frame)
67f5b4186ed2 (Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents: 31292
diff changeset
2886 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
2887 return face;
31440
67f5b4186ed2 (Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents: 31292
diff changeset
2888 }
67f5b4186ed2 (Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents: 31292
diff changeset
2889
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2890 /* Set lface to the Lisp attribute vector of FACE. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2891 if (EQ (frame, Qt))
67046
095993a59ddd * xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents: 66983
diff changeset
2892 {
095993a59ddd * xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents: 66983
diff changeset
2893 lface = lface_from_face_name (NULL, face, 1);
67056
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2894
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2895 /* When updating face-new-frame-defaults, we put :ignore-defface
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2896 where the caller wants `unspecified'. This forces the frame
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2897 defaults to ignore the defface value. Otherwise, the defface
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2898 will take effect, which is generally not what is intended.
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2899 The value of that attribute will be inherited from some other
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2900 face during face merging. See internal_merge_in_global_face. */
67046
095993a59ddd * xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents: 66983
diff changeset
2901 if (UNSPECIFIEDP (value))
67056
3ce17ff4a61f (merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents: 67046
diff changeset
2902 value = Qignore_defface;
67046
095993a59ddd * xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents: 66983
diff changeset
2903 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2904 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2905 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2906 if (NILP (frame))
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
2907 frame = selected_frame;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
2908
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2909 CHECK_LIVE_FRAME (frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2910 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
2911
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2912 /* If a frame-local face doesn't exist yet, create one. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2913 if (NILP (lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2914 lface = Finternal_make_lisp_face (face, frame);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2915 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2916
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2917 if (EQ (attr, QCfamily))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2918 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
2919 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2920 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2921 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
2922 if (SCHARS (value) == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2923 signal_error ("Invalid face family", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2924 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2925 old_value = LFACE_FAMILY (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2926 LFACE_FAMILY (lface) = value;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2927 prop_index = FONT_FAMILY_INDEX;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2928 }
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2929 else if (EQ (attr, QCfoundry))
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2930 {
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2931 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2932 {
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2933 CHECK_STRING (value);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2934 if (SCHARS (value) == 0)
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2935 signal_error ("Invalid face foundry", value);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2936 }
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2937 old_value = LFACE_FOUNDRY (lface);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2938 LFACE_FOUNDRY (lface) = value;
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2939 prop_index = FONT_FOUNDRY_INDEX;
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
2940 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2941 else if (EQ (attr, QCheight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2942 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
2943 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2944 {
100816
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2945 if (EQ (face, Qdefault))
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2946 {
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2947 /* The default face must have an absolute size. */
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2948 if (!INTEGERP (value) || XINT (value) <= 0)
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2949 signal_error ("Invalid default face height", value);
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2950 }
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2951 else
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2952 {
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2953 /* For non-default faces, do a test merge with a random
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2954 height to see if VALUE's ok. */
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2955 Lisp_Object test = merge_face_heights (value,
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2956 make_number (10),
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2957 Qnil);
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2958 if (!INTEGERP (test) || XINT (test) <= 0)
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2959 signal_error ("Invalid face height", value);
b6d603864354 (Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents: 100666
diff changeset
2960 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2961 }
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
2962
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2963 old_value = LFACE_HEIGHT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2964 LFACE_HEIGHT (lface) = value;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2965 prop_index = FONT_SIZE_INDEX;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2966 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2967 else if (EQ (attr, QCweight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2968 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
2969 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2970 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2971 CHECK_SYMBOL (value);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2972 if (FONT_WEIGHT_NAME_NUMERIC (value) < 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2973 signal_error ("Invalid face weight", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2974 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2975 old_value = LFACE_WEIGHT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2976 LFACE_WEIGHT (lface) = value;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2977 prop_index = FONT_WEIGHT_INDEX;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2978 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2979 else if (EQ (attr, QCslant))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2980 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
2981 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2982 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
2983 CHECK_SYMBOL (value);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2984 if (FONT_SLANT_NAME_NUMERIC (value) < 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2985 signal_error ("Invalid face slant", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2986 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2987 old_value = LFACE_SLANT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2988 LFACE_SLANT (lface) = value;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
2989 prop_index = FONT_SLANT_INDEX;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2990 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2991 else if (EQ (attr, QCunderline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2992 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
2993 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2994 if ((SYMBOLP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2995 && !EQ (value, Qt)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2996 && !EQ (value, Qnil))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2997 /* Underline color. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
2998 || (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
2999 && SCHARS (value) == 0))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3000 signal_error ("Invalid face underline", value);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3001
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3002 old_value = LFACE_UNDERLINE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3003 LFACE_UNDERLINE (lface) = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3004 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3005 else if (EQ (attr, QCoverline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3006 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3007 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3008 if ((SYMBOLP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3009 && !EQ (value, Qt)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3010 && !EQ (value, Qnil))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3011 /* Overline color. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3012 || (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
3013 && SCHARS (value) == 0))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3014 signal_error ("Invalid face overline", value);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3015
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3016 old_value = LFACE_OVERLINE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3017 LFACE_OVERLINE (lface) = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3018 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3019 else if (EQ (attr, QCstrike_through))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3020 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3021 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3022 if ((SYMBOLP (value)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3023 && !EQ (value, Qt)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3024 && !EQ (value, Qnil))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3025 /* Strike-through color. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3026 || (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
3027 && SCHARS (value) == 0))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3028 signal_error ("Invalid face strike-through", value);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3029
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3030 old_value = LFACE_STRIKE_THROUGH (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3031 LFACE_STRIKE_THROUGH (lface) = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3032 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3033 else if (EQ (attr, QCbox))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3034 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3035 int valid_p;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3036
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3037 /* Allow t meaning a simple box of width 1 in foreground color
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3038 of the face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3039 if (EQ (value, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3040 value = make_number (1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3041
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3042 if (UNSPECIFIEDP (value) || IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3043 valid_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3044 else if (NILP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3045 valid_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3046 else if (INTEGERP (value))
36006
a9d75e8a6cb9 (Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents: 35913
diff changeset
3047 valid_p = XINT (value) != 0;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3048 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
3049 valid_p = SCHARS (value) > 0;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3050 else if (CONSP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3051 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3052 Lisp_Object tem;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3053
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3054 tem = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3055 while (CONSP (tem))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3056 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3057 Lisp_Object k, v;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3058
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3059 k = XCAR (tem);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3060 tem = XCDR (tem);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3061 if (!CONSP (tem))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3062 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3063 v = XCAR (tem);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3064 tem = XCDR (tem);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3065
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3066 if (EQ (k, QCline_width))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3067 {
36006
a9d75e8a6cb9 (Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents: 35913
diff changeset
3068 if (!INTEGERP (v) || XINT (v) == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3069 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3070 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3071 else if (EQ (k, QCcolor))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3072 {
60150
ffb5cb773521 (Finternal_set_lisp_face_attribute): Allow :color property
Kim F. Storm <storm@cua.dk>
parents: 59924
diff changeset
3073 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3074 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3075 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3076 else if (EQ (k, QCstyle))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3077 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3078 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3079 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3080 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3081 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3082 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3083 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3084
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3085 valid_p = NILP (tem);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3086 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3087 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3088 valid_p = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3089
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3090 if (!valid_p)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3091 signal_error ("Invalid face box", value);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3092
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3093 old_value = LFACE_BOX (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3094 LFACE_BOX (lface) = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3095 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3096 else if (EQ (attr, QCinverse_video)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3097 || EQ (attr, QCreverse_video))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3098 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3099 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3100 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3101 CHECK_SYMBOL (value);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3102 if (!EQ (value, Qt) && !NILP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3103 signal_error ("Invalid inverse-video face attribute value", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3104 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3105 old_value = LFACE_INVERSE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3106 LFACE_INVERSE (lface) = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3107 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3108 else if (EQ (attr, QCforeground))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3109 {
98780
96300bdd6164 (Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents: 98715
diff changeset
3110 /* Compatibility with 20.x. */
96300bdd6164 (Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents: 98715
diff changeset
3111 if (NILP (value))
96300bdd6164 (Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents: 98715
diff changeset
3112 value = Qunspecified;
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3113 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3114 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3115 /* Don't check for valid color names here because it depends
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3116 on the frame (display) whether the color will be valid
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3117 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
3118 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
3119 if (SCHARS (value) == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3120 signal_error ("Empty foreground color value", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3121 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3122 old_value = LFACE_FOREGROUND (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3123 LFACE_FOREGROUND (lface) = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3124 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3125 else if (EQ (attr, QCbackground))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3126 {
98780
96300bdd6164 (Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents: 98715
diff changeset
3127 /* Compatibility with 20.x. */
96300bdd6164 (Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents: 98715
diff changeset
3128 if (NILP (value))
96300bdd6164 (Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents: 98715
diff changeset
3129 value = Qunspecified;
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3130 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3131 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3132 /* Don't check for valid color names here because it depends
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3133 on the frame (display) whether the color will be valid
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3134 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
3135 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
3136 if (SCHARS (value) == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3137 signal_error ("Empty background color value", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3138 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3139 old_value = LFACE_BACKGROUND (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3140 LFACE_BACKGROUND (lface) = value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3141 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3142 else if (EQ (attr, QCstipple))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3143 {
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
3144 #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3145 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3146 && !NILP (value)
25890
b10a34d40b55 (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25883
diff changeset
3147 && NILP (Fbitmap_spec_p (value)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3148 signal_error ("Invalid stipple attribute", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3149 old_value = LFACE_STIPPLE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3150 LFACE_STIPPLE (lface) = value;
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96551
diff changeset
3151 #endif /* HAVE_X_WINDOWS || HAVE_NS */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3152 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3153 else if (EQ (attr, QCwidth))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3154 {
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3155 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3156 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3157 CHECK_SYMBOL (value);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3158 if (FONT_WIDTH_NAME_NUMERIC (value) < 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3159 signal_error ("Invalid face width", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3160 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3161 old_value = LFACE_SWIDTH (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3162 LFACE_SWIDTH (lface) = value;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3163 prop_index = FONT_WIDTH_INDEX;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3164 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3165 else if (EQ (attr, QCfont))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3166 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
3167 #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
3168 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
3169 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3170 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3171 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3172 FRAME_PTR f;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3173
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3174 old_value = LFACE_FONT (lface);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3175 if (! FONTP (value))
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3176 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3177 if (STRINGP (value))
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3178 {
101292
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
3179 Lisp_Object name = value;
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
3180 int fontset = fs_query_fontset (name, 0);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3181
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3182 if (fontset >= 0)
101292
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
3183 name = fontset_ascii (fontset);
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
3184 value = font_spec_from_name (name);
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
3185 if (!FONTP (value))
ab308039742a (Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents: 101157
diff changeset
3186 signal_error ("Invalid font name", name);
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3187 }
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3188 else
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3189 signal_error ("Invalid font or font-spec", value);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3190 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3191 if (EQ (frame, Qt))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3192 f = XFRAME (selected_frame);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3193 else
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3194 f = XFRAME (frame);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3195 if (! FONT_OBJECT_P (value))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3196 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3197 Lisp_Object *attrs = XVECTOR (lface)->contents;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3198 Lisp_Object font_object;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3199
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3200 font_object = font_load_for_lface (f, attrs, value);
91346
04866c5fd4b5 (Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]:
Kenichi Handa <handa@m17n.org>
parents: 91333
diff changeset
3201 if (NILP (font_object))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3202 signal_error ("Font not available", value);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3203 value = font_object;
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3204 }
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3205 set_lface_from_font (f, lface, value, 1);
90463
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3206 }
1d40cee6b4dc (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents: 90444
diff changeset
3207 else
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3208 LFACE_FONT (lface) = value;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3209 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3210 #endif /* HAVE_WINDOW_SYSTEM */
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3211 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3212 else if (EQ (attr, QCfontset))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3213 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3214 #ifdef HAVE_WINDOW_SYSTEM
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3215 if (EQ (frame, Qt) || FRAME_WINDOW_P (XFRAME (frame)))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3216 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3217 Lisp_Object tmp;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3218
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3219 old_value = LFACE_FONTSET (lface);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3220 tmp = Fquery_fontset (value, Qnil);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3221 if (NILP (tmp))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3222 signal_error ("Invalid fontset name", value);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3223 LFACE_FONTSET (lface) = value = tmp;
40224
12dcadf8cb59 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 40023
diff changeset
3224 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
3225 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3226 }
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3227 else if (EQ (attr, QCinherit))
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3228 {
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3229 Lisp_Object tail;
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3230 if (SYMBOLP (value))
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3231 tail = Qnil;
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3232 else
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3233 for (tail = value; CONSP (tail); tail = XCDR (tail))
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3234 if (!SYMBOLP (XCAR (tail)))
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3235 break;
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3236 if (NILP (tail))
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3237 LFACE_INHERIT (lface) = value;
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3238 else
31202
1733db535955 (lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents: 31178
diff changeset
3239 signal_error ("Invalid face inheritance", value);
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3240 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3241 else if (EQ (attr, QCbold))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3242 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3243 old_value = LFACE_WEIGHT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3244 LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3245 prop_index = FONT_WEIGHT_INDEX;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3246 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3247 else if (EQ (attr, QCitalic))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3248 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3249 attr = QCslant;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3250 old_value = LFACE_SLANT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3251 LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3252 prop_index = FONT_SLANT_INDEX;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3253 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3254 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3255 signal_error ("Invalid face attribute name", attr);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3256
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3257 if (prop_index)
98698
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3258 {
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3259 /* If a font-related attribute other than QCfont and QCfontset
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3260 is specified, and if the original QCfont attribute has a font
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3261 (font-spec or font-object), set the corresponding property in
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3262 the font to nil so that the font selector doesn't think that
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3263 the attribute is mandatory. Also, clear the average
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3264 width. */
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3265 font_clear_prop (XVECTOR (lface)->contents, prop_index);
ef67b2d51a4d (Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents: 97930
diff changeset
3266 }
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
3267
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3268 /* Changing a named face means that all realized faces depending on
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3269 that face are invalid. Since we cannot tell which realized faces
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3270 depend on the face, make sure they are all removed. This is done
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3271 by incrementing face_change_count. The next call to
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3272 init_iterator will then free realized faces. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3273 if (!EQ (frame, Qt)
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3274 && NILP (Fget (face, Qface_no_inherit))
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3275 && NILP (Fequal (old_value, value)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3276 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3277 ++face_change_count;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3278 ++windows_or_buffers_changed;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3279 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3280
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
3281 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3282 && NILP (Fequal (old_value, value)))
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3283 {
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3284 Lisp_Object param;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3285
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3286 param = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3287
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3288 if (EQ (face, Qdefault))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3289 {
36481
8456d3257f81 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 36066
diff changeset
3290 #ifdef HAVE_WINDOW_SYSTEM
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3291 /* 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
3292 reflected in changed `font' frame parameters. */
38905
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3293 if (FRAMEP (frame)
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3294 && (prop_index || EQ (attr, QCfont))
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3295 && lface_fully_specified_p (XVECTOR (lface)->contents))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3296 set_font_frame_param (frame, lface);
36481
8456d3257f81 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 36066
diff changeset
3297 else
8456d3257f81 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 36066
diff changeset
3298 #endif /* HAVE_WINDOW_SYSTEM */
8456d3257f81 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 36066
diff changeset
3299
8456d3257f81 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 36066
diff changeset
3300 if (EQ (attr, QCforeground))
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3301 param = Qforeground_color;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3302 else if (EQ (attr, QCbackground))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3303 param = Qbackground_color;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3304 }
36481
8456d3257f81 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 36066
diff changeset
3305 #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
3306 #ifndef WINDOWSNT
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3307 else if (EQ (face, Qscroll_bar))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3308 {
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3309 /* 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
3310 `scroll-bar-foreground' and `scroll-bar-background'. */
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3311 if (EQ (attr, QCforeground))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3312 param = Qscroll_bar_foreground;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3313 else if (EQ (attr, QCbackground))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3314 param = Qscroll_bar_background;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3315 }
31570
9eeff4863080 Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents: 31522
diff changeset
3316 #endif /* not WINDOWSNT */
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3317 else if (EQ (face, Qborder))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3318 {
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3319 /* Changing background color of `border' sets frame parameter
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3320 `border-color'. */
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3321 if (EQ (attr, QCbackground))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3322 param = Qborder_color;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3323 }
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3324 else if (EQ (face, Qcursor))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3325 {
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3326 /* Changing background color of `cursor' sets frame parameter
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3327 `cursor-color'. */
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3328 if (EQ (attr, QCbackground))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3329 param = Qcursor_color;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3330 }
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3331 else if (EQ (face, Qmouse))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3332 {
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3333 /* Changing background color of `mouse' sets frame parameter
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3334 `mouse-color'. */
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3335 if (EQ (attr, QCbackground))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3336 param = Qmouse_color;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3337 }
36481
8456d3257f81 (Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents: 36066
diff changeset
3338 #endif /* HAVE_WINDOW_SYSTEM */
33082
5ab6f3e1f5c8 (menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33070
diff changeset
3339 else if (EQ (face, Qmenu))
38905
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3340 {
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3341 /* 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
3342 realizing faces on FRAME. FRAME t change the
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3343 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
3344 setting the flag in new face caches */
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3345 if (FRAMEP (frame))
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3346 {
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3347 struct frame *f = XFRAME (frame);
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3348 if (FRAME_FACE_CACHE (f) == NULL)
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3349 FRAME_FACE_CACHE (f) = make_face_cache (f);
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3350 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
3351 }
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3352 else
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3353 menu_face_changed_default = 1;
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
3354 }
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3355
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
3356 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
3357 {
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3358 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
3359 /* 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
3360 {
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3361 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
3362 }
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3363 else
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3364 /* 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
3365 {
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3366 Lisp_Object cons;
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3367 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
3368 XSETCAR (cons, param);
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3369 XSETCDR (cons, value);
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3370 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
3371 }
bf08eafda9a3 (merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
3372 }
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3373 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3374
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3375 return face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3376 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3377
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3378
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3379 /* 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
3380 has been assigned the value NEW_VALUE. */
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3381
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3382 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
3383 update_face_from_frame_parameter (struct frame *f, Lisp_Object param, Lisp_Object new_value)
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3384 {
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3385 Lisp_Object face = Qnil;
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3386 Lisp_Object lface;
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3387
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3388 /* 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
3389 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
3390 face-set-after-frame-defaults. */
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3391 if (NILP (f->face_alist))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3392 return;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3393
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3394 if (EQ (param, Qforeground_color))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3395 {
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3396 face = Qdefault;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3397 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
3398 LFACE_FOREGROUND (lface) = (STRINGP (new_value)
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3399 ? new_value : Qunspecified);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3400 realize_basic_faces (f);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3401 }
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3402 else if (EQ (param, Qbackground_color))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3403 {
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
3404 Lisp_Object frame;
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
3405
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
3406 /* Changing the background color might change the background
63642
cb0d171c8273 Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents: 63594
diff changeset
3407 mode, so that we have to load new defface specs.
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
3408 Call frame-update-face-colors to do that. */
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
3409 XSETFRAME (frame, f);
63642
cb0d171c8273 Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents: 63594
diff changeset
3410 call1 (Qframe_set_background_mode, frame);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3411
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3412 face = Qdefault;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3413 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
3414 LFACE_BACKGROUND (lface) = (STRINGP (new_value)
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3415 ? new_value : Qunspecified);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3416 realize_basic_faces (f);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3417 }
109118
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3418 #ifdef HAVE_WINDOW_SYSTEM
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3419 else if (EQ (param, Qborder_color))
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3420 {
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3421 face = Qborder;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3422 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
3423 LFACE_BACKGROUND (lface) = (STRINGP (new_value)
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3424 ? new_value : Qunspecified);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3425 }
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3426 else if (EQ (param, Qcursor_color))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3427 {
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3428 face = Qcursor;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3429 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
3430 LFACE_BACKGROUND (lface) = (STRINGP (new_value)
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3431 ? new_value : Qunspecified);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3432 }
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3433 else if (EQ (param, Qmouse_color))
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3434 {
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3435 face = Qmouse;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3436 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
3437 LFACE_BACKGROUND (lface) = (STRINGP (new_value)
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3438 ? new_value : Qunspecified);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3439 }
109118
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3440 #endif
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3441
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3442 /* Changing a named face means that all realized faces depending on
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3443 that face are invalid. Since we cannot tell which realized faces
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3444 depend on the face, make sure they are all removed. This is done
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3445 by incrementing face_change_count. The next call to
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3446 init_iterator will then free realized faces. */
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3447 if (!NILP (face)
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3448 && NILP (Fget (face, Qface_no_inherit)))
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3449 {
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3450 ++face_change_count;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3451 ++windows_or_buffers_changed;
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
3452 }
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3453 }
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3454
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3455
109118
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3456 #ifdef HAVE_WINDOW_SYSTEM
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3457
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3458 /* Set the `font' frame parameter of FRAME determined from the
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3459 font-object set in `default' face attributes LFACE. */
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3460
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3461 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
3462 set_font_frame_param (Lisp_Object frame, Lisp_Object lface)
109118
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3463 {
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3464 struct frame *f = XFRAME (frame);
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3465 Lisp_Object font;
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3466
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3467 if (FRAME_WINDOW_P (f)
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3468 /* Don't do anything if the font is `unspecified'. This can
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3469 happen during frame creation. */
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3470 && (font = LFACE_FONT (lface),
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3471 ! UNSPECIFIEDP (font)))
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3472 {
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3473 if (FONT_SPEC_P (font))
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3474 {
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3475 font = font_load_for_lface (f, XVECTOR (lface)->contents, font);
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3476 if (NILP (font))
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3477 return;
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3478 LFACE_FONT (lface) = font;
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3479 }
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3480 f->default_face_done_p = 0;
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3481 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font), Qnil));
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3482 }
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3483 }
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3484
254d81c0e750 Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents: 109100
diff changeset
3485
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3486 /* Get the value of X resource RESOURCE, class CLASS for the display
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3487 of frame FRAME. This is here because ordinary `x-get-resource'
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3488 doesn't take a frame argument. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3489
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3490 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
3491 Sinternal_face_x_get_resource, 3, 3, 0, doc: /* */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3492 (Lisp_Object resource, Lisp_Object class, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3493 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
3494 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
3495 CHECK_STRING (resource);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3496 CHECK_STRING (class);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3497 CHECK_LIVE_FRAME (frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3498 BLOCK_INPUT;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3499 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)),
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3500 resource, class, Qnil, Qnil);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3501 UNBLOCK_INPUT;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3502 return value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3503 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3504
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3505
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3506 /* Return resource string VALUE as a boolean value, i.e. nil, or t.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3507 If VALUE is "on" or "true", return t. If VALUE is "off" or
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3508 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3509 error; if SIGNAL_P is zero, return 0. */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3510
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3511 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
3512 face_boolean_x_resource_value (Lisp_Object value, int signal_p)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3513 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3514 Lisp_Object result = make_number (0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3515
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3516 xassert (STRINGP (value));
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3517
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
3518 if (xstrcasecmp (SDATA (value), "on") == 0
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
3519 || xstrcasecmp (SDATA (value), "true") == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3520 result = Qt;
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
3521 else if (xstrcasecmp (SDATA (value), "off") == 0
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
3522 || xstrcasecmp (SDATA (value), "false") == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3523 result = Qnil;
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
3524 else if (xstrcasecmp (SDATA (value), "unspecified") == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3525 result = Qunspecified;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3526 else if (signal_p)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3527 signal_error ("Invalid face attribute value from X resource", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3528
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3529 return result;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3530 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3531
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3532
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3533 DEFUN ("internal-set-lisp-face-attribute-from-resource",
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3534 Finternal_set_lisp_face_attribute_from_resource,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3535 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
3536 3, 4, 0, doc: /* */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3537 (Lisp_Object face, Lisp_Object attr, Lisp_Object value, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3538 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3539 CHECK_SYMBOL (face);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3540 CHECK_SYMBOL (attr);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3541 CHECK_STRING (value);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3542
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
3543 if (xstrcasecmp (SDATA (value), "unspecified") == 0)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3544 value = Qunspecified;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3545 else if (EQ (attr, QCheight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3546 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3547 value = Fstring_to_number (value, make_number (10));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3548 if (XINT (value) <= 0)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3549 signal_error ("Invalid face height from X resource", value);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3550 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3551 else if (EQ (attr, QCbold) || EQ (attr, QCitalic))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3552 value = face_boolean_x_resource_value (value, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3553 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
3554 value = intern (SDATA (value));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3555 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3556 value = face_boolean_x_resource_value (value, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3557 else if (EQ (attr, QCunderline)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3558 || EQ (attr, QCoverline)
40603
e8ff19a0b76e (Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents: 40598
diff changeset
3559 || EQ (attr, QCstrike_through))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3560 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3561 Lisp_Object boolean_value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3562
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3563 /* If the result of face_boolean_x_resource_value is t or nil,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3564 VALUE does NOT specify a color. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3565 boolean_value = face_boolean_x_resource_value (value, 0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3566 if (SYMBOLP (boolean_value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3567 value = boolean_value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3568 }
67130
c5ff1098b0b8 (Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
Eli Zaretskii <eliz@gnu.org>
parents: 67056
diff changeset
3569 else if (EQ (attr, QCbox) || EQ (attr, QCinherit))
40603
e8ff19a0b76e (Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents: 40598
diff changeset
3570 value = Fcar (Fread_from_string (value, Qnil, Qnil));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3571
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3572 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
3573 }
8472
0d0b32e78a5b (compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8119
diff changeset
3574
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
3575 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3576
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
3577
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
3578 /***********************************************************************
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
3579 Menu face
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
3580 ***********************************************************************/
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
3581
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3582 #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
3583
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3584 /* 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
3585
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3586 static void
109372
dd04c65fb401 Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109364
diff changeset
3587 x_update_menu_appearance (struct frame *f)
36936
bda3649d35fd (x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents: 36932
diff changeset
3588 {
bda3649d35fd (x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents: 36932
diff changeset
3589 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
3590 XrmDatabase rdb;
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3591
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3592 if (dpyinfo
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3593 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)),
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3594 rdb != NULL))
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3595 {
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3596 char line[512];
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3597 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
3598 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
3599 const char *myname = SDATA (Vx_resource_name);
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3600 int changed_p = 0;
36956
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3601 #ifdef USE_MOTIF
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3602 const char *popup_path = "popup_menu";
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3603 #else
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3604 const char *popup_path = "menu.popup";
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3605 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48384
diff changeset
3606
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3607 if (STRINGP (LFACE_FOREGROUND (lface)))
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3608 {
36956
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3609 sprintf (line, "%s.%s*foreground: %s",
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3610 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
3611 SDATA (LFACE_FOREGROUND (lface)));
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3612 XrmPutLineResource (&rdb, line);
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3613 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
3614 myname, SDATA (LFACE_FOREGROUND (lface)));
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3615 XrmPutLineResource (&rdb, line);
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3616 changed_p = 1;
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3617 }
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3618
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3619 if (STRINGP (LFACE_BACKGROUND (lface)))
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3620 {
36956
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3621 sprintf (line, "%s.%s*background: %s",
22c5aa03d4aa (x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents: 36946
diff changeset
3622 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
3623 SDATA (LFACE_BACKGROUND (lface)));
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3624 XrmPutLineResource (&rdb, line);
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3625 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
3626 myname, SDATA (LFACE_BACKGROUND (lface)));
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3627 XrmPutLineResource (&rdb, line);
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3628 changed_p = 1;
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3629 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48384
diff changeset
3630
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3631 if (face->font
97599
9806866dbf50 (x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents: 97502
diff changeset
3632 /* On Solaris 5.8, it's been reported that the `menu' face
9806866dbf50 (x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents: 97502
diff changeset
3633 can be unspecified here, during startup. Why this
9806866dbf50 (x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents: 97502
diff changeset
3634 happens remains unknown. -- cyd */
9806866dbf50 (x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents: 97502
diff changeset
3635 && FONTP (LFACE_FONT (lface))
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3636 && (!UNSPECIFIEDP (LFACE_FAMILY (lface))
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
3637 || !UNSPECIFIEDP (LFACE_FOUNDRY (lface))
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3638 || !UNSPECIFIEDP (LFACE_SWIDTH (lface))
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3639 || !UNSPECIFIEDP (LFACE_WEIGHT (lface))
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3640 || !UNSPECIFIEDP (LFACE_SLANT (lface))
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3641 || !UNSPECIFIEDP (LFACE_HEIGHT (lface))))
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3642 {
95189
70380eb2fa9d (x_update_menu_appearance): Call Ffont_xlfd_name with
Kenichi Handa <handa@m17n.org>
parents: 95178
diff changeset
3643 Lisp_Object xlfd = Ffont_xlfd_name (LFACE_FONT (lface), Qnil);
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
3644 #ifdef USE_MOTIF
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3645 const char *suffix = "List";
60699
11723b2eac2e (x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60669
diff changeset
3646 Bool motif = True;
36936
bda3649d35fd (x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents: 36932
diff changeset
3647 #else
64232
7325563a1148 * xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents: 64084
diff changeset
3648 #if defined HAVE_X_I18N
7325563a1148 * xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents: 64084
diff changeset
3649
7325563a1148 * xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents: 64084
diff changeset
3650 const char *suffix = "Set";
7325563a1148 * xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents: 64084
diff changeset
3651 #else
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3652 const char *suffix = "";
64232
7325563a1148 * xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents: 64084
diff changeset
3653 #endif
60699
11723b2eac2e (x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60669
diff changeset
3654 Bool motif = False;
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3655 #endif
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3656
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3657 if (! NILP (xlfd))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3658 {
60699
11723b2eac2e (x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60669
diff changeset
3659 #if defined HAVE_X_I18N
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3660 char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif);
60669
cffa9a821286 (x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60150
diff changeset
3661 #else
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3662 char *fontsetname = (char *) SDATA (xlfd);
60669
cffa9a821286 (x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60150
diff changeset
3663 #endif
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3664 sprintf (line, "%s.pane.menubar*font%s: %s",
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3665 myname, suffix, fontsetname);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3666 XrmPutLineResource (&rdb, line);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3667 sprintf (line, "%s.%s*font%s: %s",
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3668 myname, popup_path, suffix, fontsetname);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3669 XrmPutLineResource (&rdb, line);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3670 changed_p = 1;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3671 if (fontsetname != (char *) SDATA (xlfd))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3672 xfree (fontsetname);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3673 }
36936
bda3649d35fd (x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents: 36932
diff changeset
3674 }
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3675
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3676 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
3677 free_frame_menubar (f);
36942
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3678 }
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3679 }
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3680
98755810fe71 (x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 36936
diff changeset
3681 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3682
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3683
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48384
diff changeset
3684 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
3685 Sface_attribute_relative_p,
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3686 2, 2, 0,
71576
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3687 doc: /* Check whether a face attribute value is relative.
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3688 Specifically, this function returns t if the attribute ATTRIBUTE
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3689 with the value VALUE is relative.
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3690
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3691 A relative value is one that doesn't entirely override whatever is
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3692 inherited from another face. For most possible attributes,
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3693 the only relative value that users see is `unspecified'.
b8678c550150 (Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 70834
diff changeset
3694 However, for :height, floating point values are also relative. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3695 (Lisp_Object attribute, Lisp_Object value)
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3696 {
66983
79256abc393d (Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents: 66974
diff changeset
3697 if (EQ (value, Qunspecified) || (EQ (value, Qignore_defface)))
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3698 return Qt;
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3699 else if (EQ (attribute, QCheight))
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3700 return INTEGERP (value) ? Qnil : Qt;
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3701 else
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3702 return Qnil;
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3703 }
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3704
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3705 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
3706 3, 3, 0,
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3707 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
3708 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
3709 the result will be absolute, otherwise it will be relative. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3710 (Lisp_Object attribute, Lisp_Object value1, Lisp_Object value2)
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3711 {
66983
79256abc393d (Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents: 66974
diff changeset
3712 if (EQ (value1, Qunspecified) || EQ (value1, Qignore_defface))
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3713 return value2;
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3714 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
3715 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
3716 else
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3717 return value1;
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3718 }
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
3719
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3720
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3721 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3722 Sinternal_get_lisp_face_attribute,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3723 2, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3724 doc: /* Return face attribute KEYWORD of face SYMBOL.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
3725 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
3726 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
3727 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
3728 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
3729 frames). If FRAME is omitted or nil, use the selected frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3730 (Lisp_Object symbol, Lisp_Object keyword, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3731 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3732 Lisp_Object lface, value = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3733
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3734 CHECK_SYMBOL (symbol);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3735 CHECK_SYMBOL (keyword);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3736
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3737 if (EQ (frame, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3738 lface = lface_from_face_name (NULL, symbol, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3739 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3740 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3741 if (NILP (frame))
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
3742 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3743 CHECK_LIVE_FRAME (frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3744 lface = lface_from_face_name (XFRAME (frame), symbol, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3745 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3746
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3747 if (EQ (keyword, QCfamily))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3748 value = LFACE_FAMILY (lface);
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
3749 else if (EQ (keyword, QCfoundry))
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
3750 value = LFACE_FOUNDRY (lface);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3751 else if (EQ (keyword, QCheight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3752 value = LFACE_HEIGHT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3753 else if (EQ (keyword, QCweight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3754 value = LFACE_WEIGHT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3755 else if (EQ (keyword, QCslant))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3756 value = LFACE_SLANT (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3757 else if (EQ (keyword, QCunderline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3758 value = LFACE_UNDERLINE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3759 else if (EQ (keyword, QCoverline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3760 value = LFACE_OVERLINE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3761 else if (EQ (keyword, QCstrike_through))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3762 value = LFACE_STRIKE_THROUGH (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3763 else if (EQ (keyword, QCbox))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3764 value = LFACE_BOX (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3765 else if (EQ (keyword, QCinverse_video)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3766 || EQ (keyword, QCreverse_video))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3767 value = LFACE_INVERSE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3768 else if (EQ (keyword, QCforeground))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3769 value = LFACE_FOREGROUND (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3770 else if (EQ (keyword, QCbackground))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3771 value = LFACE_BACKGROUND (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3772 else if (EQ (keyword, QCstipple))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3773 value = LFACE_STIPPLE (lface);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3774 else if (EQ (keyword, QCwidth))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3775 value = LFACE_SWIDTH (lface);
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3776 else if (EQ (keyword, QCinherit))
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
3777 value = LFACE_INHERIT (lface);
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
3778 else if (EQ (keyword, QCfont))
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
3779 value = LFACE_FONT (lface);
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
3780 else if (EQ (keyword, QCfontset))
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
3781 value = LFACE_FONTSET (lface);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3782 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3783 signal_error ("Invalid face attribute name", keyword);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3784
67046
095993a59ddd * xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents: 66983
diff changeset
3785 if (IGNORE_DEFFACE_P (value))
095993a59ddd * xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents: 66983
diff changeset
3786 return Qunspecified;
095993a59ddd * xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents: 66983
diff changeset
3787
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3788 return value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3789 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3790
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3791
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3792 DEFUN ("internal-lisp-face-attribute-values",
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3793 Finternal_lisp_face_attribute_values,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3794 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
3795 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
3796 Value is nil if ATTR doesn't have a discrete set of valid values. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3797 (Lisp_Object attr)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3798 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3799 Lisp_Object result = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3800
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3801 CHECK_SYMBOL (attr);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3802
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3803 if (EQ (attr, QCunderline))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3804 result = Fcons (Qt, Fcons (Qnil, Qnil));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3805 else if (EQ (attr, QCoverline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3806 result = Fcons (Qt, Fcons (Qnil, Qnil));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3807 else if (EQ (attr, QCstrike_through))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3808 result = Fcons (Qt, Fcons (Qnil, Qnil));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3809 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3810 result = Fcons (Qt, Fcons (Qnil, Qnil));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3811
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3812 return result;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3813 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3814
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3815
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3816 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
3817 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
3818 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
3819 Default face attributes override any local face attributes. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3820 (Lisp_Object face, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3821 {
31483
5ef4cd475781 (default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents: 31463
diff changeset
3822 int i;
5ef4cd475781 (default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents: 31463
diff changeset
3823 Lisp_Object global_lface, local_lface, *gvec, *lvec;
96427
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3824 struct frame *f = XFRAME (frame);
31483
5ef4cd475781 (default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents: 31463
diff changeset
3825
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
3826 CHECK_LIVE_FRAME (frame);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3827 global_lface = lface_from_face_name (NULL, face, 1);
96427
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3828 local_lface = lface_from_face_name (f, face, 0);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3829 if (NILP (local_lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3830 local_lface = Finternal_make_lisp_face (face, frame);
31483
5ef4cd475781 (default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents: 31463
diff changeset
3831
31519
5a14247e8e26 (Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31518
diff changeset
3832 /* 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
3833 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
3834 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
3835 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
3836 "global before local" priority. */
31483
5ef4cd475781 (default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents: 31463
diff changeset
3837 lvec = XVECTOR (local_lface)->contents;
5ef4cd475781 (default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents: 31463
diff changeset
3838 gvec = XVECTOR (global_lface)->contents;
5ef4cd475781 (default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents: 31463
diff changeset
3839 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
96427
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3840 if (IGNORE_DEFFACE_P (gvec[i]))
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3841 lvec[i] = Qunspecified;
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3842 else if (! UNSPECIFIEDP (gvec[i]))
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3843 lvec[i] = gvec[i];
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3844
96551
be8753b44809 (Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents: 96532
diff changeset
3845 /* If the default face was changed, update the face cache and the
96428
51371c50583a Fix typo in comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 96427
diff changeset
3846 `font' frame parameter. */
96427
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3847 if (EQ (face, Qdefault))
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3848 {
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3849 struct face_cache *c = FRAME_FACE_CACHE (f);
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3850 struct face *newface, *oldface = FACE_FROM_ID (f, DEFAULT_FACE_ID);
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3851 Lisp_Object attrs[LFACE_VECTOR_SIZE];
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3852
96529
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3853 /* This can be NULL (e.g., in batch mode). */
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3854 if (oldface)
96427
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3855 {
96551
be8753b44809 (Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents: 96532
diff changeset
3856 /* Ensure that the face vector is fully specified by merging
be8753b44809 (Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents: 96532
diff changeset
3857 the previously-cached vector. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3858 memcpy (attrs, oldface->lface, sizeof attrs);
96529
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3859 merge_face_vectors (f, lvec, attrs, 0);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3860 memcpy (lvec, attrs, sizeof attrs);
96551
be8753b44809 (Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents: 96532
diff changeset
3861 newface = realize_face (c, lvec, DEFAULT_FACE_ID);
96529
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3862
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3863 if ((! UNSPECIFIEDP (gvec[LFACE_FAMILY_INDEX])
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3864 || ! UNSPECIFIEDP (gvec[LFACE_FOUNDRY_INDEX])
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3865 || ! UNSPECIFIEDP (gvec[LFACE_HEIGHT_INDEX])
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3866 || ! UNSPECIFIEDP (gvec[LFACE_WEIGHT_INDEX])
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3867 || ! UNSPECIFIEDP (gvec[LFACE_SLANT_INDEX])
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3868 || ! UNSPECIFIEDP (gvec[LFACE_SWIDTH_INDEX])
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3869 || ! UNSPECIFIEDP (gvec[LFACE_FONT_INDEX]))
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3870 && newface->font)
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3871 {
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3872 Lisp_Object name = newface->font->props[FONT_NAME_INDEX];
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3873 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, name),
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3874 Qnil));
7ac98f33f18c (Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents: 96428
diff changeset
3875 }
96427
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3876 }
1544b1dca916 (Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents: 96263
diff changeset
3877 }
31507
ac6d049932e9 (Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents: 31483
diff changeset
3878
ac6d049932e9 (Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents: 31483
diff changeset
3879 return Qnil;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3880 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3881
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3882
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3883 /* The following function is implemented for compatibility with 20.2.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3884 The function is used in x-resolve-fonts when it is asked to
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3885 return fonts with the same size as the font of a face. This is
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3886 done in fontset.el. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3887
89835
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3888 DEFUN ("face-font", Fface_font, Sface_font, 1, 3, 0,
40598
7f3db64c7d42 (Finternal_merge_in_global_face): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40555
diff changeset
3889 doc: /* Return the font name of face FACE, or nil if it is unspecified.
89835
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3890 The font name is, by default, for ASCII characters.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
3891 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
3892 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
3893 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
3894 of the form (bold), (italic) or (bold italic).
89835
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3895 If FRAME is omitted or nil, use the selected frame. And, in this case,
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3896 if the optional third argument CHARACTER is given,
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3897 return the font name used for CHARACTER. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3898 (Lisp_Object face, Lisp_Object frame, Lisp_Object character)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3899 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3900 if (EQ (frame, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3901 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3902 Lisp_Object result = Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3903 Lisp_Object lface = lface_from_face_name (NULL, face, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3904
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3905 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3906 && !EQ (LFACE_WEIGHT (lface), Qnormal))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3907 result = Fcons (Qbold, result);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3908
40441
024f6efc3f87 (Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents: 40398
diff changeset
3909 if (!UNSPECIFIEDP (LFACE_SLANT (lface))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3910 && !EQ (LFACE_SLANT (lface), Qnormal))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3911 result = Fcons (Qitalic, result);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
3912
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3913 return result;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3914 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3915 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3916 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3917 struct frame *f = frame_or_selected_frame (frame, 1);
90054
f2ebccfa87d4 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
parents: 90044 58439
diff changeset
3918 int face_id = lookup_named_face (f, face, 1);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3919 struct face *face = FACE_FROM_ID (f, face_id);
89835
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3920
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3921 if (! face)
4a7ac88259e1 (Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents: 89701
diff changeset
3922 return Qnil;
89947
62d04caf8fb9 (Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents: 89943
diff changeset
3923 #ifdef HAVE_WINDOW_SYSTEM
89948
e94e49dc760e (Fface_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89947
diff changeset
3924 if (FRAME_WINDOW_P (f) && !NILP (character))
89947
62d04caf8fb9 (Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents: 89943
diff changeset
3925 {
62d04caf8fb9 (Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents: 89943
diff changeset
3926 CHECK_CHARACTER (character);
62d04caf8fb9 (Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents: 89943
diff changeset
3927 face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil);
62d04caf8fb9 (Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents: 89943
diff changeset
3928 face = FACE_FROM_ID (f, face_id);
62d04caf8fb9 (Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents: 89943
diff changeset
3929 }
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3930 return (face->font
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3931 ? face->font->props[FONT_NAME_INDEX]
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
3932 : Qnil);
95044
f4fac6175e87 frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents: 94983
diff changeset
3933 #else /* !HAVE_WINDOW_SYSTEM */
f4fac6175e87 frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents: 94983
diff changeset
3934 return build_string (FRAME_MSDOS_P (f)
f4fac6175e87 frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents: 94983
diff changeset
3935 ? "ms-dos"
f4fac6175e87 frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents: 94983
diff changeset
3936 : FRAME_W32_P (f) ? "w32term"
f4fac6175e87 frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents: 94983
diff changeset
3937 :"tty");
f4fac6175e87 frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents: 94983
diff changeset
3938 #endif
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3939 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3940 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3941
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3942
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3943 /* 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
3944 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
3945 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
3946
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3947 static INLINE int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
3948 face_attr_equal_p (Lisp_Object v1, Lisp_Object v2)
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3949 {
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3950 /* 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
3951 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
3952 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
3953 return 0;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3954
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3955 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
3956 return 1;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3957
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3958 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
3959 {
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3960 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
3961 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
3962 return 0;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3963
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3964 return memcmp (SDATA (v1), SDATA (v2), SBYTES (v1)) == 0;
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3965
105885
8103235103a7 Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
3966 case_Lisp_Int:
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3967 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
3968 return 0;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3969
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3970 default:
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3971 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
3972 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3973 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3974
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
3975
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3976 /* Compare face vectors V1 and V2 for equality. Value is non-zero if
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3977 all attributes are `equal'. Tries to be fast because this function
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3978 is called quite often. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3979
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3980 static INLINE int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
3981 lface_equal_p (Lisp_Object *v1, Lisp_Object *v2)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3982 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3983 int i, equal_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3984
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3985 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
3986 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
3987
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3988 return equal_p;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3989 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3990
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3991
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3992 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3993 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
3994 doc: /* True if FACE1 and FACE2 are equal.
62969
24f25f7c89cd (Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents: 62945
diff changeset
3995 If the optional argument FRAME is given, report on FACE1 and FACE2 in that frame.
24f25f7c89cd (Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents: 62945
diff changeset
3996 If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3997 If FRAME is omitted or nil, use the selected frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3998 (Lisp_Object face1, Lisp_Object face2, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
3999 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4000 int equal_p;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4001 struct frame *f;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4002 Lisp_Object lface1, lface2;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4003
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4004 if (EQ (frame, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4005 f = NULL;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4006 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4007 /* Don't use check_x_frame here because this function is called
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4008 before X frames exist. At that time, if FRAME is nil,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4009 selected_frame will be used which is the frame dumped with
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4010 Emacs. That frame is not an X frame. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4011 f = frame_or_selected_frame (frame, 2);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4012
62969
24f25f7c89cd (Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents: 62945
diff changeset
4013 lface1 = lface_from_face_name (f, face1, 1);
24f25f7c89cd (Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents: 62945
diff changeset
4014 lface2 = lface_from_face_name (f, face2, 1);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4015 equal_p = lface_equal_p (XVECTOR (lface1)->contents,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4016 XVECTOR (lface2)->contents);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4017 return equal_p ? Qt : Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4018 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4019
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4020
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4021 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4022 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
4023 doc: /* True if FACE has no attribute specified.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
4024 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
4025 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
4026 If FRAME is omitted or nil, use the selected frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4027 (Lisp_Object face, Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4028 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4029 struct frame *f;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4030 Lisp_Object lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4031 int i;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4032
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4033 if (NILP (frame))
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
4034 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
4035 CHECK_LIVE_FRAME (frame);
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
4036 f = XFRAME (frame);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4037
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4038 if (EQ (frame, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4039 lface = lface_from_face_name (NULL, face, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4040 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4041 lface = lface_from_face_name (f, face, 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4042
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4043 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
4044 if (!UNSPECIFIEDP (AREF (lface, i)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4045 break;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4046
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4047 return i == LFACE_VECTOR_SIZE ? Qt : Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4048 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4049
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4050
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4051 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
4052 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
4053 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
4054 For internal use only. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4055 (Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4056 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4057 struct frame *f = frame_or_selected_frame (frame, 0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4058 return f->face_alist;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4059 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4060
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4061
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4062 /* Return a hash code for Lisp string STRING with case ignored. Used
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4063 below in computing a hash value for a Lisp face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4064
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4065 static INLINE unsigned
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4066 hash_string_case_insensitive (Lisp_Object string)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4067 {
46556
71e205b50a3e (may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents: 46478
diff changeset
4068 const unsigned char *s;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4069 unsigned hash = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4070 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
4071 for (s = SDATA (string); *s; ++s)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4072 hash = (hash << 1) ^ tolower (*s);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4073 return hash;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4074 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4075
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4076
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4077 /* Return a hash code for face attribute vector V. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4078
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4079 static INLINE unsigned
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4080 lface_hash (Lisp_Object *v)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4081 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4082 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX])
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
4083 ^ hash_string_case_insensitive (v[LFACE_FOUNDRY_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4084 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4085 ^ hash_string_case_insensitive (v[LFACE_BACKGROUND_INDEX])
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92109
diff changeset
4086 ^ XHASH (v[LFACE_WEIGHT_INDEX])
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92109
diff changeset
4087 ^ XHASH (v[LFACE_SLANT_INDEX])
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92109
diff changeset
4088 ^ XHASH (v[LFACE_SWIDTH_INDEX])
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92109
diff changeset
4089 ^ XHASH (v[LFACE_HEIGHT_INDEX]));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4090 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4091
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4092
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4093 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4094 considering charsets/registries). They do if they specify the same
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4095 family, point size, weight, width, slant, and font. Both
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
4096 LFACE1 and LFACE2 must be fully-specified. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4097
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4098 static INLINE int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4099 lface_same_font_attributes_p (Lisp_Object *lface1, Lisp_Object *lface2)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4100 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4101 xassert (lface_fully_specified_p (lface1)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4102 && lface_fully_specified_p (lface2));
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
4103 return (xstrcasecmp (SDATA (lface1[LFACE_FAMILY_INDEX]),
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
4104 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
4105 && xstrcasecmp (SDATA (lface1[LFACE_FOUNDRY_INDEX]),
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
4106 SDATA (lface2[LFACE_FOUNDRY_INDEX])) == 0
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
4107 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX])
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4108 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX])
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4109 && 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
4110 && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX])
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4111 && EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX])
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
4112 && (EQ (lface1[LFACE_FONTSET_INDEX], lface2[LFACE_FONTSET_INDEX])
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
4113 || (STRINGP (lface1[LFACE_FONTSET_INDEX])
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
4114 && STRINGP (lface2[LFACE_FONTSET_INDEX])
95220
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
4115 && ! xstrcasecmp (SDATA (lface1[LFACE_FONTSET_INDEX]),
010bd4373364 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 95189
diff changeset
4116 SDATA (lface2[LFACE_FONTSET_INDEX]))))
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
4117 );
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4118 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4119
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4120
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4121
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4122 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4123 Realized Faces
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4124 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4125
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4126 /* 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
4127 vector ATTR. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4128
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4129 static struct face *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4130 make_realized_face (Lisp_Object *attr)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4131 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4132 struct face *face = (struct face *) xmalloc (sizeof *face);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4133 memset (face, 0, sizeof *face);
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4134 face->ascii_face = face;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4135 memcpy (face->lface, attr, sizeof face->lface);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4136 return face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4137 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4138
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4139
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4140 /* Free realized face FACE, including its X resources. FACE may
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4141 be null. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4142
88394
b954eee715da Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 43270
diff changeset
4143 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4144 free_realized_face (struct frame *f, struct face *face)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4145 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4146 if (face)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4147 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4148 #ifdef HAVE_WINDOW_SYSTEM
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4149 if (FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4150 {
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4151 /* 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
4152 if (face->fontset >= 0 && face == face->ascii_face)
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4153 free_face_fontset (f, face);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4154 if (face->gc)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4155 {
84976
372151e622f3 (load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84801
diff changeset
4156 BLOCK_INPUT;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4157 if (face->font)
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4158 font_done_for_face (f, face);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4159 x_free_gc (f, face->gc);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4160 face->gc = 0;
84976
372151e622f3 (load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84801
diff changeset
4161 UNBLOCK_INPUT;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4162 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4163
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4164 free_face_colors (f, face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4165 x_destroy_bitmap (f, face->stipple);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4166 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4167 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4168
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4169 xfree (face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4170 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4171 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4172
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4173
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4174 /* Prepare face FACE for subsequent display on frame F. This
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4175 allocated GCs if they haven't been allocated yet or have been freed
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4176 by clearing the face cache. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4177
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4178 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4179 prepare_face_for_display (struct frame *f, struct face *face)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4180 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4181 #ifdef HAVE_WINDOW_SYSTEM
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4182 xassert (FRAME_WINDOW_P (f));
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4183
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4184 if (face->gc == 0)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4185 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4186 XGCValues xgcv;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4187 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4188
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4189 xgcv.foreground = face->foreground;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4190 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
4191 #ifdef HAVE_X_WINDOWS
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4192 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
4193 #endif
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4194
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4195 BLOCK_INPUT;
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4196 #ifdef HAVE_X_WINDOWS
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4197 if (face->stipple)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4198 {
25092
79a5a567bdb0 (prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25062
diff changeset
4199 xgcv.fill_style = FillOpaqueStippled;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4200 xgcv.stipple = x_bitmap_pixmap (f, face->stipple);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4201 mask |= GCFillStyle | GCStipple;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4202 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4203 #endif
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4204 face->gc = x_create_gc (f, mask, &xgcv);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4205 if (face->font)
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4206 font_prepare_for_face (f, face);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4207 UNBLOCK_INPUT;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4208 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4209 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4210 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4211
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4212
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4213 /* 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
4214
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4215 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4216 color_distance (XColor *x, XColor *y)
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4217 {
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4218 /* 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
4219 Quoting from that paper:
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4220
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4221 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
4222 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
4223 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
4224 gives far from optimal results.
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4225
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4226 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
4227
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4228 long r = (x->red - y->red) >> 8;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4229 long g = (x->green - y->green) >> 8;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4230 long b = (x->blue - y->blue) >> 8;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4231 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
4232
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4233 return
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4234 (((512 + r_mean) * r * r) >> 8)
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4235 + 4 * g * g
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4236 + (((767 - r_mean) * b * b) >> 8);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4237 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4238
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4239
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4240 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
4241 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
4242 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
4243 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
4244 If FRAME is unspecified or nil, the current frame is used. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4245 (Lisp_Object color1, Lisp_Object color2, Lisp_Object frame)
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4246 {
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4247 struct frame *f;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4248 XColor cdef1, cdef2;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4249
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4250 if (NILP (frame))
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4251 frame = selected_frame;
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4252 CHECK_LIVE_FRAME (frame);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4253 f = XFRAME (frame);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4254
75885
19bf7ffe644e (Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
4255 if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1))
19bf7ffe644e (Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
4256 && !(STRINGP (color1) && defined_color (f, SDATA (color1), &cdef1, 0)))
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4257 signal_error ("Invalid color", color1);
75885
19bf7ffe644e (Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
4258 if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2))
19bf7ffe644e (Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
4259 && !(STRINGP (color2) && defined_color (f, SDATA (color2), &cdef2, 0)))
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4260 signal_error ("Invalid color", color2);
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4261
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4262 return make_number (color_distance (&cdef1, &cdef2));
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4263 }
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4264
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4265
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
4266 /***********************************************************************
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4267 Face Cache
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4268 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4269
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4270 /* Return a new face cache for frame F. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4271
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4272 static struct face_cache *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4273 make_face_cache (struct frame *f)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4274 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4275 struct face_cache *c;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4276 int size;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4277
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4278 c = (struct face_cache *) xmalloc (sizeof *c);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4279 memset (c, 0, sizeof *c);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4280 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4281 c->buckets = (struct face **) xmalloc (size);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4282 memset (c->buckets, 0, size);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4283 c->size = 50;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4284 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4285 c->f = f;
38905
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
4286 c->menu_face_changed_p = menu_face_changed_default;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4287 return c;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4288 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4289
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4290
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4291 /* Clear out all graphics contexts for all realized faces, except for
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4292 the basic faces. This should be done from time to time just to avoid
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4293 keeping too many graphics contexts that are no longer needed. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4294
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4295 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4296 clear_face_gcs (struct face_cache *c)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4297 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4298 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
4299 {
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4300 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4301 int i;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4302 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4303 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4304 struct face *face = c->faces_by_id[i];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4305 if (face && face->gc)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4306 {
84976
372151e622f3 (load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84801
diff changeset
4307 BLOCK_INPUT;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4308 if (face->font)
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4309 font_done_for_face (c->f, face);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4310 x_free_gc (c->f, face->gc);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4311 face->gc = 0;
84976
372151e622f3 (load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84801
diff changeset
4312 UNBLOCK_INPUT;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4313 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4314 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4315 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4316 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4317 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4318
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4319
55560
f262795a9004 (Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents: 55142
diff changeset
4320 /* 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
4321 C may be null. If faces are freed, make sure the frame's current
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4322 matrix is marked invalid, so that a display caused by an expose
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4323 event doesn't try to use faces we destroyed. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4324
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4325 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4326 free_realized_faces (struct face_cache *c)
8472
0d0b32e78a5b (compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8119
diff changeset
4327 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4328 if (c && c->used)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4329 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4330 int i, size;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4331 struct frame *f = c->f;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4332
29284
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4333 /* 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
4334 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
4335 current matrix still references freed faces. */
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4336 BLOCK_INPUT;
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4337
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4338 for (i = 0; i < c->used; ++i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4339 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4340 free_realized_face (f, c->faces_by_id[i]);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4341 c->faces_by_id[i] = NULL;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4342 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4343
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4344 c->used = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4345 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4346 memset (c->buckets, 0, size);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4347
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4348 /* Must do a thorough redisplay the next time. Mark current
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4349 matrices as invalid because they will reference faces freed
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4350 above. This function is also called when a frame is
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4351 destroyed. In this case, the root window of F is nil. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4352 if (WINDOWP (f->root_window))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4353 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4354 clear_current_matrices (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4355 ++windows_or_buffers_changed;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4356 }
29284
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4357
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4358 UNBLOCK_INPUT;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4359 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4360 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4361
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4362
88394
b954eee715da Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 43270
diff changeset
4363 /* Free all realized faces that are using FONTSET on frame F. */
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4364
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4365 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4366 free_realized_faces_for_fontset (struct frame *f, int fontset)
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4367 {
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4368 struct face_cache *cache = FRAME_FACE_CACHE (f);
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4369 struct face *face;
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4370 int i;
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4371
29284
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4372 /* 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
4373 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
4374 matrix still references freed faces. */
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4375 BLOCK_INPUT;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4376
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4377 for (i = 0; i < cache->used; i++)
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4378 {
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4379 face = cache->faces_by_id[i];
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4380 if (face
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4381 && face->fontset == fontset)
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4382 {
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4383 uncache_face (cache, face);
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4384 free_realized_face (f, face);
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4385 }
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4386 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4387
29284
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4388 /* 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
4389 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
4390 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
4391 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
4392 if (WINDOWP (f->root_window))
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4393 {
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4394 clear_current_matrices (f);
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4395 ++windows_or_buffers_changed;
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4396 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4397
29284
d458dee20518 (free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents: 28753
diff changeset
4398 UNBLOCK_INPUT;
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4399 }
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4400
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4401
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4402 /* Free all realized faces on FRAME or on all frames if FRAME is nil.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4403 This is done after attributes of a named face have been changed,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4404 because we can't tell which realized faces depend on that face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4405
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4406 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4407 free_all_realized_faces (Lisp_Object frame)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4408 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4409 if (NILP (frame))
8472
0d0b32e78a5b (compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8119
diff changeset
4410 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4411 Lisp_Object rest;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4412 FOR_EACH_FRAME (rest, frame)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4413 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame)));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4414 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4415 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4416 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame)));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4417 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4418
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4419
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4420 /* Free face cache C and faces in it, including their X resources. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4421
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4422 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4423 free_face_cache (struct face_cache *c)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4424 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4425 if (c)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4426 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4427 free_realized_faces (c);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4428 xfree (c->buckets);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4429 xfree (c->faces_by_id);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4430 xfree (c);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4431 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4432 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4433
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4434
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4435 /* Cache realized face FACE in face cache C. HASH is the hash value
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4436 of FACE. If FACE is for ASCII characters (i.e. FACE->ascii_face ==
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4437 FACE), insert the new face to the beginning of the collision list
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4438 of the face hash table of C. Otherwise, add the new face to the
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4439 end of the collision list. This way, lookup_face can quickly find
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4440 that a requested face is not cached. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4441
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4442 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4443 cache_face (struct face_cache *c, struct face *face, unsigned int hash)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4444 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4445 int i = hash % FACE_CACHE_BUCKETS_SIZE;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4446
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4447 face->hash = hash;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4448
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4449 if (face->ascii_face != face)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4450 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4451 struct face *last = c->buckets[i];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4452 if (last)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4453 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4454 while (last->next)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4455 last = last->next;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4456 last->next = face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4457 face->prev = last;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4458 face->next = NULL;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4459 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4460 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4461 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4462 c->buckets[i] = face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4463 face->prev = face->next = NULL;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4464 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4465 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4466 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4467 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4468 face->prev = NULL;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4469 face->next = c->buckets[i];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4470 if (face->next)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4471 face->next->prev = face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4472 c->buckets[i] = face;
8472
0d0b32e78a5b (compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8119
diff changeset
4473 }
0d0b32e78a5b (compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8119
diff changeset
4474
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4475 /* Find a free slot in C->faces_by_id and use the index of the free
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4476 slot as FACE->id. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4477 for (i = 0; i < c->used; ++i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4478 if (c->faces_by_id[i] == NULL)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4479 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4480 face->id = i;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4481
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4482 /* 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
4483 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
4484 {
0432020d46a7 (cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents: 53274
diff changeset
4485 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
4486 {
0432020d46a7 (cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents: 53274
diff changeset
4487 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
4488 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
4489 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
4490 abort (); /* Alternatives? ++kfs */
0432020d46a7 (cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents: 53274
diff changeset
4491 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
4492 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
4493 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
4494 }
0432020d46a7 (cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents: 53274
diff changeset
4495 c->used++;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4496 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4497
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4498 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4499 /* Check that FACE got a unique id. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4500 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4501 int j, n;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4502 struct face *face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4503
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4504 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4505 for (face = c->buckets[j]; face; face = face->next)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4506 if (face->id == i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4507 ++n;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4508
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4509 xassert (n == 1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4510 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4511 #endif /* GLYPH_DEBUG */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4512
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4513 c->faces_by_id[i] = face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4514 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4515
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4516
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4517 /* Remove face FACE from cache C. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4518
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4519 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4520 uncache_face (struct face_cache *c, struct face *face)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4521 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4522 int i = face->hash % FACE_CACHE_BUCKETS_SIZE;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4523
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4524 if (face->prev)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4525 face->prev->next = face->next;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4526 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4527 c->buckets[i] = face->next;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4528
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4529 if (face->next)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4530 face->next->prev = face->prev;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4531
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4532 c->faces_by_id[face->id] = NULL;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4533 if (face->id == c->used)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4534 --c->used;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4535 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4536
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4537
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4538 /* Look up a realized face with face attributes ATTR in the face cache
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4539 of frame F. The face will be used to display ASCII characters.
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4540 Value is the ID of the face found. If no suitable face is found,
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4541 realize a new one. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4542
111640
8bd4a845ba2a * src/xfaces.c (lookup_face): Make static.
Andreas Schwab <schwab@linux-m68k.org>
parents: 111133
diff changeset
4543 static INLINE int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4544 lookup_face (struct frame *f, Lisp_Object *attr)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4545 {
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4546 struct face_cache *cache = FRAME_FACE_CACHE (f);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4547 unsigned hash;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4548 int i;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4549 struct face *face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4550
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4551 xassert (cache != NULL);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4552 check_lface_attrs (attr);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4553
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4554 /* Look up ATTR in the face cache. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4555 hash = lface_hash (attr);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4556 i = hash % FACE_CACHE_BUCKETS_SIZE;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4557
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4558 for (face = cache->buckets[i]; face; face = face->next)
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4559 {
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4560 if (face->ascii_face != face)
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4561 {
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4562 /* There's no more ASCII face. */
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4563 face = NULL;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4564 break;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4565 }
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4566 if (face->hash == hash
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4567 && lface_equal_p (face->lface, attr))
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4568 break;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4569 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4570
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4571 /* If not found, realize a new face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4572 if (face == NULL)
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4573 face = realize_face (cache, attr, -1);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4574
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4575 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4576 xassert (face == FACE_FROM_ID (f, face->id));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4577 #endif /* GLYPH_DEBUG */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4578
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4579 return face->id;
8472
0d0b32e78a5b (compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8119
diff changeset
4580 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4581
89950
ad8c5c667a14 (split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents: 89948
diff changeset
4582 #ifdef HAVE_WINDOW_SYSTEM
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4583 /* Look up a realized face that has the same attributes as BASE_FACE
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4584 except for the font in the face cache of frame F. If FONT-OBJECT
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4585 is not nil, it is an already opened font. If FONT-OBJECT is nil,
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4586 the face has no font. Value is the ID of the face found. If no
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4587 suitable face is found, realize a new one. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4588
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4589 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4590 face_for_font (struct frame *f, Lisp_Object font_object, struct face *base_face)
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4591 {
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4592 struct face_cache *cache = FRAME_FACE_CACHE (f);
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4593 unsigned hash;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4594 int i;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4595 struct face *face;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4596
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4597 xassert (cache != NULL);
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4598 base_face = base_face->ascii_face;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4599 hash = lface_hash (base_face->lface);
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4600 i = hash % FACE_CACHE_BUCKETS_SIZE;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4601
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4602 for (face = cache->buckets[i]; face; face = face->next)
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4603 {
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4604 if (face->ascii_face == face)
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4605 continue;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4606 if (face->ascii_face == base_face
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4607 && face->font == (NILP (font_object) ? NULL
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4608 : XFONT_OBJECT (font_object))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4609 && lface_equal_p (face->lface, base_face->lface))
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4610 return face->id;
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4611 }
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4612
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4613 /* If not found, realize a new face. */
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4614 face = realize_non_ascii_face (f, font_object, base_face);
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4615 return face->id;
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
4616 }
89950
ad8c5c667a14 (split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents: 89948
diff changeset
4617 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4618
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4619 /* Return the face id of the realized face for named face SYMBOL on
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4620 frame F suitable for displaying ASCII characters. Value is -1 if
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4621 the face couldn't be determined, which might happen if the default
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4622 face isn't realized and cannot be realized. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4623
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4624 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4625 lookup_named_face (struct frame *f, Lisp_Object symbol, int signal_p)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4626 {
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
4627 Lisp_Object attrs[LFACE_VECTOR_SIZE];
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
4628 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4629 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4630
33275
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4631 if (default_face == NULL)
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4632 {
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4633 if (!realize_basic_faces (f))
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4634 return -1;
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4635 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
72170
c594a1694d31 (lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents: 71992
diff changeset
4636 if (default_face == NULL)
c594a1694d31 (lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents: 71992
diff changeset
4637 abort (); /* realize_basic_faces must have set it up */
33275
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4638 }
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4639
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4640 if (! get_lface_attributes (f, symbol, symbol_attrs, signal_p, 0))
58439
b1e7465ce5fc (lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents: 57997
diff changeset
4641 return -1;
b1e7465ce5fc (lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents: 57997
diff changeset
4642
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4643 memcpy (attrs, default_face->lface, sizeof attrs);
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
4644 merge_face_vectors (f, symbol_attrs, attrs, 0);
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
4645
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4646 return lookup_face (f, attrs);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4647 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4648
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4649
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4650 /* Return the display face-id of the basic face who's canonical face-id
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4651 is FACE_ID. The return value will usually simply be FACE_ID, unless that
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4652 basic face has bee remapped via Vface_remapping_alist. This function is
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4653 conservative: if something goes wrong, it will simply return FACE_ID
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4654 rather than signal an error. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4655
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4656 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4657 lookup_basic_face (struct frame *f, int face_id)
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4658 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4659 Lisp_Object name, mapping;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4660 int remapped_face_id;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4661
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4662 if (NILP (Vface_remapping_alist))
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4663 return face_id; /* Nothing to do. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4664
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4665 switch (face_id)
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4666 {
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4667 case DEFAULT_FACE_ID: name = Qdefault; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4668 case MODE_LINE_FACE_ID: name = Qmode_line; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4669 case MODE_LINE_INACTIVE_FACE_ID: name = Qmode_line_inactive; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4670 case HEADER_LINE_FACE_ID: name = Qheader_line; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4671 case TOOL_BAR_FACE_ID: name = Qtool_bar; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4672 case FRINGE_FACE_ID: name = Qfringe; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4673 case SCROLL_BAR_FACE_ID: name = Qscroll_bar; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4674 case BORDER_FACE_ID: name = Qborder; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4675 case CURSOR_FACE_ID: name = Qcursor; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4676 case MOUSE_FACE_ID: name = Qmouse; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4677 case MENU_FACE_ID: name = Qmenu; break;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4678
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4679 default:
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4680 abort (); /* the caller is supposed to pass us a basic face id */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4681 }
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4682
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4683 /* Do a quick scan through Vface_remapping_alist, and return immediately
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4684 if there is no remapping for face NAME. This is just an optimization
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4685 for the very common no-remapping case. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4686 mapping = assq_no_quit (name, Vface_remapping_alist);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4687 if (NILP (mapping))
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4688 return face_id; /* Give up. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4689
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4690 /* If there is a remapping entry, lookup the face using NAME, which will
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4691 handle the remapping too. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4692 remapped_face_id = lookup_named_face (f, name, 0);
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4693 if (remapped_face_id < 0)
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4694 return face_id; /* Give up. */
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4695
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4696 return remapped_face_id;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4697 }
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4698
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
4699
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4700 /* Return the ID of the realized ASCII face of Lisp face with ID
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4701 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4702
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4703 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4704 ascii_face_of_lisp_face (struct frame *f, int lface_id)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4705 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4706 int face_id;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4707
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4708 if (lface_id >= 0 && lface_id < lface_id_to_name_size)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4709 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4710 Lisp_Object face_name = lface_id_to_name[lface_id];
90054
f2ebccfa87d4 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
parents: 90044 58439
diff changeset
4711 face_id = lookup_named_face (f, face_name, 1);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4712 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4713 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4714 face_id = -1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4715
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4716 return face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4717 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4718
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4719
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4720 /* Return a face for charset ASCII that is like the face with id
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4721 FACE_ID on frame F, but has a font that is STEPS steps smaller.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4722 STEPS < 0 means larger. Value is the id of the face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4723
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4724 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4725 smaller_face (struct frame *f, int face_id, int steps)
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
4726 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4727 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4728 struct face *face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4729 Lisp_Object attrs[LFACE_VECTOR_SIZE];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4730 int pt, last_pt, last_height;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4731 int delta;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4732 int new_face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4733 struct face *new_face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4734
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4735 /* If not called for an X frame, just return the original face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4736 if (FRAME_TERMCAP_P (f))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4737 return face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4738
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4739 /* Try in increments of 1/2 pt. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4740 delta = steps < 0 ? 5 : -5;
85262
77d6e76160a6 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85114
diff changeset
4741 steps = eabs (steps);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4742
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4743 face = FACE_FROM_ID (f, face_id);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4744 memcpy (attrs, face->lface, sizeof attrs);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4745 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4746 new_face_id = face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4747 last_height = FONT_HEIGHT (face->font);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4748
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4749 while (steps
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4750 && pt + delta > 0
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4751 /* Give up if we cannot find a font within 10pt. */
85262
77d6e76160a6 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85114
diff changeset
4752 && eabs (last_pt - pt) < 100)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4753 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4754 /* Look up a face for a slightly smaller/larger font. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4755 pt += delta;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4756 attrs[LFACE_HEIGHT_INDEX] = make_number (pt);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4757 new_face_id = lookup_face (f, attrs);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4758 new_face = FACE_FROM_ID (f, new_face_id);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4759
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4760 /* 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
4761 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
4762 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4763 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4764 --steps;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4765 last_height = FONT_HEIGHT (new_face->font);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4766 last_pt = pt;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4767 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4768 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4769
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4770 return new_face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4771
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4772 #else /* not HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4773
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4774 return face_id;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4775
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4776 #endif /* not HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4777 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4778
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4779
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4780 /* Return a face for charset ASCII that is like the face with id
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4781 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
4782
2730
139740855fa6 * xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents: 2538
diff changeset
4783 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4784 face_with_height (struct frame *f, int face_id, int height)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4785 {
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4786 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4787 struct face *face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4788 Lisp_Object attrs[LFACE_VECTOR_SIZE];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4789
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4790 if (FRAME_TERMCAP_P (f)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4791 || height <= 0)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4792 return face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4793
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4794 face = FACE_FROM_ID (f, face_id);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4795 memcpy (attrs, face->lface, sizeof attrs);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4796 attrs[LFACE_HEIGHT_INDEX] = make_number (height);
104079
40593ae49f6b (face_with_height): Call font_clear_prop.
Kenichi Handa <handa@m17n.org>
parents: 103624
diff changeset
4797 font_clear_prop (attrs, FONT_SIZE_INDEX);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4798 face_id = lookup_face (f, attrs);
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
4799 #endif /* HAVE_WINDOW_SYSTEM */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
4800
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4801 return face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4802 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4803
33275
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
4804
25114
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4805 /* Return the face id of the realized face for named face SYMBOL on
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4806 frame F suitable for displaying ASCII characters, and use
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4807 attributes of the face FACE_ID for attributes that aren't
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4808 completely specified by SYMBOL. This is like lookup_named_face,
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4809 except that the default attributes come from FACE_ID, not from the
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4810 default face. FACE_ID is assumed to be already realized. */
25114
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4811
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4812 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4813 lookup_derived_face (struct frame *f, Lisp_Object symbol, int face_id, int signal_p)
25114
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4814 {
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
4815 Lisp_Object attrs[LFACE_VECTOR_SIZE];
25114
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4816 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
4817 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
4818
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4819 if (!default_face)
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4820 abort ();
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4821
97502
dc43c2f1d2fc (lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents: 97217
diff changeset
4822 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p, 0))
dc43c2f1d2fc (lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents: 97217
diff changeset
4823 return -1;
dc43c2f1d2fc (lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents: 97217
diff changeset
4824
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4825 memcpy (attrs, default_face->lface, sizeof attrs);
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
4826 merge_face_vectors (f, symbol_attrs, attrs, 0);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
4827 return lookup_face (f, attrs);
25114
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4828 }
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
4829
40278
6ee20fddfbc5 (Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40226
diff changeset
4830 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
4831 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
4832 doc: /* Return a vector of face attributes corresponding to PLIST. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4833 (Lisp_Object plist)
40278
6ee20fddfbc5 (Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40226
diff changeset
4834 {
6ee20fddfbc5 (Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40226
diff changeset
4835 Lisp_Object lface;
6ee20fddfbc5 (Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40226
diff changeset
4836 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
4837 Qunspecified);
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
4838 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
4839 1, 0);
40278
6ee20fddfbc5 (Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40226
diff changeset
4840 return lface;
6ee20fddfbc5 (Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40226
diff changeset
4841 }
6ee20fddfbc5 (Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40226
diff changeset
4842
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4843
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4844
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
4845 /***********************************************************************
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4846 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
4847 ***********************************************************************/
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4848
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4849
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4850 /* 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
4851 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
4852 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
4853
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4854 #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
4855
55903
822bab94f6a3 (x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents: 55901
diff changeset
4856 #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
4857
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4858 /* 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
4859 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
4860
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4861 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
4862 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
4863 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
4864
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4865 \(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
4866 \(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
4867
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4868 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4869 x_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs, struct face *def_face)
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
4870 {
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
4871 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
4872
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4873 /* 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
4874 face. */
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4875 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
4876 && 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
4877 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
4878 || (!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
4879 && 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
4880 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
4881 || (!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
4882 && 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
4883 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
4884 || (!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
4885 && 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
4886 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
4887 || (!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
4888 && 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
4889 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
4890 || (!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
4891 && 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
4892 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
4893 || (!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
4894 && 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
4895 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
4896 || (!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
4897 && 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
4898 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
4899 return 0;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4900
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4901 /* 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
4902 "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
4903 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX])
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
4904 || !UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX])
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4905 || !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
4906 || !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
4907 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX])
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4908 || !UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]))
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4909 {
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56176
diff changeset
4910 int face_id;
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4911 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
4912 Lisp_Object merged_attrs[LFACE_VECTOR_SIZE];
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4913 int i;
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4914
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4915 memcpy (merged_attrs, def_attrs, sizeof merged_attrs);
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4916
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
4917 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
4918
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56176
diff changeset
4919 face_id = lookup_face (f, merged_attrs);
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56176
diff changeset
4920 face = FACE_FROM_ID (f, face_id);
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4921
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4922 if (! face)
63705
9e649a045c18 (x_supports_face_attributes_p): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 63649
diff changeset
4923 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
4924
95471
6c85f5f5064c (x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents: 95457
diff changeset
4925 /* If the font is the same, or no font is found, then not
6c85f5f5064c (x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents: 95457
diff changeset
4926 supported. */
6c85f5f5064c (x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents: 95457
diff changeset
4927 if (face->font == def_face->font
6c85f5f5064c (x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents: 95457
diff changeset
4928 || ! face->font)
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4929 return 0;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4930 for (i = FONT_TYPE_INDEX; i <= FONT_SIZE_INDEX; i++)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4931 if (! EQ (face->font->props[i], def_face->font->props[i]))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4932 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4933 Lisp_Object s1, s2;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4934
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4935 if (i < FONT_FOUNDRY_INDEX || i > FONT_REGISTRY_INDEX
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4936 || face->font->driver->case_sensitive)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4937 return 1;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4938 s1 = SYMBOL_NAME (face->font->props[i]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4939 s2 = SYMBOL_NAME (def_face->font->props[i]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4940 if (! EQ (Fcompare_strings (s1, make_number (0), Qnil,
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4941 s2, make_number (0), Qnil, Qt), Qt))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4942 return 1;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4943 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
4944 return 0;
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4945 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4946
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4947 /* 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
4948 return 1;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4949 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4950
55903
822bab94f6a3 (x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents: 55901
diff changeset
4951 #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
4952
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4953 /* 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
4954 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
4955
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4956 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
4957 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
4958 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
4959
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4960 \(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
4961 \(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
4962
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4963 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
4964 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
4965 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
4966 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
4967 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
4968
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4969 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
4970 tty_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs, struct face *def_face)
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4971 {
56296
075ad6932e06 (x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56176
diff changeset
4972 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
4973 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
4974 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
4975 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
4976 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
4977 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
4978
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4979
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4980 /* 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
4981 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
4982 (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
4983 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
4984 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
4985 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
4986 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
4987 specifies. */
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
4988 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX])
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
4989 || !UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX])
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
4990 || !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
4991 || !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
4992 || !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
4993 || !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
4994 || !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
4995 || !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
4996 || !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
4997 return 0;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4998
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
4999
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5000 /* 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
5001
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5002 /* font weight (bold/dim) */
103228
7300fabaa28b * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents: 103114
diff changeset
5003 val = attrs[LFACE_WEIGHT_INDEX];
7300fabaa28b * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents: 103114
diff changeset
5004 if (!UNSPECIFIEDP (val)
7300fabaa28b * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents: 103114
diff changeset
5005 && (weight = FONT_WEIGHT_NAME_NUMERIC (val), weight >= 0))
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5006 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5007 int def_weight = FONT_WEIGHT_NAME_NUMERIC (def_attrs[LFACE_WEIGHT_INDEX]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5008
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5009 if (weight > 100)
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5010 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5011 if (def_weight > 100)
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5012 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
5013 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
5014 }
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5015 else if (weight < 100)
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5016 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5017 if (def_weight < 100)
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5018 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
5019 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
5020 }
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5021 else if (def_weight == 100)
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5022 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
5023 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5024
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5025 /* underlining */
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5026 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
5027 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
5028 {
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5029 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
5030 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
5031 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
5032 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
5033 else
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5034 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
5035 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5036
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5037 /* inverse video */
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5038 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
5039 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
5040 {
78665
e63795496f58 (tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents: 78260
diff changeset
5041 if (face_attr_equal_p (val, def_attrs[LFACE_INVERSE_INDEX]))
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5042 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
5043 else
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5044 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
5045 }
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5046
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5047
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5048 /* Color testing. */
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5049
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5050 /* 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
5051 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
5052 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
5053 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
5054 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
5055
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5056 /* 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
5057 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
5058 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
5059 {
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5060 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
5061
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5062 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
5063 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
5064 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
5065 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
5066 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
5067 > 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
5068 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
5069 else
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5070 /* 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
5071 {
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5072 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
5073 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
5074 && (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
5075 <= 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
5076 return 0;
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5077 }
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5078 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5079
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5080 /* 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
5081 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
5082 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
5083 {
78665
e63795496f58 (tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents: 78260
diff changeset
5084 Lisp_Object def_bg = def_attrs[LFACE_BACKGROUND_INDEX];
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5085
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5086 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
5087 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
5088 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
5089 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
5090 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
5091 > 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
5092 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
5093 else
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5094 /* 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
5095 {
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5096 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
5097 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
5098 && (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
5099 <= 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
5100 return 0;
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5101 }
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5102 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5103
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5104 /* 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
5105 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
5106 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
5107 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
5108 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
5109 {
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5110 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
5111 = (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
5112 - 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
5113 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
5114 || 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
5115 return 0;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5116 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5117
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5118
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5119 /* 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
5120 given colors. */
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5121 if (test_caps != 0 &&
83145
fe5ecb72e304 Merged in changes from CVS trunk.
Karoly Lorentey <lorentey@elte.hu>
parents: 83123 55912
diff changeset
5122 ! tty_capable_p (FRAME_TTY (f), test_caps, fg_tty_color.pixel, bg_tty_color.pixel))
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5123 return 0;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5124
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5125
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5126 /* 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
5127 return 1;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5128 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5129
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5130
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5131 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
5132 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
5133 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
5134 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
5135 The optional argument DISPLAY can be a display name, a frame, or
63164
c4a3a3afa8ce (Fdisplay_supports_face_attributes_p): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62969
diff changeset
5136 nil (meaning the selected frame's display).
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5137
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5138 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
5139 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
5140 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
5141
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5142 \(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
5143 \(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
5144
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5145 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
5146 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
5147 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
5148 satisfied by the tty display code's automatic substitution of a `dim'
63164
c4a3a3afa8ce (Fdisplay_supports_face_attributes_p): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62969
diff changeset
5149 face for italic. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
5150 (Lisp_Object attributes, Lisp_Object display)
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5151 {
74071
ea7f3c26d52b (Fdisplay_supports_face_attributes_p): Initialize
Andreas Schwab <schwab@suse.de>
parents: 73509
diff changeset
5152 int supports = 0, i;
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5153 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
5154 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
5155 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
5156 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
5157
55949
50599d471b66 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents: 55912
diff changeset
5158 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
5159 /* 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
5160 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
5161 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
5162 return Qnil;
50599d471b66 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents: 55912
diff changeset
5163
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5164 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
5165 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
5166 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
5167 frame = display;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5168 else
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5169 {
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5170 /* 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
5171 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
5172
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5173 frame = Qnil;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5174 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
5175 {
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5176 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
5177 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
5178 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
5179 display)))
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5180 break;
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5181 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5182 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5183
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5184 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
5185 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
5186
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5187 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
5188 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
5189 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
5190
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5191 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
5192 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
5193 {
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5194 if (! realize_basic_faces (f))
56296
075ad6932e06 (x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56176
diff changeset
5195 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
5196 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
72170
c594a1694d31 (lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents: 71992
diff changeset
5197 if (def_face == NULL)
c594a1694d31 (lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents: 71992
diff changeset
5198 abort (); /* realize_basic_faces must have set it up */
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5199 }
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5200
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5201 /* 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
5202 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
5203 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
5204 #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
5205 else
55912
0b7bab25fcec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents: 55903
diff changeset
5206 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
5207 #endif
55901
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5208
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5209 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
5210 }
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5211
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5212
7814348a02ec Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents: 55654
diff changeset
5213 /***********************************************************************
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5214 Font selection
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5215 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5216
102232
7de4f0f549a4 (Finternal_set_font_selection_order): Remove leading whitespace that
Glenn Morris <rgm@gnu.org>
parents: 101292
diff changeset
5217 DEFUN ("internal-set-font-selection-order",
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5218 Finternal_set_font_selection_order,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5219 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
5220 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
5221 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
5222 `:height', `:weight', and `:slant'. Face attributes appearing
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
5223 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
5224 `: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
5225 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
5226 Value is ORDER. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
5227 (Lisp_Object order)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5228 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5229 Lisp_Object list;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5230 int i;
35913
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
5231 int indices[DIM (font_sort_order)];
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5232
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
5233 CHECK_LIST (order);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5234 memset (indices, 0, sizeof indices);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5235 i = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5236
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5237 for (list = order;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5238 CONSP (list) && i < DIM (indices);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5239 list = XCDR (list), ++i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5240 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5241 Lisp_Object attr = XCAR (list);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5242 int xlfd;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5243
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5244 if (EQ (attr, QCwidth))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5245 xlfd = XLFD_SWIDTH;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5246 else if (EQ (attr, QCheight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5247 xlfd = XLFD_POINT_SIZE;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5248 else if (EQ (attr, QCweight))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5249 xlfd = XLFD_WEIGHT;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5250 else if (EQ (attr, QCslant))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5251 xlfd = XLFD_SLANT;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5252 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5253 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5254
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5255 if (indices[i] != 0)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5256 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5257 indices[i] = xlfd;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5258 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5259
35913
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
5260 if (!NILP (list) || i != DIM (indices))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5261 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
5262 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
5263 if (indices[i] == 0)
d3591f4747d7 (split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents: 35843
diff changeset
5264 signal_error ("Invalid font sort order", order);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5265
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5266 if (memcmp (indices, font_sort_order, sizeof indices) != 0)
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5267 {
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5268 memcpy (font_sort_order, indices, sizeof font_sort_order);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5269 free_all_realized_faces (Qnil);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5270 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5271
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5272 font_update_sort_order (font_sort_order);
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
5273
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5274 return Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5275 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5276
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5277
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5278 DEFUN ("internal-set-alternative-font-family-alist",
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5279 Finternal_set_alternative_font_family_alist,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5280 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
5281 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
5282 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
5283 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
5284 be found. Value is ALIST. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
5285 (Lisp_Object alist)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5286 {
97930
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5287 Lisp_Object entry, tail, tail2;
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
5288
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
5289 CHECK_LIST (alist);
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
5290 alist = Fcopy_sequence (alist);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
5291 for (tail = alist; CONSP (tail); tail = XCDR (tail))
97930
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5292 {
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5293 entry = XCAR (tail);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5294 CHECK_LIST (entry);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5295 entry = Fcopy_sequence (entry);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5296 XSETCAR (tail, entry);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5297 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2))
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5298 XSETCAR (tail2, Fintern (XCAR (tail2), Qnil));
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5299 }
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5300
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5301 Vface_alternative_font_family_alist = alist;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5302 free_all_realized_faces (Qnil);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5303 return alist;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5304 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5305
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5306
33372
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5307 DEFUN ("internal-set-alternative-font-registry-alist",
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5308 Finternal_set_alternative_font_registry_alist,
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5309 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
5310 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
5311 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
5312 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
5313 be found. Value is ALIST. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
5314 (Lisp_Object alist)
33372
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5315 {
97930
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5316 Lisp_Object entry, tail, tail2;
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
5317
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
5318 CHECK_LIST (alist);
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
5319 alist = Fcopy_sequence (alist);
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
5320 for (tail = alist; CONSP (tail); tail = XCDR (tail))
97930
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5321 {
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5322 entry = XCAR (tail);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5323 CHECK_LIST (entry);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5324 entry = Fcopy_sequence (entry);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5325 XSETCAR (tail, entry);
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5326 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2))
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5327 XSETCAR (tail2, Fdowncase (XCAR (tail2)));
5c86599895c4 (Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents: 97599
diff changeset
5328 }
33372
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5329 Vface_alternative_font_registry_alist = alist;
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5330 free_all_realized_faces (Qnil);
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5331 return alist;
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5332 }
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5333
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
5334
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
5335 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5336
34160
bb9ec0151423 (struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents: 33853
diff changeset
5337 /* 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
5338
bb9ec0151423 (struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents: 33853
diff changeset
5339 #define FONT_POINT_SIZE_QUANTUM 5
bb9ec0151423 (struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents: 33853
diff changeset
5340
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5341 /* 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
5342 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
5343 attribute of ATTRS doesn't name a fontset. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5344
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5345 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5346 face_fontset (Lisp_Object *attrs)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5347 {
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5348 Lisp_Object name;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5349
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
5350 name = attrs[LFACE_FONTSET_INDEX];
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5351 if (!STRINGP (name))
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5352 return -1;
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5353 return fs_query_fontset (name, 0);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5354 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5355
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
5356 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5357
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5358
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5359
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5360 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5361 Face Realization
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5362 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5363
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5364 /* Realize basic faces on frame F. Value is zero if frame parameters
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5365 of F don't contain enough information needed to realize the default
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5366 face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5367
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5368 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5369 realize_basic_faces (struct frame *f)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5370 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5371 int success_p = 0;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45848
diff changeset
5372 int count = SPECPDL_INDEX ();
28461
b6b552188c57 (realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents: 28412
diff changeset
5373
38802
7ca6f1c8e014 (x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents: 38435
diff changeset
5374 /* 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
5375 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
5376 BLOCK_INPUT;
37394
7847d9b8bbff (Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37206
diff changeset
5377 specbind (Qscalable_fonts_allowed, Qt);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5378
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5379 if (realize_default_face (f))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5380 {
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
5381 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
5382 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
5383 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID);
41129
4aced7b9718b Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 41010
diff changeset
5384 realize_named_face (f, Qfringe, FRINGE_FACE_ID);
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
5385 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
5386 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
5387 realize_named_face (f, Qborder, BORDER_FACE_ID);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
5388 realize_named_face (f, Qcursor, CURSOR_FACE_ID);
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
5389 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
5390 realize_named_face (f, Qmenu, MENU_FACE_ID);
63649
144440a09db1 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents: 63642
diff changeset
5391 realize_named_face (f, Qvertical_border, VERTICAL_BORDER_FACE_ID);
33082
5ab6f3e1f5c8 (menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33070
diff changeset
5392
33275
8c453c73a11b (lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents: 33082
diff changeset
5393 /* 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
5394 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
5395 {
38905
70ef1eb656a6 (menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38818
diff changeset
5396 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
5397 #ifdef USE_X_TOOLKIT
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82984
diff changeset
5398 if (FRAME_WINDOW_P (f))
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82984
diff changeset
5399 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
5400 #endif
33082
5ab6f3e1f5c8 (menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33070
diff changeset
5401 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48384
diff changeset
5402
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5403 success_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5404 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5405
37394
7847d9b8bbff (Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37206
diff changeset
5406 unbind_to (count, Qnil);
28461
b6b552188c57 (realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents: 28412
diff changeset
5407 UNBLOCK_INPUT;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5408 return success_p;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5409 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5410
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5411
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5412 /* Realize the default face on frame F. If the face is not fully
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5413 specified, make it fully-specified. Attributes of the default face
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5414 that are not explicitly specified are taken from frame parameters. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5415
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5416 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5417 realize_default_face (struct frame *f)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5418 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5419 struct face_cache *c = FRAME_FACE_CACHE (f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5420 Lisp_Object lface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5421 Lisp_Object attrs[LFACE_VECTOR_SIZE];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5422 struct face *face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5423
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5424 /* If the `default' face is not yet known, create it. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5425 lface = lface_from_face_name (f, Qdefault, 0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5426 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
5427 {
7156fc3b3571 (realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents: 51237
diff changeset
5428 Lisp_Object frame;
7156fc3b3571 (realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents: 51237
diff changeset
5429 XSETFRAME (frame, f);
7156fc3b3571 (realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents: 51237
diff changeset
5430 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
5431 }
7156fc3b3571 (realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents: 51237
diff changeset
5432
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
5433 #ifdef HAVE_WINDOW_SYSTEM
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
5434 if (FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5435 {
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5436 Lisp_Object font_object;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5437
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5438 XSETFONT (font_object, FRAME_FONT (f));
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5439 set_lface_from_font (f, lface, font_object, f->default_face_done_p);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5440 LFACE_FONTSET (lface) = fontset_name (FRAME_FONTSET (f));
51665
c1f65dfc56eb Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents: 51500
diff changeset
5441 f->default_face_done_p = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5442 }
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
5443 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5444
25114
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
5445 if (!FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5446 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5447 LFACE_FAMILY (lface) = build_string ("default");
95865
99530dd346d3 (LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents: 95574
diff changeset
5448 LFACE_FOUNDRY (lface) = LFACE_FAMILY (lface);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5449 LFACE_SWIDTH (lface) = Qnormal;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5450 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
5451 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
5452 LFACE_WEIGHT (lface) = Qnormal;
e1291f1c4a5b (realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents: 42206
diff changeset
5453 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
5454 LFACE_SLANT (lface) = Qnormal;
96027
6aa4148ea6bc (realize_default_face): If the frame is not on window
Kenichi Handa <handa@m17n.org>
parents: 96019
diff changeset
5455 if (UNSPECIFIEDP (LFACE_FONTSET (lface)))
6aa4148ea6bc (realize_default_face): If the frame is not on window
Kenichi Handa <handa@m17n.org>
parents: 96019
diff changeset
5456 LFACE_FONTSET (lface) = Qnil;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5457 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5458
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5459 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5460 LFACE_UNDERLINE (lface) = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5461
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5462 if (UNSPECIFIEDP (LFACE_OVERLINE (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5463 LFACE_OVERLINE (lface) = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5464
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5465 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5466 LFACE_STRIKE_THROUGH (lface) = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5467
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5468 if (UNSPECIFIEDP (LFACE_BOX (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5469 LFACE_BOX (lface) = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5470
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5471 if (UNSPECIFIEDP (LFACE_INVERSE (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5472 LFACE_INVERSE (lface) = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5473
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5474 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5475 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5476 /* This function is called so early that colors are not yet
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5477 set in the frame parameter list. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5478 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
5479
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5480 if (CONSP (color) && STRINGP (XCDR (color)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5481 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
5482 else if (FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5483 return 0;
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
5484 else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
27114
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
5485 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
5486 else
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5487 abort ();
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5488 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5489
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5490 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5491 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5492 /* This function is called so early that colors are not yet
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5493 set in the frame parameter list. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5494 Lisp_Object color = Fassq (Qbackground_color, f->param_alist);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5495 if (CONSP (color) && STRINGP (XCDR (color)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5496 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
5497 else if (FRAME_WINDOW_P (f))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5498 return 0;
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
5499 else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
27114
4efa5e54e9a9 (Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents: 27100
diff changeset
5500 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
5501 else
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5502 abort ();
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5503 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5504
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5505 if (UNSPECIFIEDP (LFACE_STIPPLE (lface)))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5506 LFACE_STIPPLE (lface) = Qnil;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5507
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5508 /* Realize the face; it must be fully-specified now. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5509 xassert (lface_fully_specified_p (XVECTOR (lface)->contents));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5510 check_lface (lface);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5511 memcpy (attrs, XVECTOR (lface)->contents, sizeof attrs);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5512 face = realize_face (c, attrs, DEFAULT_FACE_ID);
70566
a0f76f946025 (realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents: 69968
diff changeset
5513
a0f76f946025 (realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents: 69968
diff changeset
5514 #ifdef HAVE_WINDOW_SYSTEM
70795
1d1c6a83c277 (best_matching_font): Fix crash in 2006-05-17 change.
Kim F. Storm <storm@cua.dk>
parents: 70699
diff changeset
5515 #ifdef HAVE_X_WINDOWS
83519
717426715b03 Fix stupid crash during startup.
Karoly Lorentey <lorentey@elte.hu>
parents: 83518
diff changeset
5516 if (FRAME_X_P (f) && face->font != FRAME_FONT (f))
74114
cd686b5380c4 (realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents: 74071
diff changeset
5517 {
cd686b5380c4 (realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents: 74071
diff changeset
5518 /* This can happen when making a frame on a display that does
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83545 74114
diff changeset
5519 not support the default font. */
74114
cd686b5380c4 (realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents: 74071
diff changeset
5520 if (!face->font)
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83545 74114
diff changeset
5521 return 0;
95375
e743691cff9c (Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 95373
diff changeset
5522
74114
cd686b5380c4 (realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents: 74071
diff changeset
5523 /* Otherwise, the font specified for the frame was not
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83545 74114
diff changeset
5524 acceptable as a font for the default face (perhaps because
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83545 74114
diff changeset
5525 auto-scaled fonts are rejected), so we must adjust the frame
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83545 74114
diff changeset
5526 font. */
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5527 x_set_font (f, LFACE_FONT (lface), Qnil);
74114
cd686b5380c4 (realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents: 74071
diff changeset
5528 }
70566
a0f76f946025 (realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents: 69968
diff changeset
5529 #endif /* HAVE_X_WINDOWS */
a0f76f946025 (realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents: 69968
diff changeset
5530 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5531 return 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5532 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5533
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5534
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5535 /* Realize basic faces other than the default face in face cache C.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5536 SYMBOL is the face name, ID is the face id the realized face must
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5537 have. The default face must have been realized already. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5538
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5539 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5540 realize_named_face (struct frame *f, Lisp_Object symbol, int id)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5541 {
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5542 struct face_cache *c = FRAME_FACE_CACHE (f);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5543 Lisp_Object lface = lface_from_face_name (f, symbol, 0);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5544 Lisp_Object attrs[LFACE_VECTOR_SIZE];
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5545 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5546 struct face *new_face;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5547
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5548 /* The default face must exist and be fully specified. */
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
5549 get_lface_attributes_no_remap (f, Qdefault, attrs, 1);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5550 check_lface_attrs (attrs);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5551 xassert (lface_fully_specified_p (attrs));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5552
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5553 /* If SYMBOL isn't know as a face, create it. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5554 if (NILP (lface))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5555 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5556 Lisp_Object frame;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5557 XSETFRAME (frame, f);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5558 lface = Finternal_make_lisp_face (symbol, frame);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5559 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5560
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5561 /* Merge SYMBOL's face with the default face. */
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
5562 get_lface_attributes_no_remap (f, symbol, symbol_attrs, 1);
91531
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5563 merge_face_vectors (f, symbol_attrs, attrs, 0);
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5564
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5565 /* Realize the face. */
24d3fbc119ce Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents: 91382
diff changeset
5566 new_face = realize_face (c, attrs, id);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5567 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5568
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5569
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5570 /* Realize the fully-specified face with attributes ATTRS in face
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5571 cache CACHE for ASCII characters. If FORMER_FACE_ID is
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5572 non-negative, it is an ID of face to remove before caching the new
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5573 face. Value is a pointer to the newly created realized face. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5574
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5575 static struct face *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5576 realize_face (struct face_cache *cache, Lisp_Object *attrs, int former_face_id)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5577 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5578 struct face *face;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5579
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5580 /* LFACE must be fully specified. */
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5581 xassert (cache != NULL);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5582 check_lface_attrs (attrs);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5583
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5584 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
5585 {
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5586 /* Remove the former face. */
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5587 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
5588 uncache_face (cache, former_face);
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5589 free_realized_face (cache->f, former_face);
109301
d7201a19a376 * xfaces.c (realize_face): Garbage the frame if a face is removed
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
5590 SET_FRAME_GARBAGED (cache->f);
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5591 }
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5592
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5593 if (FRAME_WINDOW_P (cache->f))
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5594 face = realize_x_face (cache, attrs);
35443
2e9bfb04e84a (realize_default_face):
Andrew Innes <andrewi@gnu.org>
parents: 35371
diff changeset
5595 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f))
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5596 face = realize_tty_face (cache, attrs);
83021
32bf8e7cc0c2 Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83008
diff changeset
5597 else if (FRAME_INITIAL_P (cache->f))
32bf8e7cc0c2 Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83008
diff changeset
5598 {
32bf8e7cc0c2 Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83008
diff changeset
5599 /* Create a dummy face. */
32bf8e7cc0c2 Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83008
diff changeset
5600 face = make_realized_face (attrs);
32bf8e7cc0c2 Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83008
diff changeset
5601 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5602 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5603 abort ();
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5604
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5605 /* Insert the new face. */
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5606 cache_face (cache, face, lface_hash (attrs));
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5607 return face;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5608 }
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5609
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5610
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5611 #ifdef HAVE_WINDOW_SYSTEM
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5612 /* Realize the fully-specified face that uses FONT-OBJECT and has the
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5613 same attributes as BASE_FACE except for the font on frame F.
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5614 FONT-OBJECT may be nil, in which case, realized a face of
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5615 no-font. */
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5616
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5617 static struct face *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5618 realize_non_ascii_face (struct frame *f, Lisp_Object font_object, struct face *base_face)
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5619 {
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5620 struct face_cache *cache = FRAME_FACE_CACHE (f);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89405
diff changeset
5621 struct face *face;
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5622
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5623 face = (struct face *) xmalloc (sizeof *face);
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5624 *face = *base_face;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5625 face->gc = 0;
90526
af0b00c37c9b * xfaces.c (realize_non_ascii_face): Set face->extra to NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents: 90519
diff changeset
5626 face->extra = NULL;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5627 face->overstrike
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5628 = (! NILP (font_object)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5629 && FONT_WEIGHT_NAME_NUMERIC (face->lface[LFACE_WEIGHT_INDEX]) > 100
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5630 && FONT_WEIGHT_NUMERIC (font_object) <= 100);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5631
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5632 /* Don't try to free the colors copied bitwise from BASE_FACE. */
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5633 face->colors_copied_bitwise_p = 1;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5634 face->font = NILP (font_object) ? NULL : XFONT_OBJECT (font_object);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5635 face->gc = 0;
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5636
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5637 cache_face (cache, face, face->hash);
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5638
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5639 return face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5640 }
89950
ad8c5c667a14 (split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents: 89948
diff changeset
5641 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5642
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5643
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5644 /* Realize the fully-specified face with attributes ATTRS in face
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5645 cache CACHE for ASCII characters. Do it for X frame CACHE->f. If
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5646 the new face doesn't share font with the default face, a fontname
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5647 is allocated from the heap and set in `font_name' of the new face,
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5648 but it is not yet loaded here. Value is a pointer to the newly
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5649 created realized face. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5650
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5651 static struct face *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5652 realize_x_face (struct face_cache *cache, Lisp_Object *attrs)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5653 {
61628
c897778cd685 (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 60837
diff changeset
5654 struct face *face = NULL;
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
5655 #ifdef HAVE_WINDOW_SYSTEM
61628
c897778cd685 (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 60837
diff changeset
5656 struct face *default_face;
26875
d6aa11f2a4af (choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents: 26759
diff changeset
5657 struct frame *f;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5658 Lisp_Object stipple, overline, strike_through, box;
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5659
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5660 xassert (FRAME_WINDOW_P (cache->f));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5661
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5662 /* Allocate a new realized face. */
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5663 face = make_realized_face (attrs);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5664 face->ascii_face = face;
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5665
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5666 f = cache->f;
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5667
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5668 /* Determine the font to use. Most of the time, the font will be
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5669 the same as the font of the default face, so try that first. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5670 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5671 if (default_face
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5672 && lface_same_font_attributes_p (default_face->lface, attrs))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5673 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5674 face->font = default_face->font;
95567
4170d7f0d918 (realize_x_face): If the font-related face attributes
Kenichi Handa <handa@m17n.org>
parents: 95471
diff changeset
5675 face->fontset
4170d7f0d918 (realize_x_face): If the font-related face attributes
Kenichi Handa <handa@m17n.org>
parents: 95471
diff changeset
5676 = make_fontset_for_ascii_face (f, default_face->fontset, face);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5677 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5678 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5679 {
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5680 /* 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
5681 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
5682 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
5683 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
5684 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
5685 are constructed from ATTRS. */
8d8aa26c6884 (realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents: 30174
diff changeset
5686 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
5687
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5688 /* If we are realizing the default face, ATTRS should specify a
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5689 fontset. In other words, if FONTSET is -1, we are not
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5690 realizing the default face, thus the default face should have
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5691 already been realized. */
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5692 if (fontset == -1)
100102
25295c680f6b (realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99995
diff changeset
5693 {
25295c680f6b (realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99995
diff changeset
5694 if (default_face)
25295c680f6b (realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99995
diff changeset
5695 fontset = default_face->fontset;
25295c680f6b (realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99995
diff changeset
5696 if (fontset == -1)
25295c680f6b (realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99995
diff changeset
5697 abort ();
25295c680f6b (realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99995
diff changeset
5698 }
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5699 if (! FONT_OBJECT_P (attrs[LFACE_FONT_INDEX]))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5700 attrs[LFACE_FONT_INDEX]
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5701 = font_load_for_lface (f, attrs, attrs[LFACE_FONT_INDEX]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5702 if (FONT_OBJECT_P (attrs[LFACE_FONT_INDEX]))
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5703 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5704 face->font = XFONT_OBJECT (attrs[LFACE_FONT_INDEX]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5705 face->fontset = make_fontset_for_ascii_face (f, fontset, face);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5706 }
90414
41626792e297 Include "font.h".
Kenichi Handa <handa@m17n.org>
parents: 90389
diff changeset
5707 else
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5708 {
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5709 face->font = NULL;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5710 face->fontset = -1;
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5711 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5712 }
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5713
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5714 if (face->font
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5715 && FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]) > 100
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5716 && FONT_WEIGHT_NUMERIC (attrs[LFACE_FONT_INDEX]) <= 100)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5717 face->overstrike = 1;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5718
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5719 /* Load colors, and set remaining attributes. */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5720
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5721 load_face_colors (f, face, attrs);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5722
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5723 /* Set up box. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5724 box = attrs[LFACE_BOX_INDEX];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5725 if (STRINGP (box))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5726 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5727 /* A simple box of line width 1 drawn in color given by
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5728 the string. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5729 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX],
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5730 LFACE_BOX_INDEX);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5731 face->box = FACE_SIMPLE_BOX;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5732 face->box_line_width = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5733 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5734 else if (INTEGERP (box))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5735 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5736 /* Simple box of specified line width in foreground color of the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5737 face. */
36006
a9d75e8a6cb9 (Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents: 35913
diff changeset
5738 xassert (XINT (box) != 0);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5739 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
5740 face->box_line_width = XINT (box);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5741 face->box_color = face->foreground;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5742 face->box_color_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5743 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5744 else if (CONSP (box))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5745 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5746 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5747 being one of `raised' or `sunken'. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5748 face->box = FACE_SIMPLE_BOX;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5749 face->box_color = face->foreground;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5750 face->box_color_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5751 face->box_line_width = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5752
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5753 while (CONSP (box))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5754 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5755 Lisp_Object keyword, value;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5756
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5757 keyword = XCAR (box);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5758 box = XCDR (box);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5759
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5760 if (!CONSP (box))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5761 break;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5762 value = XCAR (box);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5763 box = XCDR (box);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5764
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5765 if (EQ (keyword, QCline_width))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5766 {
36006
a9d75e8a6cb9 (Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents: 35913
diff changeset
5767 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
5768 face->box_line_width = XINT (value);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5769 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5770 else if (EQ (keyword, QCcolor))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5771 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5772 if (STRINGP (value))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5773 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5774 face->box_color = load_color (f, face, value,
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5775 LFACE_BOX_INDEX);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5776 face->use_box_color_for_shadows_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5777 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5778 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5779 else if (EQ (keyword, QCstyle))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5780 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5781 if (EQ (value, Qreleased_button))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5782 face->box = FACE_RAISED_BOX;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5783 else if (EQ (value, Qpressed_button))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5784 face->box = FACE_SUNKEN_BOX;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5785 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5786 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5787 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5788
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5789 /* Text underline, overline, strike-through. */
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5790
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5791 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt))
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5792 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5793 /* Use default color (same as foreground color). */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5794 face->underline_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5795 face->underline_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5796 face->underline_color = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5797 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5798 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX]))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5799 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5800 /* Use specified color. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5801 face->underline_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5802 face->underline_defaulted_p = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5803 face->underline_color
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5804 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX],
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5805 LFACE_UNDERLINE_INDEX);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5806 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5807 else if (NILP (attrs[LFACE_UNDERLINE_INDEX]))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5808 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5809 face->underline_p = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5810 face->underline_defaulted_p = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5811 face->underline_color = 0;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5812 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5813
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5814 overline = attrs[LFACE_OVERLINE_INDEX];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5815 if (STRINGP (overline))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5816 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5817 face->overline_color
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5818 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX],
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5819 LFACE_OVERLINE_INDEX);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5820 face->overline_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5821 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5822 else if (EQ (overline, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5823 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5824 face->overline_color = face->foreground;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5825 face->overline_color_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5826 face->overline_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5827 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5828
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5829 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5830 if (STRINGP (strike_through))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5831 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5832 face->strike_through_color
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5833 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX],
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5834 LFACE_STRIKE_THROUGH_INDEX);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5835 face->strike_through_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5836 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5837 else if (EQ (strike_through, Qt))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5838 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5839 face->strike_through_color = face->foreground;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5840 face->strike_through_color_defaulted_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5841 face->strike_through_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5842 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5843
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5844 stipple = attrs[LFACE_STIPPLE_INDEX];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5845 if (!NILP (stipple))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5846 face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h);
61628
c897778cd685 (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 60837
diff changeset
5847 #endif /* HAVE_WINDOW_SYSTEM */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5848
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5849 return face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5850 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5851
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5852
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5853 /* 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
5854 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
5855 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
5856 default foreground/background colors. */
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5857
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5858 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5859 map_tty_color (struct frame *f, struct face *face, enum lface_attribute_index idx, int *defaulted)
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5860 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5861 Lisp_Object frame, color, def;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5862 int foreground_p = idx == LFACE_FOREGROUND_INDEX;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5863 unsigned long default_pixel, default_other_pixel, pixel;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5864
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5865 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
5866
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5867 if (foreground_p)
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5868 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5869 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5870 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5871 }
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5872 else
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5873 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5874 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5875 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5876 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48384
diff changeset
5877
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5878 XSETFRAME (frame, f);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5879 color = face->lface[idx];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48384
diff changeset
5880
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5881 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
5882 && SCHARS (color)
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5883 && CONSP (Vtty_defined_color_alist)
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5884 && (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
5885 CONSP (def)))
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5886 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5887 /* 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
5888 (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
5889 pixel = XINT (XCAR (XCDR (def)));
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5890 }
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5891
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5892 if (pixel == default_pixel && STRINGP (color))
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5893 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5894 pixel = load_color (f, face, color, idx);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5895
86875
51288a744d1c (map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents: 85973
diff changeset
5896 #ifdef MSDOS
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5897 /* 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
5898 use the foreground color defined by the frame. */
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5899 if (FRAME_MSDOS_P (f))
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5900 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5901 if (pixel == default_pixel
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5902 || pixel == FACE_TTY_DEFAULT_COLOR)
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5903 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5904 if (foreground_p)
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5905 pixel = FRAME_FOREGROUND_PIXEL (f);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5906 else
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5907 pixel = FRAME_BACKGROUND_PIXEL (f);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5908 face->lface[idx] = tty_color_name (f, pixel);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5909 *defaulted = 1;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5910 }
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5911 else if (pixel == default_other_pixel)
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5912 {
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5913 if (foreground_p)
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5914 pixel = FRAME_BACKGROUND_PIXEL (f);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5915 else
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5916 pixel = FRAME_FOREGROUND_PIXEL (f);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5917 face->lface[idx] = tty_color_name (f, pixel);
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5918 *defaulted = 1;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5919 }
86875
51288a744d1c (map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents: 85973
diff changeset
5920 }
51288a744d1c (map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents: 85973
diff changeset
5921 #endif /* MSDOS */
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5922 }
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5923
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5924 if (foreground_p)
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5925 face->foreground = pixel;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5926 else
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5927 face->background = pixel;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5928 }
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5929
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5930
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5931 /* Realize the fully-specified face with attributes ATTRS in face
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5932 cache CACHE for ASCII characters. Do it for TTY frame CACHE->f.
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
5933 Value is a pointer to the newly created realized face. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5934
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5935 static struct face *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
5936 realize_tty_face (struct face_cache *cache, Lisp_Object *attrs)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5937 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5938 struct face *face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5939 int weight, slant;
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
5940 int face_colors_defaulted = 0;
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5941 struct frame *f = cache->f;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5942
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5943 /* Frame must be a termcap frame. */
35443
2e9bfb04e84a (realize_default_face):
Andrew Innes <andrewi@gnu.org>
parents: 35371
diff changeset
5944 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
5945
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5946 /* Allocate a new realized face. */
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
5947 face = make_realized_face (attrs);
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5948 #if 0
35443
2e9bfb04e84a (realize_default_face):
Andrew Innes <andrewi@gnu.org>
parents: 35371
diff changeset
5949 face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" : "tty";
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5950 #endif
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5951
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
5952 /* Map face attributes to TTY appearances. We map slant to
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5953 dimmed text because we want italic text to appear differently
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5954 and because dimmed text is probably used infrequently. */
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5955 weight = FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5956 slant = FONT_SLANT_NAME_NUMERIC (attrs[LFACE_SLANT_INDEX]);
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5957 if (weight > 100)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5958 face->tty_bold_p = 1;
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
5959 if (weight < 100 || slant != 100)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5960 face->tty_dim_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5961 if (!NILP (attrs[LFACE_UNDERLINE_INDEX]))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5962 face->tty_underline_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5963 if (!NILP (attrs[LFACE_INVERSE_INDEX]))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5964 face->tty_reverse_p = 1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5965
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5966 /* Map color names to color indices. */
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
5967 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
5968 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
5969
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
5970 /* 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
5971 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
5972 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
5973 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
5974 {
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
5975 unsigned long tem = face->foreground;
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
5976 face->foreground = face->background;
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
5977 face->background = tem;
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
5978 }
be5d3e21fbd7 (load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents: 25092
diff changeset
5979
28529
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
5980 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
5981 && face->tty_bold_p
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
5982 && 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
5983 && 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
5984 face->tty_bold_p = 0;
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
5985
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5986 return face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5987 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5988
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
5989
28529
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
5990 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
5991 Ftty_suppress_bold_inverse_default_colors,
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
5992 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
5993 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
5994 SUPPRESS non-nil means suppress it.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
5995 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
5996 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
5997 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
5998 is non-nil. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
5999 (Lisp_Object suppress)
28529
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6000 {
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6001 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
6002 ++face_change_count;
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6003 return suppress;
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6004 }
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6005
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6006
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6007
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6008 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6009 Computing Faces
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6010 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6011
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6012 /* Return the ID of the face to use to display character CH with face
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6013 property PROP on frame F in current_buffer. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6014
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6015 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
6016 compute_char_face (struct frame *f, int ch, Lisp_Object prop)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6017 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6018 int face_id;
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6019
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6020 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
6021 ch = 0;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6022
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6023 if (NILP (prop))
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6024 {
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6025 struct face *face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
89701
a1d897828f2f (compute_char_face): Call FACE_FOR_CHAR with POS and OBJECT args.
Kenichi Handa <handa@m17n.org>
parents: 89620
diff changeset
6026 face_id = FACE_FOR_CHAR (f, face, ch, -1, Qnil);
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6027 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6028 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6029 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6030 Lisp_Object attrs[LFACE_VECTOR_SIZE];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6031 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6032 memcpy (attrs, default_face->lface, sizeof attrs);
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
6033 merge_face_ref (f, prop, attrs, 1, 0);
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
6034 face_id = lookup_face (f, attrs);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6035 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6036
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6037 return face_id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6038 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6039
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6040 /* Return the face ID associated with buffer position POS for
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6041 displaying ASCII characters. Return in *ENDPTR the position at
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6042 which a different face is needed, as far as text properties and
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6043 overlays are concerned. W is a window displaying current_buffer.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6044
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6045 REGION_BEG, REGION_END delimit the region, so it can be
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6046 highlighted.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6047
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6048 LIMIT is a position not to scan beyond. That is to limit the time
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6049 this function can take.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6050
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6051 If MOUSE is non-zero, use the character's mouse-face, not its face.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6052
103114
fa8e2c663118 * xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents: 103054
diff changeset
6053 BASE_FACE_ID, if non-negative, specifies a base face id to use
fa8e2c663118 * xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents: 103054
diff changeset
6054 instead of DEFAULT_FACE_ID.
fa8e2c663118 * xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents: 103054
diff changeset
6055
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6056 The face returned is suitable for displaying ASCII characters. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6057
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6058 int
109364
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6059 face_at_buffer_position (struct window *w, EMACS_INT pos,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6060 EMACS_INT region_beg, EMACS_INT region_end,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6061 EMACS_INT *endptr, EMACS_INT limit,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6062 int mouse, int base_face_id)
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6063 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6064 struct frame *f = XFRAME (w->frame);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6065 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
6066 Lisp_Object prop, position;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6067 int i, noverlays;
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6068 Lisp_Object *overlay_vec;
2391
226dcdb8ab67 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2342
diff changeset
6069 Lisp_Object frame;
92237
ce06567a933d * dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92150
diff changeset
6070 EMACS_INT endpos;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6071 Lisp_Object propname = mouse ? Qmouse_face : Qface;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6072 Lisp_Object limit1, end;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6073 struct face *default_face;
2784
f8c6796b7777 * xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents: 2767
diff changeset
6074
f8c6796b7777 * xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents: 2767
diff changeset
6075 /* 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
6076 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
6077 /* xassert (XBUFFER (w->buffer) == current_buffer); */
2391
226dcdb8ab67 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2342
diff changeset
6078
9284
a969e0eefaf5 (compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9186
diff changeset
6079 XSETFRAME (frame, f);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6080 XSETFASTINT (position, pos);
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6081
2784
f8c6796b7777 * xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents: 2767
diff changeset
6082 endpos = ZV;
2795
e97e96fb0cb8 (compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents: 2784
diff changeset
6083 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
6084 endpos = region_beg;
2784
f8c6796b7777 * xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents: 2767
diff changeset
6085
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6086 /* Get the `face' or `mouse_face' text property at POS, and
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6087 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
6088 prop = Fget_text_property (position, propname, w->buffer);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6089 XSETFASTINT (limit1, (limit < endpos ? limit : endpos));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6090 end = Fnext_single_property_change (position, propname, w->buffer, limit1);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6091 if (INTEGERP (end))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6092 endpos = XINT (end);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6093
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6094 /* 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
6095 {
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92109
diff changeset
6096 EMACS_INT next_overlay;
55654
edc2b57535e5 (face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents: 55560
diff changeset
6097
edc2b57535e5 (face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents: 55560
diff changeset
6098 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
6099 if (next_overlay < endpos)
f8c6796b7777 * xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents: 2767
diff changeset
6100 endpos = next_overlay;
2767
482fa0725db6 * xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents: 2743
diff changeset
6101 }
482fa0725db6 * xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents: 2743
diff changeset
6102
482fa0725db6 * xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents: 2743
diff changeset
6103 *endptr = endpos;
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6104
103114
fa8e2c663118 * xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents: 103054
diff changeset
6105 default_face = FACE_FROM_ID (f, base_face_id >= 0 ? base_face_id
fa8e2c663118 * xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents: 103054
diff changeset
6106 : NILP (Vface_remapping_alist) ? DEFAULT_FACE_ID
fa8e2c663118 * xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents: 103054
diff changeset
6107 : lookup_basic_face (f, DEFAULT_FACE_ID));
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6108
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6109 /* Optimize common cases where we can use the default face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6110 if (noverlays == 0
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6111 && NILP (prop)
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6112 && !(pos >= region_beg && pos < region_end))
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6113 return default_face->id;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6114
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6115 /* Begin with attributes from the default face. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6116 memcpy (attrs, default_face->lface, sizeof attrs);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6117
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6118 /* Merge in attributes specified via text properties. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6119 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
6120 merge_face_ref (f, prop, attrs, 1, 0);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6121
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6122 /* 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
6123 noverlays = sort_overlays (overlay_vec, noverlays, w);
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6124 for (i = 0; i < noverlays; i++)
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6125 {
19128
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6126 Lisp_Object oend;
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6127 int oendpos;
9186
45bac5feb065 (compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents: 9184
diff changeset
6128
19128
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6129 prop = Foverlay_get (overlay_vec[i], propname);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6130 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
6131 merge_face_ref (f, prop, attrs, 1, 0);
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6132
19128
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6133 oend = OVERLAY_END (overlay_vec[i]);
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6134 oendpos = OVERLAY_POSITION (oend);
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6135 if (oendpos < endpos)
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6136 endpos = oendpos;
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6137 }
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6138
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6139 /* 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
6140 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
6141 {
55966
b9f354f2c61f Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents: 55949
diff changeset
6142 merge_named_face (f, Qregion, attrs, 0);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6143
2795
e97e96fb0cb8 (compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents: 2784
diff changeset
6144 if (region_end < endpos)
e97e96fb0cb8 (compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents: 2784
diff changeset
6145 endpos = region_end;
e97e96fb0cb8 (compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents: 2784
diff changeset
6146 }
e97e96fb0cb8 (compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents: 2784
diff changeset
6147
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6148 *endptr = endpos;
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6149
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6150 /* 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
6151 or realize a new one for ASCII characters. */
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
6152 return lookup_face (f, attrs);
2342
f881f2936eec *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2336
diff changeset
6153 }
19128
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6154
79336
6c386e3cec2a (face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents: 79327
diff changeset
6155 /* Return the face ID at buffer position POS for displaying ASCII
6c386e3cec2a (face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents: 79327
diff changeset
6156 characters associated with overlay strings for overlay OVERLAY.
6c386e3cec2a (face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents: 79327
diff changeset
6157
6c386e3cec2a (face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents: 79327
diff changeset
6158 Like face_at_buffer_position except for OVERLAY. Currently it
6c386e3cec2a (face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents: 79327
diff changeset
6159 simply disregards the `face' properties of all overlays. */
79327
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6160
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6161 int
109364
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6162 face_for_overlay_string (struct window *w, EMACS_INT pos,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6163 EMACS_INT region_beg, EMACS_INT region_end,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6164 EMACS_INT *endptr, EMACS_INT limit,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6165 int mouse, Lisp_Object overlay)
79327
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6166 {
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6167 struct frame *f = XFRAME (w->frame);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6168 Lisp_Object attrs[LFACE_VECTOR_SIZE];
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6169 Lisp_Object prop, position;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6170 Lisp_Object frame;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6171 int endpos;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6172 Lisp_Object propname = mouse ? Qmouse_face : Qface;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6173 Lisp_Object limit1, end;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6174 struct face *default_face;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6175
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6176 /* W must display the current buffer. We could write this function
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6177 to use the frame and buffer of W, but right now it doesn't. */
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6178 /* xassert (XBUFFER (w->buffer) == current_buffer); */
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6179
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6180 XSETFRAME (frame, f);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6181 XSETFASTINT (position, pos);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6182
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6183 endpos = ZV;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6184 if (pos < region_beg && region_beg < endpos)
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6185 endpos = region_beg;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6186
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6187 /* Get the `face' or `mouse_face' text property at POS, and
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6188 determine the next position at which the property changes. */
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6189 prop = Fget_text_property (position, propname, w->buffer);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6190 XSETFASTINT (limit1, (limit < endpos ? limit : endpos));
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6191 end = Fnext_single_property_change (position, propname, w->buffer, limit1);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6192 if (INTEGERP (end))
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6193 endpos = XINT (end);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6194
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6195 *endptr = endpos;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6196
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6197 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6198
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6199 /* Optimize common cases where we can use the default face. */
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6200 if (NILP (prop)
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6201 && !(pos >= region_beg && pos < region_end))
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6202 return DEFAULT_FACE_ID;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6203
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6204 /* Begin with attributes from the default face. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6205 memcpy (attrs, default_face->lface, sizeof attrs);
79327
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6206
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6207 /* Merge in attributes specified via text properties. */
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6208 if (!NILP (prop))
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6209 merge_face_ref (f, prop, attrs, 1, 0);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6210
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6211 /* If in the region, merge in the region face. */
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6212 if (pos >= region_beg && pos < region_end)
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6213 {
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6214 merge_named_face (f, Qregion, attrs, 0);
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6215
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6216 if (region_end < endpos)
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6217 endpos = region_end;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6218 }
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6219
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6220 *endptr = endpos;
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6221
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6222 /* Look up a realized face with the given face attributes,
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6223 or realize a new one for ASCII characters. */
91087
66f982c3b25e (face_for_overlay_string): Call lookup_face with
Kenichi Handa <handa@m17n.org>
parents: 91085
diff changeset
6224 return lookup_face (f, attrs);
79327
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6225 }
72cdd210604a (face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents: 78783
diff changeset
6226
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6227
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6228 /* 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
6229 window W, for ASCII characters.
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6230
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6231 If STRING is an overlay string, it comes from position BUFPOS in
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6232 current_buffer, otherwise BUFPOS is zero to indicate that STRING is
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6233 not an overlay string. W must display the current buffer.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6234 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
6235 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
6236
1bf333d1b1de (face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents: 34242
diff changeset
6237 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
6238 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
6239
36672
acf152adbf82 (face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents: 36481
diff changeset
6240 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
6241
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6242 Set *ENDPTR to the next position where to check for faces in
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6243 STRING; -1 if the face is constant from POS to the end of the
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6244 string.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6245
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6246 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
6247 for displaying ASCII characters. */
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6248
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6249 int
109364
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6250 face_at_string_position (struct window *w, Lisp_Object string,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6251 EMACS_INT pos, EMACS_INT bufpos,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6252 EMACS_INT region_beg, EMACS_INT region_end,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6253 EMACS_INT *endptr, enum face_id base_face_id,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109318
diff changeset
6254 int mouse_p)
19128
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6255 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6256 Lisp_Object prop, position, end, limit;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6257 struct frame *f = XFRAME (WINDOW_FRAME (w));
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6258 Lisp_Object attrs[LFACE_VECTOR_SIZE];
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6259 struct face *base_face;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6260 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
6261 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface;
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6262
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6263 /* Get the value of the face property at the current position within
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6264 STRING. Value is nil if there is no face property. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6265 XSETFASTINT (position, pos);
36672
acf152adbf82 (face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents: 36481
diff changeset
6266 prop = Fget_text_property (position, prop_name, string);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6267
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6268 /* Get the next position at which to check for faces. Value of end
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6269 is nil if face is constant all the way to the end of the string.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6270 Otherwise it is a string position where to check faces next.
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6271 Limit is the maximum position up to which to check for property
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6272 changes in Fnext_single_property_change. Strings are usually
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6273 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
6274 XSETFASTINT (limit, SCHARS (string));
36672
acf152adbf82 (face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents: 36481
diff changeset
6275 end = Fnext_single_property_change (position, prop_name, string, limit);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6276 if (INTEGERP (end))
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6277 *endptr = XFASTINT (end);
19128
e789b647f15b (merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18723
diff changeset
6278 else
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6279 *endptr = -1;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6280
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6281 base_face = FACE_FROM_ID (f, base_face_id);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6282 xassert (base_face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6283
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6284 /* Optimize the default case that there is no face property and we
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6285 are not in the region. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6286 if (NILP (prop)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6287 && (base_face_id != DEFAULT_FACE_ID
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6288 /* BUFPOS <= 0 means STRING is not an overlay string, so
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6289 that the region doesn't have to be taken into account. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6290 || bufpos <= 0
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6291 || bufpos < region_beg
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6292 || bufpos >= region_end)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6293 && (multibyte_p
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6294 /* We can't realize faces for different charsets differently
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6295 if we don't have fonts, so we can stop here if not working
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6296 on a window-system frame. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6297 || !FRAME_WINDOW_P (f)
28230
8e330f701881 (Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents: 27984
diff changeset
6298 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0)))
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6299 return base_face->id;
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6300
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6301 /* Begin with attributes from the base face. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6302 memcpy (attrs, base_face->lface, sizeof attrs);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6303
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6304 /* Merge in attributes specified via text properties. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6305 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
6306 merge_face_ref (f, prop, attrs, 1, 0);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6307
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6308 /* If in the region, merge in the region face. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6309 if (bufpos
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6310 && bufpos >= region_beg
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6311 && 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
6312 merge_named_face (f, Qregion, attrs, 0);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6313
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6314 /* 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
6315 or realize a new one for ASCII characters. */
88907
eca48744527f Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 88470
diff changeset
6316 return lookup_face (f, attrs);
3074
96b4623fdeb3 * xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents: 3065
diff changeset
6317 }
96b4623fdeb3 * xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents: 3065
diff changeset
6318
96b4623fdeb3 * xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents: 3065
diff changeset
6319
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6320 /* Merge a face into a realized face.
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6321
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6322 F is frame where faces are (to be) realized.
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6323
59458
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6324 FACE_NAME is named face to merge.
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6325
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6326 If FACE_NAME is nil, FACE_ID is face_id of realized face to merge.
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6327
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6328 If FACE_NAME is t, FACE_ID is lface_id of face to merge.
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6329
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6330 BASE_FACE_ID is realized face to merge into.
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6331
59458
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6332 Return new face id.
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6333 */
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6334
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6335 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
6336 merge_faces (struct frame *f, Lisp_Object face_name, int face_id, int base_face_id)
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6337 {
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6338 Lisp_Object attrs[LFACE_VECTOR_SIZE];
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6339 struct face *base_face;
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6340
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6341 base_face = FACE_FROM_ID (f, base_face_id);
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6342 if (!base_face)
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6343 return base_face_id;
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6344
59458
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6345 if (EQ (face_name, Qt))
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6346 {
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6347 if (face_id < 0 || face_id >= lface_id_to_name_size)
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6348 return base_face_id;
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6349 face_name = lface_id_to_name[face_id];
97502
dc43c2f1d2fc (lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents: 97217
diff changeset
6350 /* When called during make-frame, lookup_derived_face may fail
dc43c2f1d2fc (lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents: 97217
diff changeset
6351 if the faces are uninitialized. Don't signal an error. */
dc43c2f1d2fc (lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents: 97217
diff changeset
6352 face_id = lookup_derived_face (f, face_name, base_face_id, 0);
dc43c2f1d2fc (lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents: 97217
diff changeset
6353 return (face_id >= 0 ? face_id : base_face_id);
59458
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6354 }
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6355
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6356 /* Begin with attributes from the base face. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6357 memcpy (attrs, base_face->lface, sizeof attrs);
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6358
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6359 if (!NILP (face_name))
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6360 {
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6361 if (!merge_named_face (f, face_name, attrs, 0))
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6362 return base_face_id;
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6363 }
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6364 else
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6365 {
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6366 struct face *face;
59458
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6367 if (face_id < 0)
df565ffe7247 (merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents: 59431
diff changeset
6368 return base_face_id;
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6369 face = FACE_FROM_ID (f, face_id);
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6370 if (!face)
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6371 return base_face_id;
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6372 merge_face_vectors (f, face->lface, attrs, 0);
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6373 }
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6374
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6375 /* Look up a realized face with the given face attributes,
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6376 or realize a new one for ASCII characters. */
90079
609c840fe65f (merge_faces): Fix argument to lookup_derived_face and
Kenichi Handa <handa@m17n.org>
parents: 90072
diff changeset
6377 return lookup_face (f, attrs);
59431
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6378 }
2f2c5349bc03 (merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents: 59146
diff changeset
6379
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6380
97194
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6381
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6382 #ifndef HAVE_X_WINDOWS
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6383 DEFUN ("x-load-color-file", Fx_load_color_file,
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6384 Sx_load_color_file, 1, 1, 0,
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6385 doc: /* Create an alist of color entries from an external file.
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6386
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6387 The file should define one named RGB color per line like so:
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6388 R G B name
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6389 where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
6390 (Lisp_Object filename)
97194
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6391 {
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6392 FILE *fp;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6393 Lisp_Object cmap = Qnil;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6394 Lisp_Object abspath;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6395
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6396 CHECK_STRING (filename);
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6397 abspath = Fexpand_file_name (filename, Qnil);
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6398
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6399 fp = fopen (SDATA (filename), "rt");
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6400 if (fp)
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6401 {
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6402 char buf[512];
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6403 int red, green, blue;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6404 int num;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6405
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6406 BLOCK_INPUT;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6407
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6408 while (fgets (buf, sizeof (buf), fp) != NULL) {
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6409 if (sscanf (buf, "%u %u %u %n", &red, &green, &blue, &num) == 3)
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6410 {
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6411 char *name = buf + num;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6412 num = strlen (name) - 1;
103359
eb941fcd33b4 x-load-color-file: avoid array bounds error
Jim Meyering <jim@meyering.net>
parents: 103228
diff changeset
6413 if (num >= 0 && name[num] == '\n')
97194
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6414 name[num] = 0;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6415 cmap = Fcons (Fcons (build_string (name),
97217
f0079131098b * xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents: 97200
diff changeset
6416 #ifdef WINDOWSNT
f0079131098b * xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents: 97200
diff changeset
6417 make_number (RGB (red, green, blue))),
97200
d53d10659659 commit patch to x-load-color-file posted by lekktu@gmail.com
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97198
diff changeset
6418 #else
97217
f0079131098b * xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents: 97200
diff changeset
6419 make_number ((red << 16) | (green << 8) | blue)),
97200
d53d10659659 commit patch to x-load-color-file posted by lekktu@gmail.com
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97198
diff changeset
6420 #endif
97194
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6421 cmap);
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6422 }
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6423 }
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6424 fclose (fp);
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6425
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6426 UNBLOCK_INPUT;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6427 }
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6428
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6429 return cmap;
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6430 }
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6431 #endif
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6432
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6433
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6434 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6435 Tests
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6436 ***********************************************************************/
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6437
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6438 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6439
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6440 /* Print the contents of the realized face FACE to stderr. */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6441
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6442 static void
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6443 dump_realized_face (face)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6444 struct face *face;
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6445 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6446 fprintf (stderr, "ID: %d\n", face->id);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6447 #ifdef HAVE_X_WINDOWS
60669
cffa9a821286 (x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60150
diff changeset
6448 fprintf (stderr, "gc: %ld\n", (long) face->gc);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6449 #endif
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6450 fprintf (stderr, "foreground: 0x%lx (%s)\n",
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6451 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
6452 SDATA (face->lface[LFACE_FOREGROUND_INDEX]));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6453 fprintf (stderr, "background: 0x%lx (%s)\n",
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6454 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
6455 SDATA (face->lface[LFACE_BACKGROUND_INDEX]));
94938
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
6456 if (face->font)
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
6457 fprintf (stderr, "font_name: %s (%s)\n",
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
6458 SDATA (face->font->props[FONT_NAME_INDEX]),
5752d7154afc Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents: 92237
diff changeset
6459 SDATA (face->lface[LFACE_FAMILY_INDEX]));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6460 #ifdef HAVE_X_WINDOWS
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6461 fprintf (stderr, "font = %p\n", face->font);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6462 #endif
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6463 fprintf (stderr, "fontset: %d\n", face->fontset);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6464 fprintf (stderr, "underline: %d (%s)\n",
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6465 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
6466 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX])));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6467 fprintf (stderr, "hash: %d\n", face->hash);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6468 }
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6469
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6470
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
6471 DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
6472 (Lisp_Object n)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6473 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6474 if (NILP (n))
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6475 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6476 int i;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6477
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6478 fprintf (stderr, "font selection order: ");
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6479 for (i = 0; i < DIM (font_sort_order); ++i)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6480 fprintf (stderr, "%d ", font_sort_order[i]);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6481 fprintf (stderr, "\n");
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6482
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6483 fprintf (stderr, "alternative fonts: ");
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6484 debug_print (Vface_alternative_font_family_alist);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6485 fprintf (stderr, "\n");
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6486
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
6487 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i)
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6488 Fdump_face (make_number (i));
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6489 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6490 else
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6491 {
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6492 struct face *face;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40603
diff changeset
6493 CHECK_NUMBER (n);
25678
1878f7ae0df5 (frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25661
diff changeset
6494 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n));
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6495 if (face == NULL)
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6496 error ("Not a valid face");
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6497 dump_realized_face (face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6498 }
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6499
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6500 return Qnil;
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6501 }
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6502
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6503
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6504 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
6505 0, 0, 0, doc: /* */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
6506 (void)
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6507 {
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6508 fprintf (stderr, "number of colors = %d\n", ncolors_allocated);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6509 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6510 fprintf (stderr, "number of GCs = %d\n", ngcs);
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6511 return Qnil;
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6512 }
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6513
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6514 #endif /* GLYPH_DEBUG != 0 */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6515
18083
c361afa561c5 Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 17047
diff changeset
6516
c361afa561c5 Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 17047
diff changeset
6517
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6518 /***********************************************************************
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6519 Initialization
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6520 ***********************************************************************/
2730
139740855fa6 * xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents: 2538
diff changeset
6521
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6522 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109118
diff changeset
6523 syms_of_xfaces (void)
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6524 {
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6525 Qface = intern_c_string ("face");
2391
226dcdb8ab67 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 2342
diff changeset
6526 staticpro (&Qface);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6527 Qface_no_inherit = intern_c_string ("face-no-inherit");
57107
0d0a17cf1b63 (Qface_no_inherit): New var.
Kim F. Storm <storm@cua.dk>
parents: 56694
diff changeset
6528 staticpro (&Qface_no_inherit);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6529 Qbitmap_spec_p = intern_c_string ("bitmap-spec-p");
25890
b10a34d40b55 (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25883
diff changeset
6530 staticpro (&Qbitmap_spec_p);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6531 Qframe_set_background_mode = intern_c_string ("frame-set-background-mode");
63642
cb0d171c8273 Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents: 63594
diff changeset
6532 staticpro (&Qframe_set_background_mode);
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6533
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6534 /* Lisp face attribute keywords. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6535 QCfamily = intern_c_string (":family");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6536 staticpro (&QCfamily);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6537 QCheight = intern_c_string (":height");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6538 staticpro (&QCheight);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6539 QCweight = intern_c_string (":weight");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6540 staticpro (&QCweight);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6541 QCslant = intern_c_string (":slant");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6542 staticpro (&QCslant);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6543 QCunderline = intern_c_string (":underline");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6544 staticpro (&QCunderline);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6545 QCinverse_video = intern_c_string (":inverse-video");
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6546 staticpro (&QCinverse_video);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6547 QCreverse_video = intern_c_string (":reverse-video");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6548 staticpro (&QCreverse_video);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6549 QCforeground = intern_c_string (":foreground");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6550 staticpro (&QCforeground);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6551 QCbackground = intern_c_string (":background");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6552 staticpro (&QCbackground);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6553 QCstipple = intern_c_string (":stipple");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6554 staticpro (&QCstipple);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6555 QCwidth = intern_c_string (":width");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6556 staticpro (&QCwidth);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6557 QCfont = intern_c_string (":font");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6558 staticpro (&QCfont);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6559 QCfontset = intern_c_string (":fontset");
89047
3b6234eb229c (QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88939
diff changeset
6560 staticpro (&QCfontset);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6561 QCbold = intern_c_string (":bold");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6562 staticpro (&QCbold);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6563 QCitalic = intern_c_string (":italic");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6564 staticpro (&QCitalic);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6565 QCoverline = intern_c_string (":overline");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6566 staticpro (&QCoverline);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6567 QCstrike_through = intern_c_string (":strike-through");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6568 staticpro (&QCstrike_through);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6569 QCbox = intern_c_string (":box");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6570 staticpro (&QCbox);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6571 QCinherit = intern_c_string (":inherit");
31178
ade2aeaf252e (QCinherit):
Miles Bader <miles@gnu.org>
parents: 30973
diff changeset
6572 staticpro (&QCinherit);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6573
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6574 /* Symbols used for Lisp face attribute values. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6575 QCcolor = intern_c_string (":color");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6576 staticpro (&QCcolor);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6577 QCline_width = intern_c_string (":line-width");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6578 staticpro (&QCline_width);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6579 QCstyle = intern_c_string (":style");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6580 staticpro (&QCstyle);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6581 Qreleased_button = intern_c_string ("released-button");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6582 staticpro (&Qreleased_button);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6583 Qpressed_button = intern_c_string ("pressed-button");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6584 staticpro (&Qpressed_button);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6585 Qnormal = intern_c_string ("normal");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6586 staticpro (&Qnormal);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6587 Qultra_light = intern_c_string ("ultra-light");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6588 staticpro (&Qultra_light);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6589 Qextra_light = intern_c_string ("extra-light");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6590 staticpro (&Qextra_light);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6591 Qlight = intern_c_string ("light");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6592 staticpro (&Qlight);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6593 Qsemi_light = intern_c_string ("semi-light");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6594 staticpro (&Qsemi_light);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6595 Qsemi_bold = intern_c_string ("semi-bold");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6596 staticpro (&Qsemi_bold);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6597 Qbold = intern_c_string ("bold");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6598 staticpro (&Qbold);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6599 Qextra_bold = intern_c_string ("extra-bold");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6600 staticpro (&Qextra_bold);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6601 Qultra_bold = intern_c_string ("ultra-bold");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6602 staticpro (&Qultra_bold);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6603 Qoblique = intern_c_string ("oblique");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6604 staticpro (&Qoblique);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6605 Qitalic = intern_c_string ("italic");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6606 staticpro (&Qitalic);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6607 Qreverse_oblique = intern_c_string ("reverse-oblique");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6608 staticpro (&Qreverse_oblique);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6609 Qreverse_italic = intern_c_string ("reverse-italic");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6610 staticpro (&Qreverse_italic);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6611 Qultra_condensed = intern_c_string ("ultra-condensed");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6612 staticpro (&Qultra_condensed);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6613 Qextra_condensed = intern_c_string ("extra-condensed");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6614 staticpro (&Qextra_condensed);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6615 Qcondensed = intern_c_string ("condensed");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6616 staticpro (&Qcondensed);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6617 Qsemi_condensed = intern_c_string ("semi-condensed");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6618 staticpro (&Qsemi_condensed);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6619 Qsemi_expanded = intern_c_string ("semi-expanded");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6620 staticpro (&Qsemi_expanded);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6621 Qexpanded = intern_c_string ("expanded");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6622 staticpro (&Qexpanded);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6623 Qextra_expanded = intern_c_string ("extra-expanded");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6624 staticpro (&Qextra_expanded);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6625 Qultra_expanded = intern_c_string ("ultra-expanded");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6626 staticpro (&Qultra_expanded);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6627 Qbackground_color = intern_c_string ("background-color");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6628 staticpro (&Qbackground_color);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6629 Qforeground_color = intern_c_string ("foreground-color");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6630 staticpro (&Qforeground_color);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6631 Qunspecified = intern_c_string ("unspecified");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6632 staticpro (&Qunspecified);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6633 Qignore_defface = intern_c_string (":ignore-defface");
66974
c52c20ff739f * xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 65912
diff changeset
6634 staticpro (&Qignore_defface);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6635
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6636 Qface_alias = intern_c_string ("face-alias");
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
6637 staticpro (&Qface_alias);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6638 Qdefault = intern_c_string ("default");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6639 staticpro (&Qdefault);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6640 Qtool_bar = intern_c_string ("tool-bar");
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25389
diff changeset
6641 staticpro (&Qtool_bar);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6642 Qregion = intern_c_string ("region");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6643 staticpro (&Qregion);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6644 Qfringe = intern_c_string ("fringe");
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6645 staticpro (&Qfringe);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6646 Qheader_line = intern_c_string ("header-line");
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
6647 staticpro (&Qheader_line);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6648 Qscroll_bar = intern_c_string ("scroll-bar");
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6649 staticpro (&Qscroll_bar);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6650 Qmenu = intern_c_string ("menu");
25883
2955c353186a (toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents: 25799
diff changeset
6651 staticpro (&Qmenu);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6652 Qcursor = intern_c_string ("cursor");
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6653 staticpro (&Qcursor);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6654 Qborder = intern_c_string ("border");
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6655 staticpro (&Qborder);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6656 Qmouse = intern_c_string ("mouse");
25592
c6be980d15a6 (recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6657 staticpro (&Qmouse);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6658 Qmode_line_inactive = intern_c_string ("mode-line-inactive");
43203
dd98ef3675e5 (Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents: 43069
diff changeset
6659 staticpro (&Qmode_line_inactive);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6660 Qvertical_border = intern_c_string ("vertical-border");
63649
144440a09db1 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents: 63642
diff changeset
6661 staticpro (&Qvertical_border);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6662 Qtty_color_desc = intern_c_string ("tty-color-desc");
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
6663 staticpro (&Qtty_color_desc);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6664 Qtty_color_standard_values = intern_c_string ("tty-color-standard-values");
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
6665 staticpro (&Qtty_color_standard_values);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6666 Qtty_color_by_index = intern_c_string ("tty-color-by-index");
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26601
diff changeset
6667 staticpro (&Qtty_color_by_index);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6668 Qtty_color_alist = intern_c_string ("tty-color-alist");
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
6669 staticpro (&Qtty_color_alist);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6670 Qscalable_fonts_allowed = intern_c_string ("scalable-fonts-allowed");
37394
7847d9b8bbff (Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37206
diff changeset
6671 staticpro (&Qscalable_fonts_allowed);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6672
31449
8797df6a9fa2 (Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31440
diff changeset
6673 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil);
8797df6a9fa2 (Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31440
diff changeset
6674 staticpro (&Vparam_value_alist);
30304
626d55ea66ef (face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents: 30235
diff changeset
6675 Vface_alternative_font_family_alist = Qnil;
626d55ea66ef (face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents: 30235
diff changeset
6676 staticpro (&Vface_alternative_font_family_alist);
33372
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
6677 Vface_alternative_font_registry_alist = Qnil;
2a665186a9e9 (Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33275
diff changeset
6678 staticpro (&Vface_alternative_font_registry_alist);
30304
626d55ea66ef (face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents: 30235
diff changeset
6679
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6680 defsubr (&Sinternal_make_lisp_face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6681 defsubr (&Sinternal_lisp_face_p);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6682 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
6683 #ifdef HAVE_WINDOW_SYSTEM
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6684 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
6685 #endif
27120
24a08208cf3a (syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents: 27114
diff changeset
6686 defsubr (&Scolor_gray_p);
24a08208cf3a (syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents: 27114
diff changeset
6687 defsubr (&Scolor_supported_p);
97194
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6688 #ifndef HAVE_X_WINDOWS
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6689 defsubr (&Sx_load_color_file);
d45e07b45d86 NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 97043
diff changeset
6690 #endif
40398
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
6691 defsubr (&Sface_attribute_relative_p);
560b1c474b1a (merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents: 40278
diff changeset
6692 defsubr (&Smerge_face_attribute);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6693 defsubr (&Sinternal_get_lisp_face_attribute);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6694 defsubr (&Sinternal_lisp_face_attribute_values);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6695 defsubr (&Sinternal_lisp_face_equal_p);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6696 defsubr (&Sinternal_lisp_face_empty_p);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6697 defsubr (&Sinternal_copy_lisp_face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6698 defsubr (&Sinternal_merge_in_global_face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6699 defsubr (&Sface_font);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6700 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
6701 defsubr (&Sdisplay_supports_face_attributes_p);
45718
e495189229e4 (Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents: 45412
diff changeset
6702 defsubr (&Scolor_distance);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6703 defsubr (&Sinternal_set_font_selection_order);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6704 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
6705 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
6706 defsubr (&Sface_attributes_as_vector);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6707 #if GLYPH_DEBUG
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6708 defsubr (&Sdump_face);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6709 defsubr (&Sshow_face_resources);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6710 #endif /* GLYPH_DEBUG */
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6711 defsubr (&Sclear_face_cache);
28529
b8ac36c58391 (tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6712 defsubr (&Stty_suppress_bold_inverse_default_colors);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6713
29711
913fab478495 (syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents: 29599
diff changeset
6714 #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
6715 defsubr (&Sdump_colors);
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
6716 #endif
8a2e32f7717e (Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29394
diff changeset
6717
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
6718 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
6719 doc: /* *Limit for font matching.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6720 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
6721 that number of fonts when searching for a matching font. */);
25270
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
6722 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT);
7c4983be66e4 (Vfont_list_limit): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25213
diff changeset
6723
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
6724 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
6725 doc: /* List of global face definitions (for internal use only.) */);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6726 Vface_new_frame_defaults = Qnil;
30235
5a0d447b7eea check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents: 30211
diff changeset
6727
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
6728 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
6729 doc: /* *Default stipple pattern used on monochrome displays.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6730 This stipple pattern is used on monochrome displays
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6731 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
6732 See `set-face-stipple' for possible values for this variable. */);
105942
5fc80e6b5b7c * xfns.c (syms_of_xfns): Use make_pure_string instead of build_string.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105885
diff changeset
6733 Vface_default_stipple = make_pure_c_string ("gray3");
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6734
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
6735 DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist,
111133
d9b0552c39a6 Remove duplicate definition of tty-defined-color-alist.
Glenn Morris <rgm@gnu.org>
parents: 109653
diff changeset
6736 doc: /* An alist of defined terminal colors and their RGB values.
d9b0552c39a6 Remove duplicate definition of tty-defined-color-alist.
Glenn Morris <rgm@gnu.org>
parents: 109653
diff changeset
6737 See the docstring of `tty-color-alist' for the details. */);
30973
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
6738 Vtty_defined_color_alist = Qnil;
2f3dc355bcaf (lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents: 30707
diff changeset
6739
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
6740 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
6741 doc: /* Allowed scalable fonts.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6742 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
6743 A value of t means allow any scalable font.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6744 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
6745 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
6746 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
6747 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
6748 Vscalable_fonts_allowed = Qnil;
18083
c361afa561c5 Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 17047
diff changeset
6749
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
6750 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
6751 doc: /* List of ignored fonts.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6752 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
6753 ignore. */);
34629
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
6754 Vface_ignored_fonts = Qnil;
10675adcbf6f (Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents: 34289
diff changeset
6755
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6756 DEFVAR_LISP ("face-remapping-alist", &Vface_remapping_alist,
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6757 doc: /* Alist of face remappings.
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6758 Each element is of the form:
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6759
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6760 (FACE REPLACEMENT...),
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6761
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6762 which causes display of the face FACE to use REPLACEMENT... instead.
109318
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6763 REPLACEMENT... is interpreted the same way as the value of a `face'
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6764 text property: it may be (1) A face name, (2) A list of face names,
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6765 (3) A property-list of face attribute/value pairs, or (4) A list of
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6766 face names or lists containing face attribute/value pairs.
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6767
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6768 Multiple entries in REPLACEMENT... are merged together to form the final
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6769 result, with faces or attributes earlier in the list taking precedence
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6770 over those that are later.
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6771
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6772 Face-name remapping cycles are suppressed; recursive references use the
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6773 underlying face instead of the remapped face. So a remapping of the form:
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6774
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6775 (FACE EXTRA-FACE... FACE)
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6776
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6777 or:
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6778
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6779 (FACE (FACE-ATTR VAL ...) FACE)
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6780
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6781 will cause EXTRA-FACE... or (FACE-ATTR VAL ...) to be _merged_ with the
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6782 existing definition of FACE. Note that for the default face, this isn't
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6783 necessary, as every face inherits from the default face.
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6784
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6785 Making this variable buffer-local is a good way to allow buffer-specific
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6786 face definitions. For instance, the mode my-mode could define a face
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6787 `my-mode-default', and then in the mode setup function, do:
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6788
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6789 (set (make-local-variable 'face-remapping-alist)
109318
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6790 '((default my-mode-default)))).
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6791
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6792 Because Emacs normally only redraws screen areas when the underlying
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6793 buffer contents change, you may need to call `redraw-display' after
06b03915afed * src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents: 109302
diff changeset
6794 changing this variable for it to take effect. */);
95457
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6795 Vface_remapping_alist = Qnil;
415f68458e61 Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents: 95377
diff changeset
6796
50515
98bdd2203d85 (Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 50412
diff changeset
6797 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
6798 doc: /* Alist of fonts vs the rescaling factors.
100383
e1b931c8770a (font_rescale_ratio): Moved to font.c.
Kenichi Handa <handa@m17n.org>
parents: 100102
diff changeset
6799 Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where
e1b931c8770a (font_rescale_ratio): Moved to font.c.
Kenichi Handa <handa@m17n.org>
parents: 100102
diff changeset
6800 FONT-PATTERN is a font-spec or a regular expression matching a font name, and
50515
98bdd2203d85 (Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 50412
diff changeset
6801 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
6802 \(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
6803 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
6804 Vface_font_rescale_alist = Qnil;
98bdd2203d85 (Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 50412
diff changeset
6805
27982
86de01dd01eb Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents: 27960
diff changeset
6806 #ifdef HAVE_WINDOW_SYSTEM
25890
b10a34d40b55 (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25883
diff changeset
6807 defsubr (&Sbitmap_spec_p);
24995
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6808 defsubr (&Sx_list_fonts);
b52cdabf9253 Implemented from scratch.
Gerd Moellmann <gerd@gnu.org>
parents: 23730
diff changeset
6809 defsubr (&Sinternal_face_x_get_resource);
25661
a6e2ae7964fb (Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents: 25592
diff changeset
6810 defsubr (&Sx_family_fonts);
99995
6f62aec59b3d (Fx_font_family_list, syms_of_xfaces): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 99934
diff changeset
6811 #endif
2336
7aaafd275bec Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6812 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52203
diff changeset
6813