annotate src/faces.c @ 217:d44af0c54775 r20-4b7

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