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