annotate src/faces.c @ 367:a4f53d9b3154 r21-1-13

Import from CVS: tag r21-1-13
author cvs
date Mon, 13 Aug 2007 11:01:07 +0200
parents afd57c14dfc8
children cc15677e0335
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* "Face" primitives
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1994 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Copyright (C) 1995 Board of Trustees, University of Illinois.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 Copyright (C) 1995, 1996 Ben Wing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 Copyright (C) 1995 Sun Microsystems, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 /* Written by Chuck Thompson and Ben Wing,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 based loosely on old face code by Jamie Zawinski. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 #include "device.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 #include "elhash.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 #include "extents.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 #include "hash.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 #include "objects.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 #include "specifier.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 #include "window.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 Lisp_Object Qfacep;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 Lisp_Object Qforeground, Qbackground, Qdisplay_table;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 Lisp_Object Qbackground_pixmap, Qunderline, Qdim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 Lisp_Object Qblinking, Qstrikethru;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 Lisp_Object Qinit_face_from_resources;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 Lisp_Object Qinit_frame_faces;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 Lisp_Object Qinit_device_faces;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 Lisp_Object Qinit_global_faces;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 /* These faces are used directly internally. We use these variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 to be able to reference them directly and save the overhead of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 calling Ffind_face. */
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
57 Lisp_Object Vdefault_face, Vmodeline_face, Vgui_element_face;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 Lisp_Object Vleft_margin_face, Vright_margin_face, Vtext_cursor_face;
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
59 Lisp_Object Vpointer_face, Vvertical_divider_face, Vtoolbar_face;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 /* Qdefault, Qhighlight defined in general.c */
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
62 Lisp_Object Qmodeline, Qgui_element, Qleft_margin, Qright_margin, Qtext_cursor;
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
63 Lisp_Object Qvertical_divider;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 /* In the old implementation Vface_list was a list of the face names,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 not the faces themselves. We now distinguish between permanent and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 temporary faces. Permanent faces are kept in a regular hash table,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 temporary faces in a weak hash table. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 Lisp_Object Vpermanent_faces_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 Lisp_Object Vtemporary_faces_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 Lisp_Object Vbuilt_in_face_specifiers;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 mark_face (Lisp_Object obj, void (*markobj) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 struct Lisp_Face *face = XFACE (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 ((markobj) (face->name));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 ((markobj) (face->doc_string));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 ((markobj) (face->foreground));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 ((markobj) (face->background));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 ((markobj) (face->font));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 ((markobj) (face->display_table));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 ((markobj) (face->background_pixmap));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 ((markobj) (face->underline));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 ((markobj) (face->strikethru));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 ((markobj) (face->highlight));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 ((markobj) (face->dim));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 ((markobj) (face->blinking));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 ((markobj) (face->reverse));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 ((markobj) (face->charsets_warned_about));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
98 return face->plist;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 print_face (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 struct Lisp_Face *face = XFACE (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 if (print_readably)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 write_c_string ("#s(face name ", printcharfun);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 print_internal (face->name, printcharfun, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 write_c_string (")", printcharfun);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 write_c_string ("#<face ", printcharfun);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 print_internal (face->name, printcharfun, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 if (!NILP (face->doc_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 write_c_string (" ", printcharfun);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 print_internal (face->doc_string, printcharfun, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 write_c_string (">", printcharfun);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 /* Faces are equal if all of their display attributes are equal. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 don't compare names or doc-strings, because that would make equal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 be eq.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 This isn't concerned with "unspecified" attributes, that's what
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 #'face-differs-from-default-p is for. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 face_equal (Lisp_Object o1, Lisp_Object o2, int depth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 struct Lisp_Face *f1 = XFACE (o1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 struct Lisp_Face *f2 = XFACE (o2);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 depth++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
139 return
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
140 (internal_equal (f1->foreground, f2->foreground, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
141 internal_equal (f1->background, f2->background, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
142 internal_equal (f1->font, f2->font, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
143 internal_equal (f1->display_table, f2->display_table, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
144 internal_equal (f1->background_pixmap, f2->background_pixmap, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
145 internal_equal (f1->underline, f2->underline, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
146 internal_equal (f1->strikethru, f2->strikethru, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
147 internal_equal (f1->highlight, f2->highlight, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
148 internal_equal (f1->dim, f2->dim, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
149 internal_equal (f1->blinking, f2->blinking, depth) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
150 internal_equal (f1->reverse, f2->reverse, depth) &&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
152 ! plists_differ (f1->plist, f2->plist, 0, 0, depth + 1));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 static unsigned long
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 face_hash (Lisp_Object obj, int depth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 struct Lisp_Face *f = XFACE (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 depth++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 /* No need to hash all of the elements; that would take too long.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 Just hash the most common ones. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 return HASH3 (internal_hash (f->foreground, depth),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 internal_hash (f->background, depth),
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
166 internal_hash (f->font, depth));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 face_getprop (Lisp_Object obj, Lisp_Object prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 struct Lisp_Face *f = XFACE (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
174 return
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
175 ((EQ (prop, Qforeground)) ? f->foreground :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
176 (EQ (prop, Qbackground)) ? f->background :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
177 (EQ (prop, Qfont)) ? f->font :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
178 (EQ (prop, Qdisplay_table)) ? f->display_table :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
179 (EQ (prop, Qbackground_pixmap)) ? f->background_pixmap :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
180 (EQ (prop, Qunderline)) ? f->underline :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
181 (EQ (prop, Qstrikethru)) ? f->strikethru :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
182 (EQ (prop, Qhighlight)) ? f->highlight :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
183 (EQ (prop, Qdim)) ? f->dim :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
184 (EQ (prop, Qblinking)) ? f->blinking :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
185 (EQ (prop, Qreverse)) ? f->reverse :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
186 (EQ (prop, Qdoc_string)) ? f->doc_string :
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
187 external_plist_get (&f->plist, prop, 0, ERROR_ME));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 face_putprop (Lisp_Object obj, Lisp_Object prop, Lisp_Object value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 struct Lisp_Face *f = XFACE (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
195 if (EQ (prop, Qforeground) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
196 EQ (prop, Qbackground) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
197 EQ (prop, Qfont) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
198 EQ (prop, Qdisplay_table) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
199 EQ (prop, Qbackground_pixmap) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
200 EQ (prop, Qunderline) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
201 EQ (prop, Qstrikethru) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
202 EQ (prop, Qhighlight) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
203 EQ (prop, Qdim) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
204 EQ (prop, Qblinking) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
205 EQ (prop, Qreverse))
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
206 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 if (EQ (prop, Qdoc_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 if (!NILP (value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 CHECK_STRING (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 f->doc_string = value;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 external_plist_put (&f->plist, prop, value, 0, ERROR_ME);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 face_remprop (Lisp_Object obj, Lisp_Object prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 struct Lisp_Face *f = XFACE (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
225 if (EQ (prop, Qforeground) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
226 EQ (prop, Qbackground) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
227 EQ (prop, Qfont) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
228 EQ (prop, Qdisplay_table) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
229 EQ (prop, Qbackground_pixmap) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
230 EQ (prop, Qunderline) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
231 EQ (prop, Qstrikethru) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
232 EQ (prop, Qhighlight) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
233 EQ (prop, Qdim) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
234 EQ (prop, Qblinking) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
235 EQ (prop, Qreverse))
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
236 return -1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 if (EQ (prop, Qdoc_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 f->doc_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 return external_remprop (&f->plist, prop, 0, ERROR_ME);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 face_plist (Lisp_Object obj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
250 struct Lisp_Face *face = XFACE (obj);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
251 Lisp_Object result = face->plist;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
253 result = cons3 (Qreverse, face->reverse, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
254 result = cons3 (Qblinking, face->blinking, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
255 result = cons3 (Qdim, face->dim, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
256 result = cons3 (Qhighlight, face->highlight, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
257 result = cons3 (Qstrikethru, face->strikethru, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
258 result = cons3 (Qunderline, face->underline, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
259 result = cons3 (Qbackground_pixmap, face->background_pixmap, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
260 result = cons3 (Qdisplay_table, face->display_table, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
261 result = cons3 (Qfont, face->font, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
262 result = cons3 (Qbackground, face->background, result);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
263 result = cons3 (Qforeground, face->foreground, result);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
265 return result;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
268 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("face", face,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
269 mark_face, print_face, 0, face_equal,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
270 face_hash, face_getprop,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
271 face_putprop, face_remprop,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
272 face_plist, struct Lisp_Face);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 /* face read syntax */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 face_name_validate (Lisp_Object keyword, Lisp_Object value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 Error_behavior errb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 if (ERRB_EQ (errb, ERROR_ME))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 CHECK_SYMBOL (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 return SYMBOLP (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 face_validate (Lisp_Object data, Error_behavior errb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 int name_seen = 0;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
295 Lisp_Object valw = Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 data = Fcdr (data); /* skip over Qface */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 while (!NILP (data))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 Lisp_Object keyw = Fcar (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 data = Fcdr (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 valw = Fcar (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 data = Fcdr (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 if (EQ (keyw, Qname))
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
306 name_seen = 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 if (!name_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 maybe_error (Qface, errb, "No face name given");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 if (NILP (Ffind_face (valw)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 maybe_signal_simple_error ("No such face", valw, Qface, errb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 face_instantiate (Lisp_Object data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 return Fget_face (Fcar (Fcdr (data)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 /****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 * utility functions *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 reset_face (struct Lisp_Face *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 f->name = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 f->doc_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 f->dirty = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 f->foreground = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 f->background = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 f->font = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 f->display_table = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 f->background_pixmap = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 f->underline = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 f->strikethru = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 f->highlight = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 f->dim = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 f->blinking = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 f->reverse = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 f->plist = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 f->charsets_warned_about = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 static struct Lisp_Face *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 allocate_face (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 struct Lisp_Face *result =
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
362 alloc_lcrecord_type (struct Lisp_Face, lrecord_face);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 reset_face (result);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 return result;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 /* We store the faces in hash tables with the names as the key and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 actual face object as the value. Occasionally we need to use them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 in a list format. These routines provide us with that. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 struct face_list_closure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 Lisp_Object *face_list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 223
diff changeset
377 static int
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 add_face_to_list_mapper (CONST void *hash_key, void *hash_contents,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 void *face_list_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 Lisp_Object key, contents;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 Lisp_Object *face_list;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
384 struct face_list_closure *fcl =
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
385 (struct face_list_closure *) face_list_closure;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 CVOID_TO_LISP (key, hash_key);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 VOID_TO_LISP (contents, hash_contents);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 face_list = fcl->face_list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 *face_list = Fcons (XFACE (contents)->name, *face_list);
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 223
diff changeset
391 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 faces_list_internal (Lisp_Object list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 Lisp_Object face_list = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 struct gcpro gcpro1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 struct face_list_closure face_list_closure;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 GCPRO1 (face_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 face_list_closure.face_list = &face_list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 elisp_maphash (add_face_to_list_mapper, list, &face_list_closure);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 return face_list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 permanent_faces_list (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 return faces_list_internal (Vpermanent_faces_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 temporary_faces_list (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 return faces_list_internal (Vtemporary_faces_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 223
diff changeset
422 static int
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 mark_face_as_clean_mapper (CONST void *hash_key, void *hash_contents,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 void *flag_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 Lisp_Object key, contents;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
428 int *flag = (int *) flag_closure;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 CVOID_TO_LISP (key, hash_key);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 VOID_TO_LISP (contents, hash_contents);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 XFACE (contents)->dirty = *flag;
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 223
diff changeset
432 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 mark_all_faces_internal (int flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 elisp_maphash (mark_face_as_clean_mapper, Vpermanent_faces_cache, &flag);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 elisp_maphash (mark_face_as_clean_mapper, Vtemporary_faces_cache, &flag);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 mark_all_faces_as_clean (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 mark_all_faces_internal (0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
448 /* Currently unused (see the comment in face_property_was_changed()). */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
449 #if 0
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 /* #### OBSOLETE ME, PLEASE. Maybe. Maybe this is just as good as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 any other solution. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 struct face_inheritance_closure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 Lisp_Object property;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 update_inheritance_mapper_internal (Lisp_Object cur_face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 Lisp_Object inh_face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 Lisp_Object property)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 /* #### fix this function */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 Lisp_Object elt = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 struct gcpro gcpro1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 GCPRO1 (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 for (elt = FACE_PROPERTY_SPEC_LIST (cur_face, property, Qall);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 !NILP (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 elt = XCDR (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
473 Lisp_Object values = XCDR (XCAR (elt));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 for (; !NILP (values); values = XCDR (values))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 Lisp_Object value = XCDR (XCAR (values));
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
478 if (VECTORP (value) && XVECTOR_LENGTH (value))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
480 if (EQ (Ffind_face (XVECTOR_DATA (value)[0]), inh_face))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 Fset_specifier_dirty_flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 (FACE_PROPERTY_SPECIFIER (inh_face, property));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 223
diff changeset
490 static int
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 update_face_inheritance_mapper (CONST void *hash_key, void *hash_contents,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 void *face_inheritance_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 Lisp_Object key, contents;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
495 struct face_inheritance_closure *fcl =
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
496 (struct face_inheritance_closure *) face_inheritance_closure;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 CVOID_TO_LISP (key, hash_key);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 VOID_TO_LISP (contents, hash_contents);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 if (EQ (fcl->property, Qfont))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 update_inheritance_mapper_internal (contents, fcl->face, Qfont);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
505 else if (EQ (fcl->property, Qforeground) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
506 EQ (fcl->property, Qbackground))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 update_inheritance_mapper_internal (contents, fcl->face, Qforeground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 update_inheritance_mapper_internal (contents, fcl->face, Qbackground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
511 else if (EQ (fcl->property, Qunderline) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
512 EQ (fcl->property, Qstrikethru) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
513 EQ (fcl->property, Qhighlight) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
514 EQ (fcl->property, Qdim) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
515 EQ (fcl->property, Qblinking) ||
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
516 EQ (fcl->property, Qreverse))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 update_inheritance_mapper_internal (contents, fcl->face, Qunderline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 update_inheritance_mapper_internal (contents, fcl->face, Qstrikethru);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 update_inheritance_mapper_internal (contents, fcl->face, Qhighlight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 update_inheritance_mapper_internal (contents, fcl->face, Qdim);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 update_inheritance_mapper_internal (contents, fcl->face, Qblinking);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 update_inheritance_mapper_internal (contents, fcl->face, Qreverse);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 }
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 223
diff changeset
525 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 update_faces_inheritance (Lisp_Object face, Lisp_Object property)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 struct face_inheritance_closure face_inheritance_closure;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 struct gcpro gcpro1, gcpro2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 GCPRO2 (face, property);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 face_inheritance_closure.face = face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 face_inheritance_closure.property = property;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 elisp_maphash (update_face_inheritance_mapper, Vpermanent_faces_cache,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 &face_inheritance_closure);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 elisp_maphash (update_face_inheritance_mapper, Vtemporary_faces_cache,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 &face_inheritance_closure);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 }
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
545 #endif /* 0 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 face_property_matching_instance (Lisp_Object face, Lisp_Object property,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 Lisp_Object charset, Lisp_Object domain,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 Error_behavior errb, int no_fallback,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 Lisp_Object depth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 Lisp_Object retval =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 specifier_instance_no_quit (Fget (face, property, Qnil), charset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 domain, errb, no_fallback, depth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 if (UNBOUNDP (retval) && !no_fallback)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 if (EQ (property, Qfont))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 if (NILP (memq_no_quit (charset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 XFACE (face)->charsets_warned_about)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 62
diff changeset
564 #ifdef MULE
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
565 if (! UNBOUNDP (charset))
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
566 warn_when_safe
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
567 (Qfont, Qwarning,
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
568 "Unable to instantiate font for face %s, charset %s",
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
569 string_data (symbol_name
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
570 (XSYMBOL (XFACE (face)->name))),
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
571 string_data (symbol_name
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
572 (XSYMBOL (XCHARSET_NAME (charset)))));
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
573 else
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 62
diff changeset
574 #endif
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
575 warn_when_safe (Qfont, Qwarning,
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
576 "Unable to instantiate font for face %s",
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
577 string_data (symbol_name
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
578 (XSYMBOL (XFACE (face)->name))));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 XFACE (face)->charsets_warned_about =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 Fcons (charset, XFACE (face)->charsets_warned_about);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 retval = Vthe_null_font_instance;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
590 DEFUN ("facep", Ffacep, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 Return non-nil if OBJECT is a face.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
592 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
593 (object))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
595 return FACEP (object) ? Qt : Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
598 DEFUN ("find-face", Ffind_face, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 Retrieve the face of the given name.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 If FACE-OR-NAME is a face object, it is simply returned.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 Otherwise, FACE-OR-NAME should be a symbol. If there is no such face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 nil is returned. Otherwise the associated face object is returned.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
603 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
604 (face_or_name))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 Lisp_Object retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 if (FACEP (face_or_name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 return face_or_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 CHECK_SYMBOL (face_or_name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 /* Check if the name represents a permanent face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 retval = Fgethash (face_or_name, Vpermanent_faces_cache, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 if (!NILP (retval))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 /* Check if the name represents a temporary face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 return Fgethash (face_or_name, Vtemporary_faces_cache, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
621 DEFUN ("get-face", Fget_face, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 Retrieve the face of the given name.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 Same as `find-face' except an error is signalled if there is no such
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 face instead of returning nil.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
625 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
626 (name))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 Lisp_Object face = Ffind_face (name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 if (NILP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 signal_simple_error ("No such face", name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 return face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
635 DEFUN ("face-name", Fface_name, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 Return the name of the given face.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
637 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
638 (face))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
640 return XFACE (Fget_face (face))->name;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
643 DEFUN ("built-in-face-specifiers", Fbuilt_in_face_specifiers, 0, 0, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 Return a list of all built-in face specifier properties.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 Don't modify this list!
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
646 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
647 ())
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 return Vbuilt_in_face_specifiers;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 /* These values are retrieved so often that we make a special
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 function.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 default_face_font_info (Lisp_Object domain, int *ascent, int *descent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 int *height, int *width, int *proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 Lisp_Object font_instance;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 if (noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 if (ascent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 *ascent = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 if (descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 *descent = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 if (height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 *height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 if (width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 *width = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 if (proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 *proportional_p = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 /* We use ASCII here. This is probably reasonable because the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 people calling this function are using the resulting values to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 come up with overall sizes for windows and frames. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 if (WINDOWP (domain))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 struct face_cachel *cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 struct window *w = XWINDOW (domain);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 /* #### It's possible for this function to get called when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 face cachels have not been initialized. I don't know why. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 cachel = WINDOW_FACE_CACHEL (w, DEFAULT_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 font_instance = FACE_FONT (Vdefault_face, domain, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 if (height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 *height = XFONT_INSTANCE (font_instance)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 if (width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 *width = XFONT_INSTANCE (font_instance)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 if (ascent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 *ascent = XFONT_INSTANCE (font_instance)->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 if (descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 *descent = XFONT_INSTANCE (font_instance)->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 if (proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 *proportional_p = XFONT_INSTANCE (font_instance)->proportional_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 default_face_height_and_width (Lisp_Object domain,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 int *height, int *width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 default_face_font_info (domain, 0, 0, height, width, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
716 void
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
717 default_face_height_and_width_1 (Lisp_Object domain,
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
718 int *height, int *width)
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
719 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
720 if (window_system_pixelated_geometry (domain))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
721 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
722 if (height)
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
723 *height = 1;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
724 if (width)
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
725 *width = 1;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
726 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
727 else
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
728 default_face_height_and_width (domain, height, width);
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
729 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
730
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
731 DEFUN ("face-list", Fface_list, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 Return a list of the names of all defined faces.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 If TEMPORARY is nil, only the permanent faces are included.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 If it is t, only the temporary faces are included. If it is any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 other non-nil value both permanent and temporary are included.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
736 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
737 (temporary))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 Lisp_Object face_list = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 /* Added the permanent faces, if requested. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 if (NILP (temporary) || !EQ (Qt, temporary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 face_list = permanent_faces_list ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 if (!NILP (temporary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 struct gcpro gcpro1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 GCPRO1 (face_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 face_list = nconc2 (face_list, temporary_faces_list ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 return face_list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
756 DEFUN ("make-face", Fmake_face, 1, 3, 0, /*
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
757 Define and return a new FACE described by DOC-STRING.
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
758 You can modify the font, color, etc of a face with the set-face-* functions.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 If the face already exists, it is unmodified.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 If TEMPORARY is non-nil, this face will cease to exist if not in use.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
761 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
762 (name, doc_string, temporary))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 /* This function can GC if initialized is non-zero */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 struct Lisp_Face *f;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 CHECK_SYMBOL (name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 if (!NILP (doc_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 CHECK_STRING (doc_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 face = Ffind_face (name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 if (!NILP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 return face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 f = allocate_face ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 XSETFACE (face, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 f->name = name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 f->doc_string = doc_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 f->foreground = Fmake_specifier (Qcolor);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 set_color_attached_to (f->foreground, face, Qforeground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 f->background = Fmake_specifier (Qcolor);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 set_color_attached_to (f->background, face, Qbackground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 f->font = Fmake_specifier (Qfont);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 set_font_attached_to (f->font, face, Qfont);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 f->background_pixmap = Fmake_specifier (Qimage);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 set_image_attached_to (f->background_pixmap, face, Qbackground_pixmap);
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 70
diff changeset
789 f->display_table = Fmake_specifier (Qdisplay_table);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 f->underline = Fmake_specifier (Qface_boolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 set_face_boolean_attached_to (f->underline, face, Qunderline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 f->strikethru = Fmake_specifier (Qface_boolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 set_face_boolean_attached_to (f->strikethru, face, Qstrikethru);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 f->highlight = Fmake_specifier (Qface_boolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 set_face_boolean_attached_to (f->highlight, face, Qhighlight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 f->dim = Fmake_specifier (Qface_boolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 set_face_boolean_attached_to (f->dim, face, Qdim);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 f->blinking = Fmake_specifier (Qface_boolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 set_face_boolean_attached_to (f->blinking, face, Qblinking);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 f->reverse = Fmake_specifier (Qface_boolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 set_face_boolean_attached_to (f->reverse, face, Qreverse);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 if (!NILP (Vdefault_face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 /* If the default face has already been created, set it as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 the default fallback specifier for all the specifiers we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 just created. This implements the standard "all faces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 inherit from default" behavior. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 set_specifier_fallback (f->foreground,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 Fget (Vdefault_face, Qforeground, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 set_specifier_fallback (f->background,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 Fget (Vdefault_face, Qbackground, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 set_specifier_fallback (f->font,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 Fget (Vdefault_face, Qfont, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 set_specifier_fallback (f->background_pixmap,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 Fget (Vdefault_face, Qbackground_pixmap,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 set_specifier_fallback (f->display_table,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 Fget (Vdefault_face, Qdisplay_table, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 set_specifier_fallback (f->underline,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 Fget (Vdefault_face, Qunderline, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 set_specifier_fallback (f->strikethru,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 Fget (Vdefault_face, Qstrikethru, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 set_specifier_fallback (f->highlight,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 Fget (Vdefault_face, Qhighlight, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 set_specifier_fallback (f->dim,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 Fget (Vdefault_face, Qdim, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 set_specifier_fallback (f->blinking,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 Fget (Vdefault_face, Qblinking, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 set_specifier_fallback (f->reverse,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 Fget (Vdefault_face, Qreverse, Qunbound));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 /* Add the face to the appropriate list. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 if (NILP (temporary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 Fputhash (name, face, Vpermanent_faces_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 Fputhash (name, face, Vtemporary_faces_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 /* Note that it's OK if we dump faces.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 When we start up again when we're not noninteractive,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 `init-global-faces' is called and it resources all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 existing faces. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 if (initialized && !noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 struct gcpro gcpro1, gcpro2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 GCPRO2 (name, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 call1 (Qinit_face_from_resources, name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 return face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 initialization code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 init_global_faces (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 /* When making the initial terminal device, there is no Lisp code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 loaded, so we can't do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 if (initialized && !noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 call_critical_lisp_code (d, Qinit_global_faces, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 init_device_faces (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 {
249
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 241
diff changeset
874 /* This function can call lisp */
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 241
diff changeset
875
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 /* When making the initial terminal device, there is no Lisp code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 loaded, so we can't do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 if (initialized)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 Lisp_Object tdevice;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 XSETDEVICE (tdevice, d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 call_critical_lisp_code (d, Qinit_device_faces, tdevice);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 init_frame_faces (struct frame *frm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 /* When making the initial terminal device, there is no Lisp code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 loaded, so we can't do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 if (initialized)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 Lisp_Object tframe;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 XSETFRAME (tframe, frm);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 /* DO NOT change the selected frame here. If the debugger goes off
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 it will try and display on the frame being created, but it is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 ready for that yet and a horrible death will occur. Any random
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 code depending on the selected-frame as an implicit arg should be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 tracked down and shot. For the benefit of the one known,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 xpm-color-symbols, make-frame sets the variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 Vframe_being_created to the frame it is making and sets it to nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 when done. Internal functions that this could trigger which are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 currently depending on selected-frame should use this instead. It
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 is not currently visible at the lisp level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 call_critical_lisp_code (XDEVICE (FRAME_DEVICE (frm)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 Qinit_frame_faces, tframe);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 /****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 * face cache element functions *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 #### Here is a description of how the face cache elements ought
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 to be redone. It is *NOT* how they work currently:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 However, when I started to go about implementing this, I realized
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 that there are all sorts of subtle problems with cache coherency
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 that are coming up. As it turns out, these problems don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 manifest themselves now due to the brute-force "kill 'em all"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 approach to cache invalidation when faces change; but if this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 is ever made smarter, these problems are going to come up, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 some of them are very non-obvious.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 I'm thinking of redoing the cache code a bit to avoid these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 coherency problems. The bulk of the problems will arise because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 the current display structures have simple indices into the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 face cache, but the cache can be changed at various times,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 which could make the current display structures incorrect.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 I guess the dirty and updated flags are an attempt to fix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 this, but this approach doesn't really work.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 Here's an approach that should keep things clean and unconfused:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 1) Imagine a "virtual face cache" that can grow arbitrarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 big and for which the only thing allowed is to add new
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 elements. Existing elements cannot be removed or changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 This way, any pointers in the existing redisplay structure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 into the cache never get screwed up. (This is important
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 because even if a cache element is out of date, if there's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 a pointer to it then its contents still accurately describe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 the way the text currently looks on the screen.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 2) Each element in the virtual cache either describes exactly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 one face, or describes the merger of a number of faces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 by some process. In order to simplify things, for mergers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 we do not record which faces or ordering was used, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 simply that this cache element is the result of merging.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 Unlike the current implementation, it's important that a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 single cache element not be used to both describe a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 single face and describe a merger, even if all the property
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 values are the same.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 3) Each cache element can be clean or dirty. "Dirty" means
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 that the face that the element points to has been changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 this gets set at the time the face is changed. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 way, when looking up a value in the cache, you can determine
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 whether it's out of date or not. For merged faces it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 does not matter -- we don't record the faces or priority
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 used to create the merger, so it's impossible to look up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 one of these faces. We have to recompute it each time.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 Luckily, this is fine -- doing the merge is much
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 less expensive than recomputing the properties of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 single face.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 4) For each cache element, we keep a hash value. (In order
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 to hash the boolean properties, we convert each of them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 into a different large prime number so that the hashing works
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 well.) This allows us, when comparing runes, to properly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 determine whether the face for that rune has changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 This will be especially important for TTY's, where there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 aren't that many faces and minimizing redraw is very
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 important.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 5) We can't actually keep an infinite cache, but that doesn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 really matter that much. The only elements we care about
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 are those that are used by either the current or desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 display structs. Therefore, we keep a per-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 redisplay iteration number, and mark each element with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 that number as we use it. Just after outputting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 window and synching the redisplay structs, we go through
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 the cache and invalidate all elements that are not clean
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 elements referring to a particular face and that do not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 have an iteration number equal to the current one. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 keep them in a chain, and use them to allocate new
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 elements when possible instead of increasing the Dynarr.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 /* mark for GC a dynarr of face cachels. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 mark_face_cachels (face_cachel_dynarr *elements,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 void (*markobj) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 if (!elements)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 for (elt = 0; elt < Dynarr_length (elements); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 struct face_cachel *cachel = Dynarr_atp (elements, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 for (i = 0; i < NUM_LEADING_BYTES; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 if (!NILP (cachel->font[i]) && !UNBOUNDP (cachel->font[i]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 ((markobj) (cachel->font[i]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 ((markobj) (cachel->face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 ((markobj) (cachel->foreground));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 ((markobj) (cachel->background));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 ((markobj) (cachel->display_table));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 ((markobj) (cachel->background_pixmap));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 /* ensure that the given cachel contains an updated font value for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 the given charset. Return the updated font value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 ensure_face_cachel_contains_charset (struct face_cachel *cachel,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 Lisp_Object domain, Lisp_Object charset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 Lisp_Object new_val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 Lisp_Object face = cachel->face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 int bound = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 int offs = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 if (!UNBOUNDP (cachel->font[offs])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 && cachel->font_updated[offs])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 return cachel->font[offs];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 if (UNBOUNDP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 /* a merged face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 struct window *w = XWINDOW (domain);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 new_val = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 cachel->font_specified[offs] = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 for (i = 0; i < cachel->nfaces; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 struct face_cachel *oth;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1047
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 oth = Dynarr_atp (w->face_cachels,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 FACE_CACHEL_FINDEX_UNSAFE (cachel, i));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 /* Tout le monde aime la recursion */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 ensure_face_cachel_contains_charset (oth, domain, charset);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1052
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 if (oth->font_specified[offs])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 new_val = oth->font[offs];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 cachel->font_specified[offs] = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 if (!cachel->font_specified[offs])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 /* need to do the default face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 struct face_cachel *oth =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 Dynarr_atp (w->face_cachels, DEFAULT_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 ensure_face_cachel_contains_charset (oth, domain, charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 new_val = oth->font[offs];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 if (!UNBOUNDP (cachel->font[offs]) && !EQ (cachel->font[offs], new_val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 cachel->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 cachel->font_updated[offs] = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 cachel->font[offs] = new_val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 return new_val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 new_val = face_property_matching_instance (face, Qfont, charset, domain,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 /* #### look into ERROR_ME_NOT */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 ERROR_ME_NOT, 1, Qzero);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 if (UNBOUNDP (new_val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 bound = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 new_val = face_property_matching_instance (face, Qfont,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 charset, domain,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 /* #### look into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 ERROR_ME_NOT */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 ERROR_ME_NOT, 0, Qzero);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 if (!UNBOUNDP (cachel->font[offs]) && !EQ (new_val, cachel->font[offs]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 cachel->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 cachel->font_updated[offs] = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 cachel->font[offs] = new_val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 cachel->font_specified[offs] = (bound || EQ (face, Vdefault_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 return new_val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 /* Ensure that the given cachel contains updated fonts for all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 the charsets specified. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 ensure_face_cachel_complete (struct face_cachel *cachel,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 Lisp_Object domain, unsigned char *charsets)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 int i;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1106
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 for (i = 0; i < NUM_LEADING_BYTES; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 if (charsets[i])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 {
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 173
diff changeset
1110 Lisp_Object charset = CHARSET_BY_LEADING_BYTE (i + MIN_LEADING_BYTE);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 assert (CHARSETP (charset));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 ensure_face_cachel_contains_charset (cachel, domain, charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 face_cachel_charset_font_metric_info (struct face_cachel *cachel,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 unsigned char *charsets,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 struct font_metric_info *fm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 int i;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1122
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 fm->width = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 fm->height = fm->ascent = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 fm->descent = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 fm->proportional_p = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 for (i = 0; i < NUM_LEADING_BYTES; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 if (charsets[i])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1132 Lisp_Object charset = CHARSET_BY_LEADING_BYTE (i + MIN_LEADING_BYTE);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1133 Lisp_Object font_instance = FACE_CACHEL_FONT (cachel, charset);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1134 struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_instance);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1135
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 assert (CHARSETP (charset));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 assert (FONT_INSTANCEP (font_instance));
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1138
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1139 if (fm->ascent < (int) fi->ascent) fm->ascent = (int) fi->ascent;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1140 if (fm->descent < (int) fi->descent) fm->descent = (int) fi->descent;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 fm->height = fm->ascent + fm->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 if (fi->proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 fm->proportional_p = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 if (EQ (charset, Vcharset_ascii))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 fm->width = fi->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 /* Called when the updated flag has been cleared on a cachel. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 update_face_cachel_data (struct face_cachel *cachel,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 Lisp_Object domain,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 Lisp_Object face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 if (XFACE (face)->dirty || UNBOUNDP (cachel->face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 int default_face = EQ (face, Vdefault_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 cachel->face = face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 /* We normally only set the _specified flags if the value was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 actually bound. The exception is for the default face where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 we always set it since it is the ultimate fallback. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 #define FROB(field) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 Lisp_Object new_val = \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 FACE_PROPERTY_INSTANCE (face, Q##field, domain, 1, Qzero); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 int bound = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 if (UNBOUNDP (new_val)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 bound = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 new_val = FACE_PROPERTY_INSTANCE (face, Q##field, domain, 0, Qzero); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 if (!EQ (new_val, cachel->field)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 cachel->field = new_val; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 cachel->dirty = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 cachel->field##_specified = (bound || default_face); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 } while (0)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1183
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 FROB (foreground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 FROB (background);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 FROB (display_table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 FROB (background_pixmap);
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1188
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1189 /*
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1190 * A face's background pixmap will override the face's
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1191 * background color. But the background pixmap of the
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1192 * default face should not override the background color of
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1193 * a face if the background color has been specified or
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1194 * inherited.
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1195 *
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1196 * To accomplish this we remove the background pixmap of the
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1197 * cachel and mark it as having been specified so that cachel
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1198 * merging won't override it later.
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1199 */
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1200 if (! default_face
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1201 && cachel->background_specified
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1202 && ! cachel->background_pixmap_specified)
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1203 {
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1204 cachel->background_pixmap = Qunbound;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1205 cachel->background_pixmap_specified = 1;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1206 }
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 185
diff changeset
1207
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 #undef FROB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 #define FROB(field) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 Lisp_Object new_val = \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 FACE_PROPERTY_INSTANCE (face, Q##field, domain, 1, Qzero); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 int bound = 1; \
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1217 unsigned int new_val_int; \
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 if (UNBOUNDP (new_val)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 bound = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 new_val = FACE_PROPERTY_INSTANCE (face, Q##field, domain, 0, Qzero); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 new_val_int = EQ (new_val, Qt); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 if (cachel->field != new_val_int) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 cachel->field = new_val_int; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 cachel->dirty = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 cachel->field##_specified = bound; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 FROB (underline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 FROB (strikethru);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 FROB (highlight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 FROB (dim);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 FROB (reverse);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 FROB (blinking);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 #undef FROB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 cachel->updated = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 /* Merge the cachel identified by FINDEX in window W into the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 cachel. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 merge_face_cachel_data (struct window *w, face_index findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 struct face_cachel *cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 #define FINDEX_FIELD(field) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 Dynarr_atp (w->face_cachels, findex)->field
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 #define FROB(field) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 if (!cachel->field##_specified && FINDEX_FIELD (field##_specified)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 cachel->field = FINDEX_FIELD (field); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 cachel->field##_specified = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 cachel->dirty = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 FROB (foreground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 FROB (background);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 FROB (display_table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 FROB (background_pixmap);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 FROB (underline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 FROB (strikethru);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 FROB (highlight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 FROB (dim);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 FROB (reverse);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 FROB (blinking);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 /* And do ASCII, of course. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 int offs = LEADING_BYTE_ASCII - MIN_LEADING_BYTE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 if (!cachel->font_specified[offs] && FINDEX_FIELD (font_specified[offs]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 cachel->font[offs] = FINDEX_FIELD (font[offs]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 cachel->font_specified[offs] = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 cachel->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 #undef FROB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 #undef FINDEX_FIELD
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 cachel->updated = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 /* Initialize a cachel. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 reset_face_cachel (struct face_cachel *cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1297 xzero (*cachel);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 cachel->face = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 cachel->nfaces = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 cachel->merged_faces = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 cachel->foreground = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 cachel->background = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 for (i = 0; i < NUM_LEADING_BYTES; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 cachel->font[i] = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 cachel->display_table = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 cachel->background_pixmap = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 /* Add a cachel for the given face to the given window's cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 add_face_cachel (struct window *w, Lisp_Object face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 struct face_cachel new_cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 reset_face_cachel (&new_cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 update_face_cachel_data (&new_cachel, window, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 Dynarr_add (w->face_cachels, new_cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 /* Retrieve the index to a cachel for window W that corresponds to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 the specified face. If necessary, add a new element to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 face_index
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 get_builtin_face_cache_index (struct window *w, Lisp_Object face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 if (noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 if (EQ (cachel->face, face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1345 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 if (!cachel->updated)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 update_face_cachel_data (cachel, window, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 /* If we didn't find the face, add it and then return its index. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 add_face_cachel (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 reset_face_cachels (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 /* #### Not initialized in batch mode for the stream device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 if (w->face_cachels)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 for (i = 0; i < Dynarr_length (w->face_cachels); i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 struct face_cachel *cachel = Dynarr_atp (w->face_cachels, i);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 if (cachel->merged_faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 Dynarr_free (cachel->merged_faces);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 Dynarr_reset (w->face_cachels);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 get_builtin_face_cache_index (w, Vdefault_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 get_builtin_face_cache_index (w, Vmodeline_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 XFRAME (w->frame)->window_face_cache_reset = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 mark_face_cachels_as_clean (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 Dynarr_atp (w->face_cachels, elt)->dirty = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 mark_face_cachels_as_not_updated (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 struct face_cachel *cachel = Dynarr_atp (w->face_cachels, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 cachel->updated = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 for (i = 0; i < NUM_LEADING_BYTES; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 cachel->font_updated[i] = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 #ifdef MEMORY_USAGE_STATS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 compute_face_cachel_usage (face_cachel_dynarr *face_cachels,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 if (face_cachels)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 total += Dynarr_memory_usage (face_cachels, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 for (i = 0; i < Dynarr_length (face_cachels); i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 int_dynarr *merged = Dynarr_at (face_cachels, i).merged_faces;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 if (merged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 total += Dynarr_memory_usage (merged, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 #endif /* MEMORY_USAGE_STATS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 * merged face functions *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 *****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 /* Compare two merged face cachels to determine whether we have to add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 a new entry to the face cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 Note that we do not compare the attributes, but just the faces the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 cachels are based on. If they are the same, then the cachels certainly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 ought to have the same attributes, except in the case where fonts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 for different charsets have been determined in the two -- and in that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 case this difference is fine. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 compare_merged_face_cachels (struct face_cachel *cachel1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 struct face_cachel *cachel2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 if (!EQ (cachel1->face, cachel2->face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 || cachel1->nfaces != cachel2->nfaces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 for (i = 0; i < cachel1->nfaces; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 if (FACE_CACHEL_FINDEX_UNSAFE (cachel1, i)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 != FACE_CACHEL_FINDEX_UNSAFE (cachel2, i))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 /* Retrieve the index to a cachel for window W that corresponds to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 the specified cachel. If necessary, add a new element to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 cache. This is similar to get_builtin_face_cache_index() but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 is intended for merged cachels rather than for cachels representing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 just a face.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 Note that a merged cachel for just one face is not the same as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 the simple cachel for that face, because it is also merged with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 the default face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 static face_index
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 get_merged_face_cache_index (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 struct face_cachel *merged_cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 int cache_size = Dynarr_length (w->face_cachels);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 for (elt = 0; elt < cache_size; elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 struct face_cachel *cachel =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 Dynarr_atp (w->face_cachels, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 if (compare_merged_face_cachels (cachel, merged_cachel))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 /* We didn't find it so add this instance to the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 merged_cachel->updated = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 merged_cachel->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 Dynarr_add (w->face_cachels, *merged_cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 return cache_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 face_index
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 get_extent_fragment_face_cache_index (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 struct extent_fragment *ef)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 struct face_cachel cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 int len = Dynarr_length (ef->extents);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1501 face_index findex = 0;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1502 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 /* Optimize the default case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 if (len == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 return DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 /* Merge the faces of the extents together in order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 reset_face_cachel (&cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 for (i = len - 1; i >= 0; i--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 EXTENT current = Dynarr_at (ef->extents, i);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 int has_findex = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 Lisp_Object face = extent_face (current);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 if (FACEP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 has_findex = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 merge_face_cachel_data (w, findex, &cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 /* remember, we're called from within redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 so we can't error. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 else while (CONSP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 Lisp_Object one_face = XCAR (face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 if (FACEP (one_face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 findex = get_builtin_face_cache_index (w, one_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 merge_face_cachel_data (w, findex, &cachel);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1537
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 /* code duplication here but there's no clean
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 way to avoid it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 if (cachel.nfaces >= NUM_STATIC_CACHEL_FACES)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 if (!cachel.merged_faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 cachel.merged_faces = Dynarr_new (int);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 Dynarr_add (cachel.merged_faces, findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 cachel.merged_faces_static[cachel.nfaces] = findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 cachel.nfaces++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 face = XCDR (face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 }
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1552
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 if (has_findex)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 if (cachel.nfaces >= NUM_STATIC_CACHEL_FACES)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 if (!cachel.merged_faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 cachel.merged_faces = Dynarr_new (int);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 Dynarr_add (cachel.merged_faces, findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 cachel.merged_faces_static[cachel.nfaces] = findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 cachel.nfaces++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 /* Now finally merge in the default face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 findex = get_builtin_face_cache_index (w, Vdefault_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 merge_face_cachel_data (w, findex, &cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570
367
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1571 findex = get_merged_face_cache_index (w, &cachel);
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1572 if (cachel.merged_faces &&
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1573 /* merged_faces did not get stored and available via return value */
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1574 Dynarr_at (w->face_cachels, findex).merged_faces !=
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1575 cachel.merged_faces)
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1576 {
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1577 Dynarr_free (cachel.merged_faces);
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1578 cachel.merged_faces = 0;
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1579 }
a4f53d9b3154 Import from CVS: tag r21-1-13
cvs
parents: 318
diff changeset
1580 return findex;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 interface functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 update_EmacsFrame (Lisp_Object frame, Lisp_Object name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 struct frame *frm = XFRAME (frame);
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 272
diff changeset
1593
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 272
diff changeset
1594 if (EQ (name, Qfont))
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 272
diff changeset
1595 MARK_FRAME_SIZE_SLIPPED (frm);
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 272
diff changeset
1596
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 249
diff changeset
1597 MAYBE_FRAMEMETH (frm, update_frame_external_traits, (frm, name));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 update_EmacsFrames (Lisp_Object locale, Lisp_Object name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 if (FRAMEP (locale))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 update_EmacsFrame (locale, name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 else if (DEVICEP (locale))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 update_EmacsFrame (XCAR (frmcons), name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 else if (EQ (locale, Qglobal) || EQ (locale, Qfallback))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 Lisp_Object frmcons, devcons, concons;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1617
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 update_EmacsFrame (XCAR (frmcons), name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 update_frame_face_values (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1626 Lisp_Object frm;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 XSETFRAME (frm, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 update_EmacsFrame (frm, Qforeground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 update_EmacsFrame (frm, Qbackground);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 update_EmacsFrame (frm, Qfont);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 face_property_was_changed (Lisp_Object face, Lisp_Object property,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 Lisp_Object locale)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 int default_face = EQ (face, Vdefault_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 /* If the locale could affect the frame value, then call
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 update_EmacsFrames just in case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 if (default_face &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 (EQ (property, Qforeground) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 EQ (property, Qbackground) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 EQ (property, Qfont)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 update_EmacsFrames (locale, property);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 if (WINDOWP (locale))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1650 struct frame *f = XFRAME (XWINDOW (locale)->frame);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1651 MARK_FRAME_FACES_CHANGED (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 else if (FRAMEP (locale))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1655 struct frame *f = XFRAME (locale);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1656 MARK_FRAME_FACES_CHANGED (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 else if (DEVICEP (locale))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1660 struct device *d = XDEVICE (locale);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1661 MARK_DEVICE_FRAMES_FACES_CHANGED (d);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 Lisp_Object devcons, concons;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1666
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 MARK_DEVICE_FRAMES_FACES_CHANGED (XDEVICE (XCAR (devcons)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 }
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1670
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1671 /*
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1672 * This call to update_faces_inheritance isn't needed and makes
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1673 * creating and modifying faces _very_ slow. The point of
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1674 * update_face_inheritances is to find all faces that inherit
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1675 * directly from this face property and set the specifier "dirty"
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1676 * flag on the corresponding specifier. This forces recaching of
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1677 * cached specifier values in frame and window struct slots. But
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1678 * currently no face properties are cached in frame and window
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1679 * struct slots, so calling this function does nothing useful!
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1680 *
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1681 * Further, since update_faces_inheritance maps over the whole
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1682 * face table every time it is called, it gets terribly slow when
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1683 * there are many faces. Creating 500 faces on a 50Mhz 486 took
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1684 * 433 seconds when update_faces_inheritance was called. With the
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1685 * call commented out, creating those same 500 faces took 0.72
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1686 * seconds.
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1687 */
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 213
diff changeset
1688 /* update_faces_inheritance (face, property);*/
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 XFACE (face)->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1692 DEFUN ("copy-face", Fcopy_face, 2, 6, 0, /*
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1693 Define and return a new face which is a copy of an existing one,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1694 or makes an already-existing face be exactly like another.
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1695 LOCALE, TAG-SET, EXACT-P, and HOW-TO-ADD are as in `copy-specifier'.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1696 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1697 (old_face, new_name, locale, tag_set, exact_p, how_to_add))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 struct Lisp_Face *fold, *fnew;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 Lisp_Object new_face = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 old_face = Fget_face (old_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 /* We GCPRO old_face because it might be temporary, and GCing could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 occur in various places below. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 GCPRO4 (tag_set, locale, old_face, new_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 /* check validity of how_to_add now. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1709 decode_how_to_add_specification (how_to_add);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 /* and of tag_set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 tag_set = decode_specifier_tag_set (tag_set);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 /* and of locale. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 locale = decode_locale_list (locale);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 new_face = Ffind_face (new_name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 if (NILP (new_face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 Lisp_Object temp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 CHECK_SYMBOL (new_name);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 /* Create the new face with the same status as the old face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 temp = (NILP (Fgethash (old_face, Vtemporary_faces_cache, Qnil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 ? Qnil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 : Qt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 new_face = Fmake_face (new_name, Qnil, temp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 fold = XFACE (old_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 fnew = XFACE (new_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1733 #define COPY_PROPERTY(property) \
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1734 Fcopy_specifier (fold->property, fnew->property, \
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1735 locale, tag_set, exact_p, how_to_add);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1736
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1737 COPY_PROPERTY (foreground);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1738 COPY_PROPERTY (background);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1739 COPY_PROPERTY (font);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1740 COPY_PROPERTY (display_table);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1741 COPY_PROPERTY (background_pixmap);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1742 COPY_PROPERTY (underline);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1743 COPY_PROPERTY (strikethru);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1744 COPY_PROPERTY (highlight);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1745 COPY_PROPERTY (dim);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1746 COPY_PROPERTY (blinking);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1747 COPY_PROPERTY (reverse);
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1748 #undef COPY_PROPERTY
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 /* #### should it copy the individual specifiers, if they exist? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 fnew->plist = Fcopy_sequence (fold->plist);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 return new_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 syms_of_faces (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 /* Qdefault defined in general.c */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 defsymbol (&Qmodeline, "modeline");
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1763 defsymbol (&Qgui_element, "gui-element");
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 defsymbol (&Qleft_margin, "left-margin");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 defsymbol (&Qright_margin, "right-margin");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 defsymbol (&Qtext_cursor, "text-cursor");
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1767 defsymbol (&Qvertical_divider, "vertical-divider");
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1769 DEFSUBR (Ffacep);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1770 DEFSUBR (Ffind_face);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1771 DEFSUBR (Fget_face);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1772 DEFSUBR (Fface_name);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1773 DEFSUBR (Fbuilt_in_face_specifiers);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1774 DEFSUBR (Fface_list);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1775 DEFSUBR (Fmake_face);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 2
diff changeset
1776 DEFSUBR (Fcopy_face);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 defsymbol (&Qfacep, "facep");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 defsymbol (&Qforeground, "foreground");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 defsymbol (&Qbackground, "background");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 /* Qfont defined in general.c */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 defsymbol (&Qdisplay_table, "display-table");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 defsymbol (&Qbackground_pixmap, "background-pixmap");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 defsymbol (&Qunderline, "underline");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 defsymbol (&Qstrikethru, "strikethru");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 /* Qhighlight, Qreverse defined in general.c */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 defsymbol (&Qdim, "dim");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 defsymbol (&Qblinking, "blinking");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 defsymbol (&Qinit_face_from_resources, "init-face-from-resources");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 defsymbol (&Qinit_global_faces, "init-global-faces");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 defsymbol (&Qinit_device_faces, "init-device-faces");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 defsymbol (&Qinit_frame_faces, "init-frame-faces");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 structure_type_create_faces (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 struct structure_type *st;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 st = define_structure_type (Qface, face_validate, face_instantiate);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 define_structure_type_keyword (st, Qname, face_name_validate);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 vars_of_faces (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 staticpro (&Vpermanent_faces_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 Vpermanent_faces_cache = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 staticpro (&Vtemporary_faces_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 Vtemporary_faces_cache = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 staticpro (&Vdefault_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 Vdefault_face = Qnil;
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1816 staticpro (&Vgui_element_face);
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1817 Vgui_element_face = Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 staticpro (&Vmodeline_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 Vmodeline_face = Qnil;
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1820 staticpro (&Vtoolbar_face);
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1821 Vtoolbar_face = Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1823 staticpro (&Vvertical_divider_face);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1824 Vvertical_divider_face = Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 staticpro (&Vleft_margin_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 Vleft_margin_face = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 staticpro (&Vright_margin_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 Vright_margin_face = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 staticpro (&Vtext_cursor_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 Vtext_cursor_face = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 staticpro (&Vpointer_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 Vpointer_face = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 Lisp_Object syms[20];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 int n = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 syms[n++] = Qforeground;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 syms[n++] = Qbackground;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 syms[n++] = Qfont;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 syms[n++] = Qdisplay_table;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 syms[n++] = Qbackground_pixmap;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 syms[n++] = Qunderline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 syms[n++] = Qstrikethru;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 syms[n++] = Qhighlight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 syms[n++] = Qdim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 syms[n++] = Qblinking;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 syms[n++] = Qreverse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 Vbuilt_in_face_specifiers = pure_list (n, syms);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 staticpro (&Vbuilt_in_face_specifiers);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 complex_vars_of_faces (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 Vpermanent_faces_cache = make_lisp_hashtable (10, HASHTABLE_NONWEAK,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 HASHTABLE_EQ);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 Vtemporary_faces_cache = make_lisp_hashtable (0, HASHTABLE_WEAK,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 HASHTABLE_EQ);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 /* Create the default face now so we know what it is immediately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 Vdefault_face = Qnil; /* so that Fmake_face() doesn't set up a bogus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 default value */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 Vdefault_face = Fmake_face (Qdefault, build_string ("default face"),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 /* Provide some last-resort fallbacks to avoid utter fuckage if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 someone provides invalid values for the global specifications. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1874 Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 #ifdef HAVE_X_WINDOWS
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1877 fg_fb = acons (list1 (Qx), build_string ("black"), fg_fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1878 bg_fb = acons (list1 (Qx), build_string ("white"), bg_fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 #ifdef HAVE_TTY
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1881 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1882 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 #endif
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
1884 #ifdef HAVE_MS_WINDOWS
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1885 fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1886 bg_fb = acons (list1 (Qmswindows), build_string ("white"), bg_fb);
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 207
diff changeset
1887 #endif
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1888 set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1889 set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 /* #### We may want to have different fallback values if NeXTstep
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 support is compiled in. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 Lisp_Object inst_list = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 #ifdef HAVE_X_WINDOWS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 /* The same gory list from x-faces.el.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 (#### Perhaps we should remove the stuff from x-faces.el
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 and only depend on this stuff here? That should work.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1901 CONST char *fonts[] =
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1902 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1903 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1904 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1905 "-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1906 "-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1907 "-*-*-medium-r-*-*-*-120-*-*-c-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1908 "-*-*-*-r-*-*-*-120-*-*-m-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1909 "-*-*-*-r-*-*-*-120-*-*-c-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1910 "-*-*-*-r-*-*-*-120-*-*-*-*-iso8859-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1911 "-*-*-medium-r-*-*-*-120-*-*-m-*-*-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1912 "-*-*-medium-r-*-*-*-120-*-*-c-*-*-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1913 "-*-*-*-r-*-*-*-120-*-*-m-*-*-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1914 "-*-*-*-r-*-*-*-120-*-*-c-*-*-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1915 "-*-*-*-r-*-*-*-120-*-*-*-*-*-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1916 "-*-*-*-*-*-*-*-120-*-*-*-*-*-*",
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1917 "*"
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1918 };
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1919 CONST char **fontptr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1921 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1922 inst_list = Fcons (Fcons (list1 (Qx), build_string (*fontptr)),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 inst_list);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1924 #endif /* HAVE_X_WINDOWS */
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1925
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 #ifdef HAVE_TTY
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 inst_list = Fcons (Fcons (list1 (Qtty), build_string ("normal")),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 inst_list);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1929 #endif /* HAVE_TTY */
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
1930 #ifdef HAVE_MS_WINDOWS
318
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
1931 inst_list = Fcons (Fcons (list1 (Qmswindows),
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
1932 build_string ("Fixedsys:Regular:9::Western")), inst_list);
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
1933 inst_list = Fcons (Fcons (list1 (Qmswindows),
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
1934 build_string ("Courier:Regular:10::Western")), inst_list);
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
1935 inst_list = Fcons (Fcons (list1 (Qmswindows),
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
1936 build_string ("Courier New:Regular:10::Western")), inst_list);
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
1937 #endif /* HAVE_MS_WINDOWS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 set_specifier_fallback (Fget (Vdefault_face, Qfont, Qnil), inst_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 }
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1940
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 set_specifier_fallback (Fget (Vdefault_face, Qunderline, Qnil),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 set_specifier_fallback (Fget (Vdefault_face, Qstrikethru, Qnil),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 set_specifier_fallback (Fget (Vdefault_face, Qhighlight, Qnil),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 set_specifier_fallback (Fget (Vdefault_face, Qdim, Qnil),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 set_specifier_fallback (Fget (Vdefault_face, Qblinking, Qnil),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 set_specifier_fallback (Fget (Vdefault_face, Qreverse, Qnil),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 list1 (Fcons (Qnil, Qnil)));
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1953
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1954 /* gui-element is the parent face of all gui elements such as
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1955 modeline, vertical divider and toolbar. */
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1956 Vgui_element_face = Fmake_face (Qgui_element,
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1957 build_string ("gui element face"),
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1958 Qnil);
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 284
diff changeset
1959
298
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1960 /* Provide some last-resort fallbacks for gui-element face which
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1961 mustn't default to default. */
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1962 {
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1963 Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1964
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1965 #ifdef HAVE_X_WINDOWS
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1966 fg_fb = acons (list1 (Qx), build_string ("black"), fg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1967 bg_fb = acons (list1 (Qx), build_string ("Gray80"), bg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1968 #endif
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1969 #ifdef HAVE_TTY
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1970 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1971 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1972 #endif
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1973 #ifdef HAVE_MS_WINDOWS
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1974 fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1975 bg_fb = acons (list1 (Qmswindows), build_string ("Gray75"), bg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1976 #endif
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1977 set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1978 set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1979 }
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 290
diff changeset
1980
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 /* Now create the other faces that redisplay needs to refer to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 directly. We could create them in Lisp but it's simpler this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 way since we need to get them anyway. */
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1984
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1985 /* modeline is gui element. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 Vmodeline_face = Fmake_face (Qmodeline, build_string ("modeline face"),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 Qnil);
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 284
diff changeset
1988
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 284
diff changeset
1989 set_specifier_fallback (Fget (Vmodeline_face, Qforeground, Qunbound),
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1990 Fget (Vgui_element_face, Qforeground, Qunbound));
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 284
diff changeset
1991 set_specifier_fallback (Fget (Vmodeline_face, Qbackground, Qunbound),
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1992 Fget (Vgui_element_face, Qbackground, Qunbound));
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1993 set_specifier_fallback (Fget (Vmodeline_face, Qbackground_pixmap, Qnil),
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1994 Fget (Vgui_element_face, Qbackground_pixmap,
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1995 Qunbound));
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1996
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1997 /* toolbar is another gui element */
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1998 Vtoolbar_face = Fmake_face (Qtoolbar,
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
1999 build_string ("toolbar face"),
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2000 Qnil);
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2001 set_specifier_fallback (Fget (Vtoolbar_face, Qforeground, Qunbound),
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2002 Fget (Vgui_element_face, Qforeground, Qunbound));
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2003 set_specifier_fallback (Fget (Vtoolbar_face, Qbackground, Qunbound),
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2004 Fget (Vgui_element_face, Qbackground, Qunbound));
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2005 set_specifier_fallback (Fget (Vtoolbar_face, Qbackground_pixmap, Qnil),
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2006 Fget (Vgui_element_face, Qbackground_pixmap,
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2007 Qunbound));
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 284
diff changeset
2008
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2009 /* vertical divider is another gui element */
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2010 Vvertical_divider_face = Fmake_face (Qvertical_divider,
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2011 build_string ("vertical divider face"),
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2012 Qnil);
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2013
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2014 set_specifier_fallback (Fget (Vvertical_divider_face, Qforeground, Qunbound),
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2015 Fget (Vgui_element_face, Qforeground, Qunbound));
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2016 set_specifier_fallback (Fget (Vvertical_divider_face, Qbackground, Qunbound),
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2017 Fget (Vgui_element_face, Qbackground, Qunbound));
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2018 set_specifier_fallback (Fget (Vvertical_divider_face, Qbackground_pixmap,
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2019 Qunbound),
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2020 Fget (Vgui_element_face, Qbackground_pixmap,
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
2021 Qunbound));
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
2022
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 Vleft_margin_face = Fmake_face (Qleft_margin,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 build_string ("left margin face"),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 Vright_margin_face = Fmake_face (Qright_margin,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 build_string ("right margin face"),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 Vtext_cursor_face = Fmake_face (Qtext_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 build_string ("face for text cursor"),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 Vpointer_face =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 Fmake_face (Qpointer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 build_string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 ("face for foreground/background colors of mouse pointer"),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 }