|
428
|
1 /* "Face" primitives
|
|
|
2 Copyright (C) 1994 Free Software Foundation, Inc.
|
|
|
3 Copyright (C) 1995 Board of Trustees, University of Illinois.
|
|
793
|
4 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing.
|
|
428
|
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"
|
|
872
|
33 #include "device-impl.h"
|
|
428
|
34 #include "elhash.h"
|
|
872
|
35 #include "extents-impl.h" /* for extent_face */
|
|
428
|
36 #include "faces.h"
|
|
872
|
37 #include "frame-impl.h"
|
|
428
|
38 #include "glyphs.h"
|
|
872
|
39 #include "objects-impl.h"
|
|
428
|
40 #include "specifier.h"
|
|
|
41 #include "window.h"
|
|
|
42
|
|
|
43 Lisp_Object Qfacep;
|
|
|
44 Lisp_Object Qforeground, Qbackground, Qdisplay_table;
|
|
|
45 Lisp_Object Qbackground_pixmap, Qunderline, Qdim;
|
|
|
46 Lisp_Object Qblinking, Qstrikethru;
|
|
|
47
|
|
|
48 Lisp_Object Qinit_face_from_resources;
|
|
|
49 Lisp_Object Qinit_frame_faces;
|
|
|
50 Lisp_Object Qinit_device_faces;
|
|
|
51 Lisp_Object Qinit_global_faces;
|
|
|
52
|
|
|
53 /* These faces are used directly internally. We use these variables
|
|
|
54 to be able to reference them directly and save the overhead of
|
|
|
55 calling Ffind_face. */
|
|
|
56 Lisp_Object Vdefault_face, Vmodeline_face, Vgui_element_face;
|
|
|
57 Lisp_Object Vleft_margin_face, Vright_margin_face, Vtext_cursor_face;
|
|
|
58 Lisp_Object Vpointer_face, Vvertical_divider_face, Vtoolbar_face, Vwidget_face;
|
|
|
59
|
|
440
|
60 /* Qdefault, Qhighlight, Qleft_margin, Qright_margin defined in general.c */
|
|
|
61 Lisp_Object Qmodeline, Qgui_element, Qtext_cursor, Qvertical_divider;
|
|
428
|
62
|
|
2867
|
63 Lisp_Object Qface_alias, Qcyclic_face_alias;
|
|
2865
|
64
|
|
428
|
65 /* In the old implementation Vface_list was a list of the face names,
|
|
|
66 not the faces themselves. We now distinguish between permanent and
|
|
|
67 temporary faces. Permanent faces are kept in a regular hash table,
|
|
|
68 temporary faces in a weak hash table. */
|
|
|
69 Lisp_Object Vpermanent_faces_cache;
|
|
|
70 Lisp_Object Vtemporary_faces_cache;
|
|
|
71
|
|
|
72 Lisp_Object Vbuilt_in_face_specifiers;
|
|
|
73
|
|
|
74
|
|
3659
|
75 #ifdef DEBUG_XEMACS
|
|
|
76 Fixnum debug_x_faces;
|
|
|
77 #endif
|
|
|
78
|
|
|
79 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
|
|
|
80
|
|
|
81 #ifdef DEBUG_XEMACS
|
|
|
82 # define DEBUG_FACES(FORMAT, ...) \
|
|
|
83 do { if (debug_x_faces) stderr_out(FORMAT, __VA_ARGS__); } while (0)
|
|
|
84 #else /* DEBUG_XEMACS */
|
|
|
85 # define DEBUG_FACES(format, ...)
|
|
|
86 #endif /* DEBUG_XEMACS */
|
|
|
87
|
|
|
88 #elif defined(__GNUC__)
|
|
|
89
|
|
|
90 #ifdef DEBUG_XEMACS
|
|
|
91 # define DEBUG_FACES(format, args...) \
|
|
|
92 do { if (debug_x_faces) stderr_out(format, args ); } while (0)
|
|
|
93 #else /* DEBUG_XEMACS */
|
|
|
94 # define DEBUG_FACES(format, args...)
|
|
|
95 #endif /* DEBUG_XEMACS */
|
|
|
96
|
|
|
97 #else /* defined(__STDC_VERSION__) [...] */
|
|
|
98 # define DEBUG_FACES (void)
|
|
|
99 #endif
|
|
428
|
100
|
|
|
101 static Lisp_Object
|
|
|
102 mark_face (Lisp_Object obj)
|
|
|
103 {
|
|
440
|
104 Lisp_Face *face = XFACE (obj);
|
|
428
|
105
|
|
|
106 mark_object (face->name);
|
|
|
107 mark_object (face->doc_string);
|
|
|
108
|
|
|
109 mark_object (face->foreground);
|
|
|
110 mark_object (face->background);
|
|
|
111 mark_object (face->font);
|
|
|
112 mark_object (face->display_table);
|
|
|
113 mark_object (face->background_pixmap);
|
|
|
114 mark_object (face->underline);
|
|
|
115 mark_object (face->strikethru);
|
|
|
116 mark_object (face->highlight);
|
|
|
117 mark_object (face->dim);
|
|
|
118 mark_object (face->blinking);
|
|
|
119 mark_object (face->reverse);
|
|
|
120
|
|
|
121 mark_object (face->charsets_warned_about);
|
|
|
122
|
|
|
123 return face->plist;
|
|
|
124 }
|
|
|
125
|
|
|
126 static void
|
|
2286
|
127 print_face (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag))
|
|
428
|
128 {
|
|
440
|
129 Lisp_Face *face = XFACE (obj);
|
|
428
|
130
|
|
|
131 if (print_readably)
|
|
|
132 {
|
|
800
|
133 write_fmt_string_lisp (printcharfun, "#s(face name %S)", 1, face->name);
|
|
428
|
134 }
|
|
|
135 else
|
|
|
136 {
|
|
800
|
137 write_fmt_string_lisp (printcharfun, "#<face %S", 1, face->name);
|
|
428
|
138 if (!NILP (face->doc_string))
|
|
800
|
139 write_fmt_string_lisp (printcharfun, " %S", 1, face->doc_string);
|
|
826
|
140 write_c_string (printcharfun, ">");
|
|
428
|
141 }
|
|
|
142 }
|
|
|
143
|
|
|
144 /* Faces are equal if all of their display attributes are equal. We
|
|
|
145 don't compare names or doc-strings, because that would make equal
|
|
|
146 be eq.
|
|
|
147
|
|
|
148 This isn't concerned with "unspecified" attributes, that's what
|
|
|
149 #'face-differs-from-default-p is for. */
|
|
|
150 static int
|
|
|
151 face_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
|
|
|
152 {
|
|
440
|
153 Lisp_Face *f1 = XFACE (obj1);
|
|
|
154 Lisp_Face *f2 = XFACE (obj2);
|
|
428
|
155
|
|
|
156 depth++;
|
|
|
157
|
|
|
158 return
|
|
|
159 (internal_equal (f1->foreground, f2->foreground, depth) &&
|
|
|
160 internal_equal (f1->background, f2->background, depth) &&
|
|
|
161 internal_equal (f1->font, f2->font, depth) &&
|
|
|
162 internal_equal (f1->display_table, f2->display_table, depth) &&
|
|
|
163 internal_equal (f1->background_pixmap, f2->background_pixmap, depth) &&
|
|
|
164 internal_equal (f1->underline, f2->underline, depth) &&
|
|
|
165 internal_equal (f1->strikethru, f2->strikethru, depth) &&
|
|
|
166 internal_equal (f1->highlight, f2->highlight, depth) &&
|
|
|
167 internal_equal (f1->dim, f2->dim, depth) &&
|
|
|
168 internal_equal (f1->blinking, f2->blinking, depth) &&
|
|
|
169 internal_equal (f1->reverse, f2->reverse, depth) &&
|
|
|
170
|
|
|
171 ! plists_differ (f1->plist, f2->plist, 0, 0, depth + 1));
|
|
|
172 }
|
|
|
173
|
|
665
|
174 static Hashcode
|
|
428
|
175 face_hash (Lisp_Object obj, int depth)
|
|
|
176 {
|
|
440
|
177 Lisp_Face *f = XFACE (obj);
|
|
428
|
178
|
|
|
179 depth++;
|
|
|
180
|
|
|
181 /* No need to hash all of the elements; that would take too long.
|
|
|
182 Just hash the most common ones. */
|
|
|
183 return HASH3 (internal_hash (f->foreground, depth),
|
|
|
184 internal_hash (f->background, depth),
|
|
|
185 internal_hash (f->font, depth));
|
|
|
186 }
|
|
|
187
|
|
|
188 static Lisp_Object
|
|
|
189 face_getprop (Lisp_Object obj, Lisp_Object prop)
|
|
|
190 {
|
|
440
|
191 Lisp_Face *f = XFACE (obj);
|
|
428
|
192
|
|
|
193 return
|
|
|
194 (EQ (prop, Qforeground) ? f->foreground :
|
|
|
195 EQ (prop, Qbackground) ? f->background :
|
|
|
196 EQ (prop, Qfont) ? f->font :
|
|
|
197 EQ (prop, Qdisplay_table) ? f->display_table :
|
|
|
198 EQ (prop, Qbackground_pixmap) ? f->background_pixmap :
|
|
|
199 EQ (prop, Qunderline) ? f->underline :
|
|
|
200 EQ (prop, Qstrikethru) ? f->strikethru :
|
|
|
201 EQ (prop, Qhighlight) ? f->highlight :
|
|
|
202 EQ (prop, Qdim) ? f->dim :
|
|
|
203 EQ (prop, Qblinking) ? f->blinking :
|
|
|
204 EQ (prop, Qreverse) ? f->reverse :
|
|
|
205 EQ (prop, Qdoc_string) ? f->doc_string :
|
|
|
206 external_plist_get (&f->plist, prop, 0, ERROR_ME));
|
|
|
207 }
|
|
|
208
|
|
|
209 static int
|
|
|
210 face_putprop (Lisp_Object obj, Lisp_Object prop, Lisp_Object value)
|
|
|
211 {
|
|
440
|
212 Lisp_Face *f = XFACE (obj);
|
|
428
|
213
|
|
|
214 if (EQ (prop, Qforeground) ||
|
|
|
215 EQ (prop, Qbackground) ||
|
|
|
216 EQ (prop, Qfont) ||
|
|
|
217 EQ (prop, Qdisplay_table) ||
|
|
|
218 EQ (prop, Qbackground_pixmap) ||
|
|
|
219 EQ (prop, Qunderline) ||
|
|
|
220 EQ (prop, Qstrikethru) ||
|
|
|
221 EQ (prop, Qhighlight) ||
|
|
|
222 EQ (prop, Qdim) ||
|
|
|
223 EQ (prop, Qblinking) ||
|
|
|
224 EQ (prop, Qreverse))
|
|
|
225 return 0;
|
|
|
226
|
|
|
227 if (EQ (prop, Qdoc_string))
|
|
|
228 {
|
|
|
229 if (!NILP (value))
|
|
|
230 CHECK_STRING (value);
|
|
|
231 f->doc_string = value;
|
|
|
232 return 1;
|
|
|
233 }
|
|
|
234
|
|
|
235 external_plist_put (&f->plist, prop, value, 0, ERROR_ME);
|
|
|
236 return 1;
|
|
|
237 }
|
|
|
238
|
|
|
239 static int
|
|
|
240 face_remprop (Lisp_Object obj, Lisp_Object prop)
|
|
|
241 {
|
|
440
|
242 Lisp_Face *f = XFACE (obj);
|
|
428
|
243
|
|
|
244 if (EQ (prop, Qforeground) ||
|
|
|
245 EQ (prop, Qbackground) ||
|
|
|
246 EQ (prop, Qfont) ||
|
|
|
247 EQ (prop, Qdisplay_table) ||
|
|
|
248 EQ (prop, Qbackground_pixmap) ||
|
|
|
249 EQ (prop, Qunderline) ||
|
|
|
250 EQ (prop, Qstrikethru) ||
|
|
|
251 EQ (prop, Qhighlight) ||
|
|
|
252 EQ (prop, Qdim) ||
|
|
|
253 EQ (prop, Qblinking) ||
|
|
|
254 EQ (prop, Qreverse))
|
|
|
255 return -1;
|
|
|
256
|
|
|
257 if (EQ (prop, Qdoc_string))
|
|
|
258 {
|
|
|
259 f->doc_string = Qnil;
|
|
|
260 return 1;
|
|
|
261 }
|
|
|
262
|
|
|
263 return external_remprop (&f->plist, prop, 0, ERROR_ME);
|
|
|
264 }
|
|
|
265
|
|
|
266 static Lisp_Object
|
|
|
267 face_plist (Lisp_Object obj)
|
|
|
268 {
|
|
440
|
269 Lisp_Face *face = XFACE (obj);
|
|
428
|
270 Lisp_Object result = face->plist;
|
|
|
271
|
|
|
272 result = cons3 (Qreverse, face->reverse, result);
|
|
|
273 result = cons3 (Qblinking, face->blinking, result);
|
|
|
274 result = cons3 (Qdim, face->dim, result);
|
|
|
275 result = cons3 (Qhighlight, face->highlight, result);
|
|
|
276 result = cons3 (Qstrikethru, face->strikethru, result);
|
|
|
277 result = cons3 (Qunderline, face->underline, result);
|
|
|
278 result = cons3 (Qbackground_pixmap, face->background_pixmap, result);
|
|
|
279 result = cons3 (Qdisplay_table, face->display_table, result);
|
|
|
280 result = cons3 (Qfont, face->font, result);
|
|
|
281 result = cons3 (Qbackground, face->background, result);
|
|
|
282 result = cons3 (Qforeground, face->foreground, result);
|
|
|
283
|
|
|
284 return result;
|
|
|
285 }
|
|
|
286
|
|
1204
|
287 static const struct memory_description face_description[] = {
|
|
440
|
288 { XD_LISP_OBJECT, offsetof (Lisp_Face, name) },
|
|
|
289 { XD_LISP_OBJECT, offsetof (Lisp_Face, doc_string) },
|
|
|
290 { XD_LISP_OBJECT, offsetof (Lisp_Face, foreground) },
|
|
|
291 { XD_LISP_OBJECT, offsetof (Lisp_Face, background) },
|
|
|
292 { XD_LISP_OBJECT, offsetof (Lisp_Face, font) },
|
|
|
293 { XD_LISP_OBJECT, offsetof (Lisp_Face, display_table) },
|
|
|
294 { XD_LISP_OBJECT, offsetof (Lisp_Face, background_pixmap) },
|
|
|
295 { XD_LISP_OBJECT, offsetof (Lisp_Face, underline) },
|
|
|
296 { XD_LISP_OBJECT, offsetof (Lisp_Face, strikethru) },
|
|
|
297 { XD_LISP_OBJECT, offsetof (Lisp_Face, highlight) },
|
|
|
298 { XD_LISP_OBJECT, offsetof (Lisp_Face, dim) },
|
|
|
299 { XD_LISP_OBJECT, offsetof (Lisp_Face, blinking) },
|
|
|
300 { XD_LISP_OBJECT, offsetof (Lisp_Face, reverse) },
|
|
|
301 { XD_LISP_OBJECT, offsetof (Lisp_Face, plist) },
|
|
|
302 { XD_LISP_OBJECT, offsetof (Lisp_Face, charsets_warned_about) },
|
|
428
|
303 { XD_END }
|
|
|
304 };
|
|
|
305
|
|
934
|
306 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("face", face,
|
|
|
307 1, /*dumpable-flag*/
|
|
|
308 mark_face, print_face, 0, face_equal,
|
|
1204
|
309 face_hash, face_description,
|
|
|
310 face_getprop,
|
|
934
|
311 face_putprop, face_remprop,
|
|
|
312 face_plist, Lisp_Face);
|
|
428
|
313
|
|
|
314 /************************************************************************/
|
|
|
315 /* face read syntax */
|
|
|
316 /************************************************************************/
|
|
|
317
|
|
|
318 static int
|
|
2286
|
319 face_name_validate (Lisp_Object UNUSED (keyword), Lisp_Object value,
|
|
578
|
320 Error_Behavior errb)
|
|
428
|
321 {
|
|
|
322 if (ERRB_EQ (errb, ERROR_ME))
|
|
|
323 {
|
|
|
324 CHECK_SYMBOL (value);
|
|
|
325 return 1;
|
|
|
326 }
|
|
|
327
|
|
|
328 return SYMBOLP (value);
|
|
|
329 }
|
|
|
330
|
|
|
331 static int
|
|
578
|
332 face_validate (Lisp_Object data, Error_Behavior errb)
|
|
428
|
333 {
|
|
|
334 int name_seen = 0;
|
|
|
335 Lisp_Object valw = Qnil;
|
|
|
336
|
|
|
337 data = Fcdr (data); /* skip over Qface */
|
|
|
338 while (!NILP (data))
|
|
|
339 {
|
|
|
340 Lisp_Object keyw = Fcar (data);
|
|
|
341
|
|
|
342 data = Fcdr (data);
|
|
|
343 valw = Fcar (data);
|
|
|
344 data = Fcdr (data);
|
|
|
345 if (EQ (keyw, Qname))
|
|
|
346 name_seen = 1;
|
|
|
347 else
|
|
2500
|
348 ABORT ();
|
|
428
|
349 }
|
|
|
350
|
|
|
351 if (!name_seen)
|
|
|
352 {
|
|
563
|
353 maybe_sferror ("No face name given", Qunbound, Qface, errb);
|
|
428
|
354 return 0;
|
|
|
355 }
|
|
|
356
|
|
|
357 if (NILP (Ffind_face (valw)))
|
|
|
358 {
|
|
563
|
359 maybe_invalid_argument ("No such face", valw, Qface, errb);
|
|
428
|
360 return 0;
|
|
|
361 }
|
|
|
362
|
|
|
363 return 1;
|
|
|
364 }
|
|
|
365
|
|
|
366 static Lisp_Object
|
|
|
367 face_instantiate (Lisp_Object data)
|
|
|
368 {
|
|
|
369 return Fget_face (Fcar (Fcdr (data)));
|
|
|
370 }
|
|
|
371
|
|
|
372
|
|
|
373 /****************************************************************************
|
|
|
374 * utility functions *
|
|
|
375 ****************************************************************************/
|
|
|
376
|
|
|
377 static void
|
|
440
|
378 reset_face (Lisp_Face *f)
|
|
428
|
379 {
|
|
|
380 f->name = Qnil;
|
|
|
381 f->doc_string = Qnil;
|
|
|
382 f->dirty = 0;
|
|
|
383 f->foreground = Qnil;
|
|
|
384 f->background = Qnil;
|
|
|
385 f->font = Qnil;
|
|
|
386 f->display_table = Qnil;
|
|
|
387 f->background_pixmap = Qnil;
|
|
|
388 f->underline = Qnil;
|
|
|
389 f->strikethru = Qnil;
|
|
|
390 f->highlight = Qnil;
|
|
|
391 f->dim = Qnil;
|
|
|
392 f->blinking = Qnil;
|
|
|
393 f->reverse = Qnil;
|
|
|
394 f->plist = Qnil;
|
|
|
395 f->charsets_warned_about = Qnil;
|
|
|
396 }
|
|
|
397
|
|
440
|
398 static Lisp_Face *
|
|
428
|
399 allocate_face (void)
|
|
|
400 {
|
|
3017
|
401 Lisp_Face *result = ALLOC_LCRECORD_TYPE (Lisp_Face, &lrecord_face);
|
|
428
|
402
|
|
|
403 reset_face (result);
|
|
|
404 return result;
|
|
|
405 }
|
|
|
406
|
|
|
407
|
|
|
408 /* We store the faces in hash tables with the names as the key and the
|
|
|
409 actual face object as the value. Occasionally we need to use them
|
|
|
410 in a list format. These routines provide us with that. */
|
|
|
411 struct face_list_closure
|
|
|
412 {
|
|
|
413 Lisp_Object *face_list;
|
|
|
414 };
|
|
|
415
|
|
|
416 static int
|
|
2286
|
417 add_face_to_list_mapper (Lisp_Object UNUSED (key), Lisp_Object value,
|
|
428
|
418 void *face_list_closure)
|
|
|
419 {
|
|
|
420 /* This function can GC */
|
|
|
421 struct face_list_closure *fcl =
|
|
|
422 (struct face_list_closure *) face_list_closure;
|
|
|
423
|
|
|
424 *(fcl->face_list) = Fcons (XFACE (value)->name, (*fcl->face_list));
|
|
|
425 return 0;
|
|
|
426 }
|
|
|
427
|
|
|
428 static Lisp_Object
|
|
|
429 faces_list_internal (Lisp_Object list)
|
|
|
430 {
|
|
|
431 Lisp_Object face_list = Qnil;
|
|
|
432 struct gcpro gcpro1;
|
|
|
433 struct face_list_closure face_list_closure;
|
|
|
434
|
|
|
435 GCPRO1 (face_list);
|
|
|
436 face_list_closure.face_list = &face_list;
|
|
|
437 elisp_maphash (add_face_to_list_mapper, list, &face_list_closure);
|
|
|
438 UNGCPRO;
|
|
|
439
|
|
|
440 return face_list;
|
|
|
441 }
|
|
|
442
|
|
|
443 static Lisp_Object
|
|
|
444 permanent_faces_list (void)
|
|
|
445 {
|
|
|
446 return faces_list_internal (Vpermanent_faces_cache);
|
|
|
447 }
|
|
|
448
|
|
|
449 static Lisp_Object
|
|
|
450 temporary_faces_list (void)
|
|
|
451 {
|
|
|
452 return faces_list_internal (Vtemporary_faces_cache);
|
|
|
453 }
|
|
|
454
|
|
|
455
|
|
|
456 static int
|
|
2286
|
457 mark_face_as_clean_mapper (Lisp_Object UNUSED (key), Lisp_Object value,
|
|
428
|
458 void *flag_closure)
|
|
|
459 {
|
|
|
460 /* This function can GC */
|
|
|
461 int *flag = (int *) flag_closure;
|
|
|
462 XFACE (value)->dirty = *flag;
|
|
|
463 return 0;
|
|
|
464 }
|
|
|
465
|
|
|
466 static void
|
|
|
467 mark_all_faces_internal (int flag)
|
|
|
468 {
|
|
|
469 elisp_maphash (mark_face_as_clean_mapper, Vpermanent_faces_cache, &flag);
|
|
|
470 elisp_maphash (mark_face_as_clean_mapper, Vtemporary_faces_cache, &flag);
|
|
|
471 }
|
|
|
472
|
|
|
473 void
|
|
|
474 mark_all_faces_as_clean (void)
|
|
|
475 {
|
|
|
476 mark_all_faces_internal (0);
|
|
|
477 }
|
|
|
478
|
|
|
479 /* Currently unused (see the comment in face_property_was_changed()). */
|
|
|
480 #if 0
|
|
|
481 /* #### OBSOLETE ME, PLEASE. Maybe. Maybe this is just as good as
|
|
|
482 any other solution. */
|
|
|
483 struct face_inheritance_closure
|
|
|
484 {
|
|
|
485 Lisp_Object face;
|
|
|
486 Lisp_Object property;
|
|
|
487 };
|
|
|
488
|
|
|
489 static void
|
|
|
490 update_inheritance_mapper_internal (Lisp_Object cur_face,
|
|
|
491 Lisp_Object inh_face,
|
|
|
492 Lisp_Object property)
|
|
|
493 {
|
|
|
494 /* #### fix this function */
|
|
|
495 Lisp_Object elt = Qnil;
|
|
|
496 struct gcpro gcpro1;
|
|
|
497
|
|
|
498 GCPRO1 (elt);
|
|
|
499
|
|
|
500 for (elt = FACE_PROPERTY_SPEC_LIST (cur_face, property, Qall);
|
|
|
501 !NILP (elt);
|
|
|
502 elt = XCDR (elt))
|
|
|
503 {
|
|
|
504 Lisp_Object values = XCDR (XCAR (elt));
|
|
|
505
|
|
|
506 for (; !NILP (values); values = XCDR (values))
|
|
|
507 {
|
|
|
508 Lisp_Object value = XCDR (XCAR (values));
|
|
|
509 if (VECTORP (value) && XVECTOR_LENGTH (value))
|
|
|
510 {
|
|
|
511 if (EQ (Ffind_face (XVECTOR_DATA (value)[0]), inh_face))
|
|
|
512 Fset_specifier_dirty_flag
|
|
|
513 (FACE_PROPERTY_SPECIFIER (inh_face, property));
|
|
|
514 }
|
|
|
515 }
|
|
|
516 }
|
|
|
517
|
|
|
518 UNGCPRO;
|
|
|
519 }
|
|
|
520
|
|
|
521 static int
|
|
442
|
522 update_face_inheritance_mapper (const void *hash_key, void *hash_contents,
|
|
428
|
523 void *face_inheritance_closure)
|
|
|
524 {
|
|
|
525 Lisp_Object key, contents;
|
|
|
526 struct face_inheritance_closure *fcl =
|
|
|
527 (struct face_inheritance_closure *) face_inheritance_closure;
|
|
|
528
|
|
826
|
529 key = VOID_TO_LISP (hash_key);
|
|
|
530 contents = VOID_TO_LISP (hash_contents);
|
|
428
|
531
|
|
|
532 if (EQ (fcl->property, Qfont))
|
|
|
533 {
|
|
|
534 update_inheritance_mapper_internal (contents, fcl->face, Qfont);
|
|
|
535 }
|
|
|
536 else if (EQ (fcl->property, Qforeground) ||
|
|
|
537 EQ (fcl->property, Qbackground))
|
|
|
538 {
|
|
|
539 update_inheritance_mapper_internal (contents, fcl->face, Qforeground);
|
|
|
540 update_inheritance_mapper_internal (contents, fcl->face, Qbackground);
|
|
|
541 }
|
|
|
542 else if (EQ (fcl->property, Qunderline) ||
|
|
|
543 EQ (fcl->property, Qstrikethru) ||
|
|
|
544 EQ (fcl->property, Qhighlight) ||
|
|
|
545 EQ (fcl->property, Qdim) ||
|
|
|
546 EQ (fcl->property, Qblinking) ||
|
|
|
547 EQ (fcl->property, Qreverse))
|
|
|
548 {
|
|
|
549 update_inheritance_mapper_internal (contents, fcl->face, Qunderline);
|
|
|
550 update_inheritance_mapper_internal (contents, fcl->face, Qstrikethru);
|
|
|
551 update_inheritance_mapper_internal (contents, fcl->face, Qhighlight);
|
|
|
552 update_inheritance_mapper_internal (contents, fcl->face, Qdim);
|
|
|
553 update_inheritance_mapper_internal (contents, fcl->face, Qblinking);
|
|
|
554 update_inheritance_mapper_internal (contents, fcl->face, Qreverse);
|
|
|
555 }
|
|
|
556 return 0;
|
|
|
557 }
|
|
|
558
|
|
|
559 static void
|
|
|
560 update_faces_inheritance (Lisp_Object face, Lisp_Object property)
|
|
|
561 {
|
|
|
562 struct face_inheritance_closure face_inheritance_closure;
|
|
|
563 struct gcpro gcpro1, gcpro2;
|
|
|
564
|
|
|
565 GCPRO2 (face, property);
|
|
|
566 face_inheritance_closure.face = face;
|
|
|
567 face_inheritance_closure.property = property;
|
|
|
568
|
|
|
569 elisp_maphash (update_face_inheritance_mapper, Vpermanent_faces_cache,
|
|
|
570 &face_inheritance_closure);
|
|
|
571 elisp_maphash (update_face_inheritance_mapper, Vtemporary_faces_cache,
|
|
|
572 &face_inheritance_closure);
|
|
|
573
|
|
|
574 UNGCPRO;
|
|
|
575 }
|
|
|
576 #endif /* 0 */
|
|
|
577
|
|
|
578 Lisp_Object
|
|
|
579 face_property_matching_instance (Lisp_Object face, Lisp_Object property,
|
|
|
580 Lisp_Object charset, Lisp_Object domain,
|
|
578
|
581 Error_Behavior errb, int no_fallback,
|
|
3659
|
582 Lisp_Object depth,
|
|
|
583 enum font_specifier_matchspec_stages stage)
|
|
428
|
584 {
|
|
771
|
585 Lisp_Object retval;
|
|
872
|
586 Lisp_Object matchspec = Qunbound;
|
|
|
587 struct gcpro gcpro1;
|
|
771
|
588
|
|
872
|
589 if (!NILP (charset))
|
|
3659
|
590 matchspec = noseeum_cons (charset,
|
|
|
591 stage == initial ? Qinitial : Qfinal);
|
|
|
592
|
|
872
|
593 GCPRO1 (matchspec);
|
|
|
594 retval = specifier_instance_no_quit (Fget (face, property, Qnil), matchspec,
|
|
771
|
595 domain, errb, no_fallback, depth);
|
|
872
|
596 UNGCPRO;
|
|
|
597 if (CONSP (matchspec))
|
|
|
598 free_cons (matchspec);
|
|
428
|
599
|
|
3659
|
600 if (UNBOUNDP (retval) && !no_fallback && final == stage)
|
|
428
|
601 {
|
|
|
602 if (EQ (property, Qfont))
|
|
|
603 {
|
|
|
604 if (NILP (memq_no_quit (charset,
|
|
|
605 XFACE (face)->charsets_warned_about)))
|
|
|
606 {
|
|
793
|
607 if (!UNBOUNDP (charset))
|
|
428
|
608 warn_when_safe
|
|
793
|
609 (Qfont, Qnotice,
|
|
|
610 "Unable to instantiate font for charset %s, face %s",
|
|
|
611 XSTRING_DATA (symbol_name
|
|
|
612 (XSYMBOL (XCHARSET_NAME (charset)))),
|
|
|
613 XSTRING_DATA (symbol_name
|
|
|
614 (XSYMBOL (XFACE (face)->name))));
|
|
428
|
615 XFACE (face)->charsets_warned_about =
|
|
|
616 Fcons (charset, XFACE (face)->charsets_warned_about);
|
|
|
617 }
|
|
|
618 retval = Vthe_null_font_instance;
|
|
|
619 }
|
|
|
620 }
|
|
|
621
|
|
|
622 return retval;
|
|
|
623 }
|
|
|
624
|
|
|
625
|
|
|
626 DEFUN ("facep", Ffacep, 1, 1, 0, /*
|
|
444
|
627 Return t if OBJECT is a face.
|
|
428
|
628 */
|
|
|
629 (object))
|
|
|
630 {
|
|
|
631 return FACEP (object) ? Qt : Qnil;
|
|
|
632 }
|
|
|
633
|
|
|
634 DEFUN ("find-face", Ffind_face, 1, 1, 0, /*
|
|
|
635 Retrieve the face of the given name.
|
|
|
636 If FACE-OR-NAME is a face object, it is simply returned.
|
|
|
637 Otherwise, FACE-OR-NAME should be a symbol. If there is no such face,
|
|
|
638 nil is returned. Otherwise the associated face object is returned.
|
|
|
639 */
|
|
|
640 (face_or_name))
|
|
|
641 {
|
|
|
642 Lisp_Object retval;
|
|
2865
|
643 Lisp_Object face_name;
|
|
|
644 Lisp_Object face_alias;
|
|
|
645 int i;
|
|
428
|
646
|
|
|
647 if (FACEP (face_or_name))
|
|
|
648 return face_or_name;
|
|
2865
|
649
|
|
|
650 face_name = face_or_name;
|
|
|
651 CHECK_SYMBOL (face_name);
|
|
|
652
|
|
2867
|
653 # define FACE_ALIAS_MAX_DEPTH 32
|
|
2865
|
654
|
|
|
655 i = 0;
|
|
|
656 while (! NILP ((face_alias = Fget (face_name, Qface_alias, Qnil)))
|
|
2867
|
657 && i < FACE_ALIAS_MAX_DEPTH)
|
|
2865
|
658 {
|
|
|
659 face_name = face_alias;
|
|
|
660 CHECK_SYMBOL (face_alias);
|
|
|
661 i += 1;
|
|
|
662 }
|
|
|
663
|
|
|
664 /* #### This test actually makes the aliasing max depth to 30, which is more
|
|
|
665 #### than enough IMO. -- dvl */
|
|
2867
|
666 if (i == FACE_ALIAS_MAX_DEPTH)
|
|
|
667 signal_error (Qcyclic_face_alias,
|
|
2865
|
668 "Max face aliasing depth reached",
|
|
|
669 face_name);
|
|
|
670
|
|
2867
|
671 # undef FACE_ALIAS_MAX_DEPTH
|
|
428
|
672
|
|
|
673 /* Check if the name represents a permanent face. */
|
|
2865
|
674 retval = Fgethash (face_name, Vpermanent_faces_cache, Qnil);
|
|
428
|
675 if (!NILP (retval))
|
|
|
676 return retval;
|
|
|
677
|
|
|
678 /* Check if the name represents a temporary face. */
|
|
2865
|
679 return Fgethash (face_name, Vtemporary_faces_cache, Qnil);
|
|
428
|
680 }
|
|
|
681
|
|
|
682 DEFUN ("get-face", Fget_face, 1, 1, 0, /*
|
|
|
683 Retrieve the face of the given name.
|
|
|
684 Same as `find-face' except an error is signalled if there is no such
|
|
|
685 face instead of returning nil.
|
|
|
686 */
|
|
|
687 (name))
|
|
|
688 {
|
|
|
689 Lisp_Object face = Ffind_face (name);
|
|
|
690
|
|
|
691 if (NILP (face))
|
|
563
|
692 invalid_argument ("No such face", name);
|
|
428
|
693 return face;
|
|
|
694 }
|
|
|
695
|
|
|
696 DEFUN ("face-name", Fface_name, 1, 1, 0, /*
|
|
|
697 Return the name of the given face.
|
|
|
698 */
|
|
|
699 (face))
|
|
|
700 {
|
|
|
701 return XFACE (Fget_face (face))->name;
|
|
|
702 }
|
|
|
703
|
|
|
704 DEFUN ("built-in-face-specifiers", Fbuilt_in_face_specifiers, 0, 0, 0, /*
|
|
|
705 Return a list of all built-in face specifier properties.
|
|
|
706 Don't modify this list!
|
|
|
707 */
|
|
|
708 ())
|
|
|
709 {
|
|
|
710 return Vbuilt_in_face_specifiers;
|
|
|
711 }
|
|
|
712
|
|
|
713 /* These values are retrieved so often that we make a special
|
|
|
714 function.
|
|
|
715 */
|
|
|
716
|
|
|
717 void
|
|
|
718 default_face_font_info (Lisp_Object domain, int *ascent, int *descent,
|
|
|
719 int *height, int *width, int *proportional_p)
|
|
|
720 {
|
|
|
721 Lisp_Object font_instance;
|
|
|
722
|
|
|
723 if (noninteractive)
|
|
|
724 {
|
|
|
725 if (ascent)
|
|
|
726 *ascent = 1;
|
|
|
727 if (descent)
|
|
|
728 *descent = 0;
|
|
|
729 if (height)
|
|
|
730 *height = 1;
|
|
|
731 if (width)
|
|
|
732 *width = 1;
|
|
|
733 if (proportional_p)
|
|
|
734 *proportional_p = 0;
|
|
|
735 return;
|
|
|
736 }
|
|
|
737
|
|
|
738 /* We use ASCII here. This is probably reasonable because the
|
|
|
739 people calling this function are using the resulting values to
|
|
|
740 come up with overall sizes for windows and frames. */
|
|
|
741 if (WINDOWP (domain))
|
|
|
742 {
|
|
|
743 struct face_cachel *cachel;
|
|
|
744 struct window *w = XWINDOW (domain);
|
|
|
745
|
|
|
746 /* #### It's possible for this function to get called when the
|
|
|
747 face cachels have not been initialized. I don't know why. */
|
|
|
748 if (!Dynarr_length (w->face_cachels))
|
|
|
749 reset_face_cachels (w);
|
|
|
750 cachel = WINDOW_FACE_CACHEL (w, DEFAULT_INDEX);
|
|
|
751 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
|
|
|
752 }
|
|
|
753 else
|
|
|
754 {
|
|
|
755 font_instance = FACE_FONT (Vdefault_face, domain, Vcharset_ascii);
|
|
|
756 }
|
|
|
757
|
|
|
758 if (height)
|
|
|
759 *height = XFONT_INSTANCE (font_instance)->height;
|
|
|
760 if (width)
|
|
|
761 *width = XFONT_INSTANCE (font_instance)->width;
|
|
|
762 if (ascent)
|
|
|
763 *ascent = XFONT_INSTANCE (font_instance)->ascent;
|
|
|
764 if (descent)
|
|
|
765 *descent = XFONT_INSTANCE (font_instance)->descent;
|
|
|
766 if (proportional_p)
|
|
|
767 *proportional_p = XFONT_INSTANCE (font_instance)->proportional_p;
|
|
|
768 }
|
|
|
769
|
|
|
770 void
|
|
|
771 default_face_height_and_width (Lisp_Object domain,
|
|
|
772 int *height, int *width)
|
|
|
773 {
|
|
|
774 default_face_font_info (domain, 0, 0, height, width, 0);
|
|
|
775 }
|
|
|
776
|
|
|
777 void
|
|
|
778 default_face_height_and_width_1 (Lisp_Object domain,
|
|
|
779 int *height, int *width)
|
|
|
780 {
|
|
|
781 if (window_system_pixelated_geometry (domain))
|
|
|
782 {
|
|
|
783 if (height)
|
|
|
784 *height = 1;
|
|
|
785 if (width)
|
|
|
786 *width = 1;
|
|
|
787 }
|
|
|
788 else
|
|
|
789 default_face_height_and_width (domain, height, width);
|
|
|
790 }
|
|
|
791
|
|
|
792 DEFUN ("face-list", Fface_list, 0, 1, 0, /*
|
|
|
793 Return a list of the names of all defined faces.
|
|
|
794 If TEMPORARY is nil, only the permanent faces are included.
|
|
|
795 If it is t, only the temporary faces are included. If it is any
|
|
|
796 other non-nil value both permanent and temporary are included.
|
|
|
797 */
|
|
|
798 (temporary))
|
|
|
799 {
|
|
|
800 Lisp_Object face_list = Qnil;
|
|
|
801
|
|
|
802 /* Added the permanent faces, if requested. */
|
|
|
803 if (NILP (temporary) || !EQ (Qt, temporary))
|
|
|
804 face_list = permanent_faces_list ();
|
|
|
805
|
|
|
806 if (!NILP (temporary))
|
|
|
807 {
|
|
|
808 struct gcpro gcpro1;
|
|
|
809 GCPRO1 (face_list);
|
|
|
810 face_list = nconc2 (face_list, temporary_faces_list ());
|
|
|
811 UNGCPRO;
|
|
|
812 }
|
|
|
813
|
|
|
814 return face_list;
|
|
|
815 }
|
|
|
816
|
|
|
817 DEFUN ("make-face", Fmake_face, 1, 3, 0, /*
|
|
444
|
818 Define a new face with name NAME (a symbol), described by DOC-STRING.
|
|
|
819 You can modify the font, color, etc. of a face with the set-face-* functions.
|
|
428
|
820 If the face already exists, it is unmodified.
|
|
|
821 If TEMPORARY is non-nil, this face will cease to exist if not in use.
|
|
|
822 */
|
|
|
823 (name, doc_string, temporary))
|
|
|
824 {
|
|
|
825 /* This function can GC if initialized is non-zero */
|
|
440
|
826 Lisp_Face *f;
|
|
428
|
827 Lisp_Object face;
|
|
|
828
|
|
|
829 CHECK_SYMBOL (name);
|
|
|
830 if (!NILP (doc_string))
|
|
|
831 CHECK_STRING (doc_string);
|
|
|
832
|
|
|
833 face = Ffind_face (name);
|
|
|
834 if (!NILP (face))
|
|
|
835 return face;
|
|
|
836
|
|
|
837 f = allocate_face ();
|
|
793
|
838 face = wrap_face (f);
|
|
428
|
839
|
|
|
840 f->name = name;
|
|
|
841 f->doc_string = doc_string;
|
|
|
842 f->foreground = Fmake_specifier (Qcolor);
|
|
|
843 set_color_attached_to (f->foreground, face, Qforeground);
|
|
|
844 f->background = Fmake_specifier (Qcolor);
|
|
|
845 set_color_attached_to (f->background, face, Qbackground);
|
|
|
846 f->font = Fmake_specifier (Qfont);
|
|
|
847 set_font_attached_to (f->font, face, Qfont);
|
|
|
848 f->background_pixmap = Fmake_specifier (Qimage);
|
|
|
849 set_image_attached_to (f->background_pixmap, face, Qbackground_pixmap);
|
|
|
850 f->display_table = Fmake_specifier (Qdisplay_table);
|
|
|
851 f->underline = Fmake_specifier (Qface_boolean);
|
|
|
852 set_face_boolean_attached_to (f->underline, face, Qunderline);
|
|
|
853 f->strikethru = Fmake_specifier (Qface_boolean);
|
|
|
854 set_face_boolean_attached_to (f->strikethru, face, Qstrikethru);
|
|
|
855 f->highlight = Fmake_specifier (Qface_boolean);
|
|
|
856 set_face_boolean_attached_to (f->highlight, face, Qhighlight);
|
|
|
857 f->dim = Fmake_specifier (Qface_boolean);
|
|
|
858 set_face_boolean_attached_to (f->dim, face, Qdim);
|
|
|
859 f->blinking = Fmake_specifier (Qface_boolean);
|
|
|
860 set_face_boolean_attached_to (f->blinking, face, Qblinking);
|
|
|
861 f->reverse = Fmake_specifier (Qface_boolean);
|
|
|
862 set_face_boolean_attached_to (f->reverse, face, Qreverse);
|
|
|
863 if (!NILP (Vdefault_face))
|
|
|
864 {
|
|
|
865 /* If the default face has already been created, set it as
|
|
|
866 the default fallback specifier for all the specifiers we
|
|
|
867 just created. This implements the standard "all faces
|
|
|
868 inherit from default" behavior. */
|
|
|
869 set_specifier_fallback (f->foreground,
|
|
|
870 Fget (Vdefault_face, Qforeground, Qunbound));
|
|
|
871 set_specifier_fallback (f->background,
|
|
|
872 Fget (Vdefault_face, Qbackground, Qunbound));
|
|
|
873 set_specifier_fallback (f->font,
|
|
|
874 Fget (Vdefault_face, Qfont, Qunbound));
|
|
|
875 set_specifier_fallback (f->background_pixmap,
|
|
|
876 Fget (Vdefault_face, Qbackground_pixmap,
|
|
|
877 Qunbound));
|
|
|
878 set_specifier_fallback (f->display_table,
|
|
|
879 Fget (Vdefault_face, Qdisplay_table, Qunbound));
|
|
|
880 set_specifier_fallback (f->underline,
|
|
|
881 Fget (Vdefault_face, Qunderline, Qunbound));
|
|
|
882 set_specifier_fallback (f->strikethru,
|
|
|
883 Fget (Vdefault_face, Qstrikethru, Qunbound));
|
|
|
884 set_specifier_fallback (f->highlight,
|
|
|
885 Fget (Vdefault_face, Qhighlight, Qunbound));
|
|
|
886 set_specifier_fallback (f->dim,
|
|
|
887 Fget (Vdefault_face, Qdim, Qunbound));
|
|
|
888 set_specifier_fallback (f->blinking,
|
|
|
889 Fget (Vdefault_face, Qblinking, Qunbound));
|
|
|
890 set_specifier_fallback (f->reverse,
|
|
|
891 Fget (Vdefault_face, Qreverse, Qunbound));
|
|
|
892 }
|
|
|
893
|
|
|
894 /* Add the face to the appropriate list. */
|
|
|
895 if (NILP (temporary))
|
|
|
896 Fputhash (name, face, Vpermanent_faces_cache);
|
|
|
897 else
|
|
|
898 Fputhash (name, face, Vtemporary_faces_cache);
|
|
|
899
|
|
|
900 /* Note that it's OK if we dump faces.
|
|
|
901 When we start up again when we're not noninteractive,
|
|
|
902 `init-global-faces' is called and it resources all
|
|
|
903 existing faces. */
|
|
|
904 if (initialized && !noninteractive)
|
|
|
905 {
|
|
|
906 struct gcpro gcpro1, gcpro2;
|
|
|
907
|
|
|
908 GCPRO2 (name, face);
|
|
|
909 call1 (Qinit_face_from_resources, name);
|
|
|
910 UNGCPRO;
|
|
|
911 }
|
|
|
912
|
|
|
913 return face;
|
|
|
914 }
|
|
|
915
|
|
|
916
|
|
|
917 /*****************************************************************************
|
|
|
918 initialization code
|
|
|
919 ****************************************************************************/
|
|
|
920
|
|
|
921 void
|
|
|
922 init_global_faces (struct device *d)
|
|
|
923 {
|
|
|
924 /* When making the initial terminal device, there is no Lisp code
|
|
|
925 loaded, so we can't do this. */
|
|
|
926 if (initialized && !noninteractive)
|
|
872
|
927 call_critical_lisp_code (d, Qinit_global_faces, wrap_device (d));
|
|
428
|
928 }
|
|
|
929
|
|
|
930 void
|
|
|
931 init_device_faces (struct device *d)
|
|
|
932 {
|
|
|
933 /* This function can call lisp */
|
|
|
934
|
|
|
935 /* When making the initial terminal device, there is no Lisp code
|
|
|
936 loaded, so we can't do this. */
|
|
|
937 if (initialized)
|
|
872
|
938 call_critical_lisp_code (d, Qinit_device_faces, wrap_device (d));
|
|
428
|
939 }
|
|
|
940
|
|
|
941 void
|
|
|
942 init_frame_faces (struct frame *frm)
|
|
|
943 {
|
|
|
944 /* When making the initial terminal device, there is no Lisp code
|
|
|
945 loaded, so we can't do this. */
|
|
|
946 if (initialized)
|
|
|
947 {
|
|
793
|
948 Lisp_Object tframe = wrap_frame (frm);
|
|
|
949
|
|
428
|
950
|
|
|
951 /* DO NOT change the selected frame here. If the debugger goes off
|
|
|
952 it will try and display on the frame being created, but it is not
|
|
|
953 ready for that yet and a horrible death will occur. Any random
|
|
|
954 code depending on the selected-frame as an implicit arg should be
|
|
|
955 tracked down and shot. For the benefit of the one known,
|
|
|
956 xpm-color-symbols, make-frame sets the variable
|
|
|
957 Vframe_being_created to the frame it is making and sets it to nil
|
|
|
958 when done. Internal functions that this could trigger which are
|
|
|
959 currently depending on selected-frame should use this instead. It
|
|
|
960 is not currently visible at the lisp level. */
|
|
|
961 call_critical_lisp_code (XDEVICE (FRAME_DEVICE (frm)),
|
|
|
962 Qinit_frame_faces, tframe);
|
|
|
963 }
|
|
|
964 }
|
|
|
965
|
|
|
966
|
|
|
967 /****************************************************************************
|
|
|
968 * face cache element functions *
|
|
|
969 ****************************************************************************/
|
|
|
970
|
|
|
971 /*
|
|
|
972
|
|
|
973 #### Here is a description of how the face cache elements ought
|
|
|
974 to be redone. It is *NOT* how they work currently:
|
|
|
975
|
|
|
976 However, when I started to go about implementing this, I realized
|
|
|
977 that there are all sorts of subtle problems with cache coherency
|
|
|
978 that are coming up. As it turns out, these problems don't
|
|
|
979 manifest themselves now due to the brute-force "kill 'em all"
|
|
|
980 approach to cache invalidation when faces change; but if this
|
|
|
981 is ever made smarter, these problems are going to come up, and
|
|
|
982 some of them are very non-obvious.
|
|
|
983
|
|
|
984 I'm thinking of redoing the cache code a bit to avoid these
|
|
|
985 coherency problems. The bulk of the problems will arise because
|
|
|
986 the current display structures have simple indices into the
|
|
|
987 face cache, but the cache can be changed at various times,
|
|
|
988 which could make the current display structures incorrect.
|
|
|
989 I guess the dirty and updated flags are an attempt to fix
|
|
|
990 this, but this approach doesn't really work.
|
|
|
991
|
|
|
992 Here's an approach that should keep things clean and unconfused:
|
|
|
993
|
|
|
994 1) Imagine a "virtual face cache" that can grow arbitrarily
|
|
|
995 big and for which the only thing allowed is to add new
|
|
|
996 elements. Existing elements cannot be removed or changed.
|
|
|
997 This way, any pointers in the existing redisplay structure
|
|
|
998 into the cache never get screwed up. (This is important
|
|
|
999 because even if a cache element is out of date, if there's
|
|
|
1000 a pointer to it then its contents still accurately describe
|
|
|
1001 the way the text currently looks on the screen.)
|
|
|
1002 2) Each element in the virtual cache either describes exactly
|
|
|
1003 one face, or describes the merger of a number of faces
|
|
|
1004 by some process. In order to simplify things, for mergers
|
|
|
1005 we do not record which faces or ordering was used, but
|
|
|
1006 simply that this cache element is the result of merging.
|
|
|
1007 Unlike the current implementation, it's important that a
|
|
|
1008 single cache element not be used to both describe a
|
|
|
1009 single face and describe a merger, even if all the property
|
|
|
1010 values are the same.
|
|
|
1011 3) Each cache element can be clean or dirty. "Dirty" means
|
|
|
1012 that the face that the element points to has been changed;
|
|
|
1013 this gets set at the time the face is changed. This
|
|
|
1014 way, when looking up a value in the cache, you can determine
|
|
|
1015 whether it's out of date or not. For merged faces it
|
|
|
1016 does not matter -- we don't record the faces or priority
|
|
|
1017 used to create the merger, so it's impossible to look up
|
|
|
1018 one of these faces. We have to recompute it each time.
|
|
|
1019 Luckily, this is fine -- doing the merge is much
|
|
|
1020 less expensive than recomputing the properties of a
|
|
|
1021 single face.
|
|
|
1022 4) For each cache element, we keep a hash value. (In order
|
|
|
1023 to hash the boolean properties, we convert each of them
|
|
|
1024 into a different large prime number so that the hashing works
|
|
|
1025 well.) This allows us, when comparing runes, to properly
|
|
|
1026 determine whether the face for that rune has changed.
|
|
|
1027 This will be especially important for TTY's, where there
|
|
|
1028 aren't that many faces and minimizing redraw is very
|
|
|
1029 important.
|
|
|
1030 5) We can't actually keep an infinite cache, but that doesn't
|
|
|
1031 really matter that much. The only elements we care about
|
|
|
1032 are those that are used by either the current or desired
|
|
|
1033 display structs. Therefore, we keep a per-window
|
|
|
1034 redisplay iteration number, and mark each element with
|
|
|
1035 that number as we use it. Just after outputting the
|
|
|
1036 window and synching the redisplay structs, we go through
|
|
|
1037 the cache and invalidate all elements that are not clean
|
|
|
1038 elements referring to a particular face and that do not
|
|
|
1039 have an iteration number equal to the current one. We
|
|
|
1040 keep them in a chain, and use them to allocate new
|
|
|
1041 elements when possible instead of increasing the Dynarr.
|
|
|
1042
|
|
872
|
1043 --ben (?? At least I think I wrote this!)
|
|
428
|
1044 */
|
|
|
1045
|
|
|
1046 /* mark for GC a dynarr of face cachels. */
|
|
|
1047
|
|
|
1048 void
|
|
|
1049 mark_face_cachels (face_cachel_dynarr *elements)
|
|
|
1050 {
|
|
|
1051 int elt;
|
|
|
1052
|
|
|
1053 if (!elements)
|
|
|
1054 return;
|
|
|
1055
|
|
|
1056 for (elt = 0; elt < Dynarr_length (elements); elt++)
|
|
|
1057 {
|
|
|
1058 struct face_cachel *cachel = Dynarr_atp (elements, elt);
|
|
|
1059
|
|
|
1060 {
|
|
|
1061 int i;
|
|
|
1062
|
|
|
1063 for (i = 0; i < NUM_LEADING_BYTES; i++)
|
|
|
1064 if (!NILP (cachel->font[i]) && !UNBOUNDP (cachel->font[i]))
|
|
|
1065 mark_object (cachel->font[i]);
|
|
|
1066 }
|
|
|
1067 mark_object (cachel->face);
|
|
|
1068 mark_object (cachel->foreground);
|
|
|
1069 mark_object (cachel->background);
|
|
|
1070 mark_object (cachel->display_table);
|
|
|
1071 mark_object (cachel->background_pixmap);
|
|
|
1072 }
|
|
|
1073 }
|
|
|
1074
|
|
|
1075 /* ensure that the given cachel contains an updated font value for
|
|
3094
|
1076 the given charset. Return the updated font value (which can be
|
|
|
1077 Qunbound, so this value must not be passed unchecked to Lisp).
|
|
|
1078
|
|
|
1079 #### Xft: This function will need to be updated for new font model. */
|
|
428
|
1080
|
|
|
1081 Lisp_Object
|
|
|
1082 ensure_face_cachel_contains_charset (struct face_cachel *cachel,
|
|
|
1083 Lisp_Object domain, Lisp_Object charset)
|
|
|
1084 {
|
|
|
1085 Lisp_Object new_val;
|
|
|
1086 Lisp_Object face = cachel->face;
|
|
3659
|
1087 int bound = 1, final_stage = 0;
|
|
428
|
1088 int offs = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
|
|
|
1089
|
|
3659
|
1090 if (!UNBOUNDP (cachel->font[offs]) &&
|
|
|
1091 bit_vector_bit(FACE_CACHEL_FONT_UPDATED (cachel), offs))
|
|
428
|
1092 return cachel->font[offs];
|
|
|
1093
|
|
|
1094 if (UNBOUNDP (face))
|
|
|
1095 {
|
|
|
1096 /* a merged face. */
|
|
|
1097 int i;
|
|
|
1098 struct window *w = XWINDOW (domain);
|
|
|
1099
|
|
|
1100 new_val = Qunbound;
|
|
3659
|
1101 set_bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs, 0);
|
|
|
1102
|
|
428
|
1103 for (i = 0; i < cachel->nfaces; i++)
|
|
|
1104 {
|
|
|
1105 struct face_cachel *oth;
|
|
|
1106
|
|
|
1107 oth = Dynarr_atp (w->face_cachels,
|
|
|
1108 FACE_CACHEL_FINDEX_UNSAFE (cachel, i));
|
|
|
1109 /* Tout le monde aime la recursion */
|
|
|
1110 ensure_face_cachel_contains_charset (oth, domain, charset);
|
|
|
1111
|
|
3659
|
1112 if (bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(oth), offs))
|
|
428
|
1113 {
|
|
|
1114 new_val = oth->font[offs];
|
|
3659
|
1115 set_bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs, 1);
|
|
|
1116 set_bit_vector_bit
|
|
|
1117 (FACE_CACHEL_FONT_FINAL_STAGE(cachel), offs,
|
|
|
1118 bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE(oth), offs));
|
|
428
|
1119 break;
|
|
|
1120 }
|
|
|
1121 }
|
|
|
1122
|
|
3659
|
1123 if (!bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs))
|
|
428
|
1124 /* need to do the default face. */
|
|
|
1125 {
|
|
|
1126 struct face_cachel *oth =
|
|
|
1127 Dynarr_atp (w->face_cachels, DEFAULT_INDEX);
|
|
|
1128 ensure_face_cachel_contains_charset (oth, domain, charset);
|
|
|
1129
|
|
|
1130 new_val = oth->font[offs];
|
|
|
1131 }
|
|
|
1132
|
|
3659
|
1133 if (!UNBOUNDP (cachel->font[offs]) &&
|
|
|
1134 !EQ (cachel->font[offs], new_val))
|
|
428
|
1135 cachel->dirty = 1;
|
|
3659
|
1136 set_bit_vector_bit(FACE_CACHEL_FONT_UPDATED(cachel), offs, 1);
|
|
428
|
1137 cachel->font[offs] = new_val;
|
|
3659
|
1138 DEBUG_FACES("just recursed on the unbound face, returning "
|
|
|
1139 "something %s\n", UNBOUNDP(new_val) ? "not bound"
|
|
|
1140 : "bound");
|
|
428
|
1141 return new_val;
|
|
|
1142 }
|
|
|
1143
|
|
3659
|
1144 do {
|
|
|
1145
|
|
|
1146 /* Lookup the face, specifying the initial stage and that fallbacks
|
|
|
1147 shouldn't happen. */
|
|
|
1148 new_val = face_property_matching_instance (face, Qfont, charset, domain,
|
|
|
1149 /* ERROR_ME_DEBUG_WARN is
|
|
|
1150 fine here. */
|
|
|
1151 ERROR_ME_DEBUG_WARN, 1, Qzero,
|
|
|
1152 initial);
|
|
|
1153 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, initial, "
|
|
|
1154 "result was something %s\n",
|
|
|
1155 XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
|
|
|
1156 XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
|
|
|
1157 UNBOUNDP(new_val) ? "not bound" : "bound");
|
|
|
1158
|
|
|
1159 if (!UNBOUNDP (new_val)) break;
|
|
|
1160
|
|
|
1161 bound = 0;
|
|
|
1162 /* Lookup the face again, this time allowing the fallback. If this
|
|
|
1163 succeeds, it'll give a font intended for the script in question,
|
|
|
1164 which is preferable to translating to ISO10646-1 and using the
|
|
3676
|
1165 fixed-width fallback. */
|
|
3659
|
1166 new_val = face_property_matching_instance (face, Qfont,
|
|
|
1167 charset, domain,
|
|
|
1168 ERROR_ME_DEBUG_WARN, 0,
|
|
|
1169 Qzero,
|
|
|
1170 initial);
|
|
|
1171
|
|
|
1172 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, initial, "
|
|
|
1173 "allow fallback, result was something %s\n",
|
|
|
1174 XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
|
|
|
1175 XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
|
|
|
1176 UNBOUNDP(new_val) ? "not bound" : "bound");
|
|
|
1177
|
|
|
1178 if (!UNBOUNDP(new_val))
|
|
|
1179 {
|
|
|
1180 break;
|
|
|
1181 }
|
|
|
1182
|
|
|
1183 bound = 1;
|
|
|
1184 /* Try the face itself with the final-stage specifiers. */
|
|
|
1185 new_val = face_property_matching_instance (face, Qfont,
|
|
|
1186 charset, domain,
|
|
|
1187 ERROR_ME_DEBUG_WARN, 1,
|
|
|
1188 Qzero,
|
|
|
1189 final);
|
|
|
1190
|
|
|
1191 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, final, "
|
|
|
1192 "result was something %s\n",
|
|
|
1193 XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
|
|
|
1194 XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
|
|
|
1195 UNBOUNDP(new_val) ? "not bound" : "bound");
|
|
|
1196 /* Tell X11 redisplay that it should translate to iso10646-1. */
|
|
|
1197 if (!UNBOUNDP(new_val))
|
|
|
1198 {
|
|
|
1199 final_stage = 1;
|
|
|
1200 break;
|
|
|
1201 }
|
|
|
1202
|
|
|
1203 bound = 0;
|
|
|
1204
|
|
|
1205 /* Lookup the face again, this time both allowing the fallback and
|
|
|
1206 allowing its final stage to be used. */
|
|
|
1207 new_val = face_property_matching_instance (face, Qfont,
|
|
|
1208 charset, domain,
|
|
|
1209 ERROR_ME_DEBUG_WARN, 0,
|
|
|
1210 Qzero,
|
|
|
1211 final);
|
|
|
1212
|
|
|
1213 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, initial, "
|
|
|
1214 "allow fallback, result was something %s\n",
|
|
|
1215 XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
|
|
|
1216 XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
|
|
|
1217 UNBOUNDP(new_val) ? "not bound" : "bound");
|
|
|
1218 if (!UNBOUNDP(new_val))
|
|
|
1219 {
|
|
|
1220 /* Tell X11 redisplay that it should translate to iso10646-1. */
|
|
|
1221 final_stage = 1;
|
|
|
1222 break;
|
|
|
1223 }
|
|
|
1224 } while (0);
|
|
|
1225
|
|
428
|
1226 if (!UNBOUNDP (cachel->font[offs]) && !EQ (new_val, cachel->font[offs]))
|
|
|
1227 cachel->dirty = 1;
|
|
3659
|
1228
|
|
|
1229 set_bit_vector_bit(FACE_CACHEL_FONT_UPDATED(cachel), offs, 1);
|
|
|
1230 set_bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE(cachel), offs,
|
|
|
1231 final_stage);
|
|
|
1232 set_bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs,
|
|
|
1233 (bound || EQ (face, Vdefault_face)));
|
|
428
|
1234 cachel->font[offs] = new_val;
|
|
|
1235 return new_val;
|
|
|
1236 }
|
|
|
1237
|
|
|
1238 /* Ensure that the given cachel contains updated fonts for all
|
|
|
1239 the charsets specified. */
|
|
|
1240
|
|
|
1241 void
|
|
|
1242 ensure_face_cachel_complete (struct face_cachel *cachel,
|
|
|
1243 Lisp_Object domain, unsigned char *charsets)
|
|
|
1244 {
|
|
|
1245 int i;
|
|
|
1246
|
|
|
1247 for (i = 0; i < NUM_LEADING_BYTES; i++)
|
|
|
1248 if (charsets[i])
|
|
|
1249 {
|
|
826
|
1250 Lisp_Object charset = charset_by_leading_byte (i + MIN_LEADING_BYTE);
|
|
428
|
1251 assert (CHARSETP (charset));
|
|
|
1252 ensure_face_cachel_contains_charset (cachel, domain, charset);
|
|
|
1253 }
|
|
|
1254 }
|
|
|
1255
|
|
|
1256 void
|
|
|
1257 face_cachel_charset_font_metric_info (struct face_cachel *cachel,
|
|
|
1258 unsigned char *charsets,
|
|
|
1259 struct font_metric_info *fm)
|
|
|
1260 {
|
|
|
1261 int i;
|
|
|
1262
|
|
|
1263 fm->width = 1;
|
|
|
1264 fm->height = fm->ascent = 1;
|
|
|
1265 fm->descent = 0;
|
|
|
1266 fm->proportional_p = 0;
|
|
|
1267
|
|
|
1268 for (i = 0; i < NUM_LEADING_BYTES; i++)
|
|
|
1269 {
|
|
|
1270 if (charsets[i])
|
|
|
1271 {
|
|
826
|
1272 Lisp_Object charset = charset_by_leading_byte (i + MIN_LEADING_BYTE);
|
|
428
|
1273 Lisp_Object font_instance = FACE_CACHEL_FONT (cachel, charset);
|
|
440
|
1274 Lisp_Font_Instance *fi = XFONT_INSTANCE (font_instance);
|
|
428
|
1275
|
|
|
1276 assert (CHARSETP (charset));
|
|
|
1277 assert (FONT_INSTANCEP (font_instance));
|
|
|
1278
|
|
|
1279 if (fm->ascent < (int) fi->ascent) fm->ascent = (int) fi->ascent;
|
|
|
1280 if (fm->descent < (int) fi->descent) fm->descent = (int) fi->descent;
|
|
|
1281 fm->height = fm->ascent + fm->descent;
|
|
|
1282 if (fi->proportional_p)
|
|
|
1283 fm->proportional_p = 1;
|
|
|
1284 if (EQ (charset, Vcharset_ascii))
|
|
|
1285 fm->width = fi->width;
|
|
|
1286 }
|
|
|
1287 }
|
|
|
1288 }
|
|
|
1289
|
|
|
1290 #define FROB(field) \
|
|
|
1291 do { \
|
|
|
1292 Lisp_Object new_val = \
|
|
|
1293 FACE_PROPERTY_INSTANCE (face, Q##field, domain, 1, Qzero); \
|
|
|
1294 int bound = 1; \
|
|
|
1295 if (UNBOUNDP (new_val)) \
|
|
|
1296 { \
|
|
|
1297 bound = 0; \
|
|
|
1298 new_val = FACE_PROPERTY_INSTANCE (face, Q##field, domain, 0, Qzero); \
|
|
|
1299 } \
|
|
|
1300 if (!EQ (new_val, cachel->field)) \
|
|
|
1301 { \
|
|
|
1302 cachel->field = new_val; \
|
|
|
1303 cachel->dirty = 1; \
|
|
|
1304 } \
|
|
|
1305 cachel->field##_specified = (bound || default_face); \
|
|
|
1306 } while (0)
|
|
|
1307
|
|
446
|
1308 /*
|
|
|
1309 * A face's background pixmap will override the face's
|
|
|
1310 * background color. But the background pixmap of the
|
|
|
1311 * default face should not override the background color of
|
|
|
1312 * a face if the background color has been specified or
|
|
|
1313 * inherited.
|
|
|
1314 *
|
|
|
1315 * To accomplish this we remove the background pixmap of the
|
|
|
1316 * cachel and mark it as having been specified so that cachel
|
|
|
1317 * merging won't override it later.
|
|
|
1318 */
|
|
|
1319 #define MAYBE_UNFROB_BACKGROUND_PIXMAP \
|
|
|
1320 do \
|
|
|
1321 { \
|
|
|
1322 if (! default_face \
|
|
|
1323 && cachel->background_specified \
|
|
|
1324 && ! cachel->background_pixmap_specified) \
|
|
|
1325 { \
|
|
|
1326 cachel->background_pixmap = Qunbound; \
|
|
|
1327 cachel->background_pixmap_specified = 1; \
|
|
|
1328 } \
|
|
|
1329 } while (0)
|
|
|
1330
|
|
|
1331
|
|
|
1332 /* Add a cachel for the given face to the given window's cache. */
|
|
|
1333
|
|
|
1334 static void
|
|
|
1335 add_face_cachel (struct window *w, Lisp_Object face)
|
|
|
1336 {
|
|
|
1337 int must_finish_frobbing = ! WINDOW_FACE_CACHEL (w, DEFAULT_INDEX);
|
|
|
1338 struct face_cachel new_cachel;
|
|
|
1339 Lisp_Object domain;
|
|
|
1340
|
|
|
1341 reset_face_cachel (&new_cachel);
|
|
793
|
1342 domain = wrap_window (w);
|
|
446
|
1343 update_face_cachel_data (&new_cachel, domain, face);
|
|
|
1344 Dynarr_add (w->face_cachels, new_cachel);
|
|
|
1345
|
|
|
1346 /* The face's background pixmap have not yet been frobbed (see comment
|
|
|
1347 int update_face_cachel_data), so we have to do it now */
|
|
|
1348 if (must_finish_frobbing)
|
|
|
1349 {
|
|
|
1350 int default_face = EQ (face, Vdefault_face);
|
|
|
1351 struct face_cachel *cachel
|
|
|
1352 = Dynarr_atp (w->face_cachels, Dynarr_length (w->face_cachels) - 1);
|
|
|
1353
|
|
|
1354 FROB (background_pixmap);
|
|
|
1355 MAYBE_UNFROB_BACKGROUND_PIXMAP;
|
|
|
1356 }
|
|
|
1357 }
|
|
|
1358
|
|
|
1359 /* Called when the updated flag has been cleared on a cachel.
|
|
|
1360 This function returns 1 if the caller must finish the update (see comment
|
|
|
1361 below), 0 otherwise.
|
|
|
1362 */
|
|
|
1363
|
|
|
1364 void
|
|
|
1365 update_face_cachel_data (struct face_cachel *cachel,
|
|
|
1366 Lisp_Object domain,
|
|
|
1367 Lisp_Object face)
|
|
|
1368 {
|
|
|
1369 if (XFACE (face)->dirty || UNBOUNDP (cachel->face))
|
|
|
1370 {
|
|
|
1371 int default_face = EQ (face, Vdefault_face);
|
|
|
1372 cachel->face = face;
|
|
|
1373
|
|
|
1374 /* We normally only set the _specified flags if the value was
|
|
|
1375 actually bound. The exception is for the default face where
|
|
|
1376 we always set it since it is the ultimate fallback. */
|
|
|
1377
|
|
428
|
1378 FROB (foreground);
|
|
|
1379 FROB (background);
|
|
|
1380 FROB (display_table);
|
|
446
|
1381
|
|
|
1382 /* #### WARNING: the background pixmap property of faces is currently
|
|
|
1383 the only one dealing with images. The problem we have here is that
|
|
|
1384 frobbing the background pixmap might lead to image instantiation
|
|
|
1385 which in turn might require that the cache we're building be up to
|
|
|
1386 date, hence a crash. Here's a typical scenario of this:
|
|
|
1387
|
|
|
1388 - a new window is created and it's face cache elements are
|
|
|
1389 initialized through a call to reset_face_cachels[1]. At that point,
|
|
|
1390 the cache for the default and modeline faces (normaly taken care of
|
|
|
1391 by redisplay itself) are null.
|
|
|
1392 - the default face has a background pixmap which needs to be
|
|
|
1393 instantiated right here, as a consequence of cache initialization.
|
|
|
1394 - the background pixmap image happens to be instantiated as a string
|
|
|
1395 (this happens on tty's for instance).
|
|
|
1396 - In order to do this, we need to compute the string geometry.
|
|
|
1397 - In order to do this, we might have to access the window's default
|
|
|
1398 face cache. But this is the cache we're building right now, it is
|
|
|
1399 null.
|
|
|
1400 - BARF !!!!!
|
|
428
|
1401
|
|
446
|
1402 To sum up, this means that it is in general unsafe to instantiate
|
|
|
1403 images before face cache updating is complete (appart from image
|
|
|
1404 related face attributes). The solution we use below is to actually
|
|
|
1405 detect whether we're building the window's face_cachels for the first
|
|
|
1406 time, and simply NOT frob the background pixmap in that case. If
|
|
|
1407 other image-related face attributes are ever implemented, they should
|
|
|
1408 be protected the same way right here.
|
|
|
1409
|
|
|
1410 One note:
|
|
|
1411 * See comment in `default_face_font_info' in face.c. Who wrote it ?
|
|
|
1412 Maybe we have the begining of an answer here ?
|
|
|
1413
|
|
|
1414 Footnotes:
|
|
|
1415 [1] See comment at the top of `allocate_window' in window.c.
|
|
|
1416
|
|
|
1417 -- didier
|
|
|
1418 */
|
|
|
1419 if (! WINDOWP (domain)
|
|
|
1420 || WINDOW_FACE_CACHEL (DOMAIN_XWINDOW (domain), DEFAULT_INDEX))
|
|
428
|
1421 {
|
|
446
|
1422 FROB (background_pixmap);
|
|
|
1423 MAYBE_UNFROB_BACKGROUND_PIXMAP;
|
|
428
|
1424 }
|
|
|
1425 #undef FROB
|
|
446
|
1426 #undef MAYBE_UNFROB_BACKGROUND_PIXMAP
|
|
428
|
1427
|
|
|
1428 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii);
|
|
|
1429
|
|
|
1430 #define FROB(field) \
|
|
|
1431 do { \
|
|
|
1432 Lisp_Object new_val = \
|
|
|
1433 FACE_PROPERTY_INSTANCE (face, Q##field, domain, 1, Qzero); \
|
|
|
1434 int bound = 1; \
|
|
|
1435 unsigned int new_val_int; \
|
|
|
1436 if (UNBOUNDP (new_val)) \
|
|
|
1437 { \
|
|
|
1438 bound = 0; \
|
|
|
1439 new_val = FACE_PROPERTY_INSTANCE (face, Q##field, domain, 0, Qzero); \
|
|
|
1440 } \
|
|
|
1441 new_val_int = EQ (new_val, Qt); \
|
|
|
1442 if (cachel->field != new_val_int) \
|
|
|
1443 { \
|
|
|
1444 cachel->field = new_val_int; \
|
|
|
1445 cachel->dirty = 1; \
|
|
|
1446 } \
|
|
|
1447 cachel->field##_specified = bound; \
|
|
|
1448 } while (0)
|
|
|
1449
|
|
|
1450 FROB (underline);
|
|
|
1451 FROB (strikethru);
|
|
|
1452 FROB (highlight);
|
|
|
1453 FROB (dim);
|
|
|
1454 FROB (reverse);
|
|
|
1455 FROB (blinking);
|
|
|
1456 #undef FROB
|
|
|
1457 }
|
|
|
1458
|
|
|
1459 cachel->updated = 1;
|
|
|
1460 }
|
|
|
1461
|
|
|
1462 /* Merge the cachel identified by FINDEX in window W into the given
|
|
|
1463 cachel. */
|
|
|
1464
|
|
|
1465 static void
|
|
|
1466 merge_face_cachel_data (struct window *w, face_index findex,
|
|
|
1467 struct face_cachel *cachel)
|
|
|
1468 {
|
|
3659
|
1469 int offs;
|
|
|
1470
|
|
428
|
1471 #define FINDEX_FIELD(field) \
|
|
|
1472 Dynarr_atp (w->face_cachels, findex)->field
|
|
|
1473
|
|
|
1474 #define FROB(field) \
|
|
|
1475 do { \
|
|
|
1476 if (!cachel->field##_specified && FINDEX_FIELD (field##_specified)) \
|
|
|
1477 { \
|
|
|
1478 cachel->field = FINDEX_FIELD (field); \
|
|
|
1479 cachel->field##_specified = 1; \
|
|
|
1480 cachel->dirty = 1; \
|
|
|
1481 } \
|
|
|
1482 } while (0)
|
|
|
1483
|
|
|
1484 FROB (foreground);
|
|
|
1485 FROB (background);
|
|
|
1486 FROB (display_table);
|
|
|
1487 FROB (background_pixmap);
|
|
|
1488 FROB (underline);
|
|
|
1489 FROB (strikethru);
|
|
|
1490 FROB (highlight);
|
|
|
1491 FROB (dim);
|
|
|
1492 FROB (reverse);
|
|
|
1493 FROB (blinking);
|
|
|
1494
|
|
3659
|
1495 for (offs = 0; offs < NUM_LEADING_BYTES; ++offs)
|
|
|
1496 {
|
|
|
1497 if (!(bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs))
|
|
|
1498 && bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED
|
|
|
1499 (Dynarr_atp(w->face_cachels, findex)), offs))
|
|
|
1500 {
|
|
|
1501 cachel->font[offs] = FINDEX_FIELD (font[offs]);
|
|
|
1502 set_bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs, 1);
|
|
|
1503 /* Also propagate whether we're translating to Unicode for the
|
|
|
1504 given face. */
|
|
|
1505 set_bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE(cachel), offs,
|
|
|
1506 bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE
|
|
|
1507 (Dynarr_atp(w->face_cachels,
|
|
|
1508 findex)), offs));
|
|
|
1509 cachel->dirty = 1;
|
|
|
1510 }
|
|
|
1511 }
|
|
428
|
1512 #undef FROB
|
|
|
1513 #undef FINDEX_FIELD
|
|
|
1514
|
|
|
1515 cachel->updated = 1;
|
|
|
1516 }
|
|
|
1517
|
|
|
1518 /* Initialize a cachel. */
|
|
3094
|
1519 /* #### Xft: this function will need to be changed for new font model. */
|
|
428
|
1520
|
|
|
1521 void
|
|
|
1522 reset_face_cachel (struct face_cachel *cachel)
|
|
|
1523 {
|
|
|
1524 xzero (*cachel);
|
|
|
1525 cachel->face = Qunbound;
|
|
|
1526 cachel->nfaces = 0;
|
|
|
1527 cachel->merged_faces = 0;
|
|
|
1528 cachel->foreground = Qunbound;
|
|
|
1529 cachel->background = Qunbound;
|
|
|
1530 {
|
|
|
1531 int i;
|
|
|
1532
|
|
|
1533 for (i = 0; i < NUM_LEADING_BYTES; i++)
|
|
|
1534 cachel->font[i] = Qunbound;
|
|
|
1535 }
|
|
|
1536 cachel->display_table = Qunbound;
|
|
|
1537 cachel->background_pixmap = Qunbound;
|
|
3659
|
1538 FACE_CACHEL_FONT_SPECIFIED (cachel)->size = sizeof(cachel->font_specified);
|
|
|
1539 FACE_CACHEL_FONT_UPDATED (cachel)->size = sizeof(cachel->font_updated);
|
|
428
|
1540 }
|
|
|
1541
|
|
|
1542 /* Retrieve the index to a cachel for window W that corresponds to
|
|
|
1543 the specified face. If necessary, add a new element to the
|
|
|
1544 cache. */
|
|
|
1545
|
|
|
1546 face_index
|
|
|
1547 get_builtin_face_cache_index (struct window *w, Lisp_Object face)
|
|
|
1548 {
|
|
|
1549 int elt;
|
|
|
1550
|
|
|
1551 if (noninteractive)
|
|
|
1552 return 0;
|
|
|
1553
|
|
|
1554 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
|
|
|
1555 {
|
|
|
1556 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, elt);
|
|
|
1557
|
|
|
1558 if (EQ (cachel->face, face))
|
|
|
1559 {
|
|
793
|
1560 Lisp_Object window = wrap_window (w);
|
|
|
1561
|
|
428
|
1562 if (!cachel->updated)
|
|
|
1563 update_face_cachel_data (cachel, window, face);
|
|
|
1564 return elt;
|
|
|
1565 }
|
|
|
1566 }
|
|
|
1567
|
|
|
1568 /* If we didn't find the face, add it and then return its index. */
|
|
|
1569 add_face_cachel (w, face);
|
|
|
1570 return elt;
|
|
|
1571 }
|
|
|
1572
|
|
|
1573 void
|
|
|
1574 reset_face_cachels (struct window *w)
|
|
|
1575 {
|
|
|
1576 /* #### Not initialized in batch mode for the stream device. */
|
|
|
1577 if (w->face_cachels)
|
|
|
1578 {
|
|
|
1579 int i;
|
|
|
1580
|
|
|
1581 for (i = 0; i < Dynarr_length (w->face_cachels); i++)
|
|
|
1582 {
|
|
|
1583 struct face_cachel *cachel = Dynarr_atp (w->face_cachels, i);
|
|
|
1584 if (cachel->merged_faces)
|
|
|
1585 Dynarr_free (cachel->merged_faces);
|
|
|
1586 }
|
|
|
1587 Dynarr_reset (w->face_cachels);
|
|
|
1588 get_builtin_face_cache_index (w, Vdefault_face);
|
|
|
1589 get_builtin_face_cache_index (w, Vmodeline_face);
|
|
|
1590 XFRAME (w->frame)->window_face_cache_reset = 1;
|
|
|
1591 }
|
|
|
1592 }
|
|
|
1593
|
|
|
1594 void
|
|
|
1595 mark_face_cachels_as_clean (struct window *w)
|
|
|
1596 {
|
|
|
1597 int elt;
|
|
|
1598
|
|
|
1599 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
|
|
|
1600 Dynarr_atp (w->face_cachels, elt)->dirty = 0;
|
|
|
1601 }
|
|
|
1602
|
|
3094
|
1603 /* #### Xft: this function will need to be changed for new font model. */
|
|
428
|
1604 void
|
|
|
1605 mark_face_cachels_as_not_updated (struct window *w)
|
|
|
1606 {
|
|
|
1607 int elt;
|
|
|
1608
|
|
|
1609 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
|
|
|
1610 {
|
|
|
1611 struct face_cachel *cachel = Dynarr_atp (w->face_cachels, elt);
|
|
|
1612
|
|
|
1613 cachel->updated = 0;
|
|
3659
|
1614 memset(FACE_CACHEL_FONT_UPDATED(cachel)->bits, 0,
|
|
|
1615 BIT_VECTOR_LONG_STORAGE (NUM_LEADING_BYTES));
|
|
428
|
1616 }
|
|
|
1617 }
|
|
|
1618
|
|
|
1619 #ifdef MEMORY_USAGE_STATS
|
|
|
1620
|
|
|
1621 int
|
|
|
1622 compute_face_cachel_usage (face_cachel_dynarr *face_cachels,
|
|
|
1623 struct overhead_stats *ovstats)
|
|
|
1624 {
|
|
|
1625 int total = 0;
|
|
|
1626
|
|
|
1627 if (face_cachels)
|
|
|
1628 {
|
|
|
1629 int i;
|
|
|
1630
|
|
|
1631 total += Dynarr_memory_usage (face_cachels, ovstats);
|
|
|
1632 for (i = 0; i < Dynarr_length (face_cachels); i++)
|
|
|
1633 {
|
|
|
1634 int_dynarr *merged = Dynarr_at (face_cachels, i).merged_faces;
|
|
|
1635 if (merged)
|
|
|
1636 total += Dynarr_memory_usage (merged, ovstats);
|
|
|
1637 }
|
|
|
1638 }
|
|
|
1639
|
|
|
1640 return total;
|
|
|
1641 }
|
|
|
1642
|
|
|
1643 #endif /* MEMORY_USAGE_STATS */
|
|
|
1644
|
|
|
1645
|
|
|
1646 /*****************************************************************************
|
|
|
1647 * merged face functions *
|
|
|
1648 *****************************************************************************/
|
|
|
1649
|
|
|
1650 /* Compare two merged face cachels to determine whether we have to add
|
|
|
1651 a new entry to the face cache.
|
|
|
1652
|
|
|
1653 Note that we do not compare the attributes, but just the faces the
|
|
|
1654 cachels are based on. If they are the same, then the cachels certainly
|
|
|
1655 ought to have the same attributes, except in the case where fonts
|
|
|
1656 for different charsets have been determined in the two -- and in that
|
|
|
1657 case this difference is fine. */
|
|
|
1658
|
|
|
1659 static int
|
|
|
1660 compare_merged_face_cachels (struct face_cachel *cachel1,
|
|
|
1661 struct face_cachel *cachel2)
|
|
|
1662 {
|
|
|
1663 int i;
|
|
|
1664
|
|
|
1665 if (!EQ (cachel1->face, cachel2->face)
|
|
|
1666 || cachel1->nfaces != cachel2->nfaces)
|
|
|
1667 return 0;
|
|
|
1668
|
|
|
1669 for (i = 0; i < cachel1->nfaces; i++)
|
|
|
1670 if (FACE_CACHEL_FINDEX_UNSAFE (cachel1, i)
|
|
|
1671 != FACE_CACHEL_FINDEX_UNSAFE (cachel2, i))
|
|
|
1672 return 0;
|
|
|
1673
|
|
|
1674 return 1;
|
|
|
1675 }
|
|
|
1676
|
|
|
1677 /* Retrieve the index to a cachel for window W that corresponds to
|
|
|
1678 the specified cachel. If necessary, add a new element to the
|
|
|
1679 cache. This is similar to get_builtin_face_cache_index() but
|
|
|
1680 is intended for merged cachels rather than for cachels representing
|
|
|
1681 just a face.
|
|
|
1682
|
|
|
1683 Note that a merged cachel for just one face is not the same as
|
|
|
1684 the simple cachel for that face, because it is also merged with
|
|
|
1685 the default face. */
|
|
|
1686
|
|
|
1687 static face_index
|
|
|
1688 get_merged_face_cache_index (struct window *w,
|
|
|
1689 struct face_cachel *merged_cachel)
|
|
|
1690 {
|
|
|
1691 int elt;
|
|
|
1692 int cache_size = Dynarr_length (w->face_cachels);
|
|
|
1693
|
|
|
1694 for (elt = 0; elt < cache_size; elt++)
|
|
|
1695 {
|
|
|
1696 struct face_cachel *cachel =
|
|
|
1697 Dynarr_atp (w->face_cachels, elt);
|
|
|
1698
|
|
|
1699 if (compare_merged_face_cachels (cachel, merged_cachel))
|
|
|
1700 return elt;
|
|
|
1701 }
|
|
|
1702
|
|
|
1703 /* We didn't find it so add this instance to the cache. */
|
|
|
1704 merged_cachel->updated = 1;
|
|
|
1705 merged_cachel->dirty = 1;
|
|
|
1706 Dynarr_add (w->face_cachels, *merged_cachel);
|
|
|
1707 return cache_size;
|
|
|
1708 }
|
|
|
1709
|
|
|
1710 face_index
|
|
|
1711 get_extent_fragment_face_cache_index (struct window *w,
|
|
|
1712 struct extent_fragment *ef)
|
|
|
1713 {
|
|
|
1714 struct face_cachel cachel;
|
|
|
1715 int len = Dynarr_length (ef->extents);
|
|
|
1716 face_index findex = 0;
|
|
|
1717
|
|
|
1718 /* Optimize the default case. */
|
|
|
1719 if (len == 0)
|
|
|
1720 return DEFAULT_INDEX;
|
|
|
1721 else
|
|
|
1722 {
|
|
|
1723 int i;
|
|
|
1724
|
|
|
1725 /* Merge the faces of the extents together in order. */
|
|
|
1726
|
|
|
1727 reset_face_cachel (&cachel);
|
|
|
1728
|
|
|
1729 for (i = len - 1; i >= 0; i--)
|
|
|
1730 {
|
|
|
1731 EXTENT current = Dynarr_at (ef->extents, i);
|
|
|
1732 int has_findex = 0;
|
|
|
1733 Lisp_Object face = extent_face (current);
|
|
|
1734
|
|
|
1735 if (FACEP (face))
|
|
|
1736 {
|
|
|
1737 findex = get_builtin_face_cache_index (w, face);
|
|
|
1738 has_findex = 1;
|
|
|
1739 merge_face_cachel_data (w, findex, &cachel);
|
|
|
1740 }
|
|
|
1741 /* remember, we're called from within redisplay
|
|
|
1742 so we can't error. */
|
|
|
1743 else while (CONSP (face))
|
|
|
1744 {
|
|
|
1745 Lisp_Object one_face = XCAR (face);
|
|
|
1746 if (FACEP (one_face))
|
|
|
1747 {
|
|
|
1748 findex = get_builtin_face_cache_index (w, one_face);
|
|
|
1749 merge_face_cachel_data (w, findex, &cachel);
|
|
|
1750
|
|
|
1751 /* code duplication here but there's no clean
|
|
|
1752 way to avoid it. */
|
|
|
1753 if (cachel.nfaces >= NUM_STATIC_CACHEL_FACES)
|
|
|
1754 {
|
|
|
1755 if (!cachel.merged_faces)
|
|
|
1756 cachel.merged_faces = Dynarr_new (int);
|
|
|
1757 Dynarr_add (cachel.merged_faces, findex);
|
|
|
1758 }
|
|
|
1759 else
|
|
|
1760 cachel.merged_faces_static[cachel.nfaces] = findex;
|
|
|
1761 cachel.nfaces++;
|
|
|
1762 }
|
|
|
1763 face = XCDR (face);
|
|
|
1764 }
|
|
|
1765
|
|
|
1766 if (has_findex)
|
|
|
1767 {
|
|
|
1768 if (cachel.nfaces >= NUM_STATIC_CACHEL_FACES)
|
|
|
1769 {
|
|
|
1770 if (!cachel.merged_faces)
|
|
|
1771 cachel.merged_faces = Dynarr_new (int);
|
|
|
1772 Dynarr_add (cachel.merged_faces, findex);
|
|
|
1773 }
|
|
|
1774 else
|
|
|
1775 cachel.merged_faces_static[cachel.nfaces] = findex;
|
|
|
1776 cachel.nfaces++;
|
|
|
1777 }
|
|
|
1778 }
|
|
|
1779
|
|
|
1780 /* Now finally merge in the default face. */
|
|
|
1781 findex = get_builtin_face_cache_index (w, Vdefault_face);
|
|
|
1782 merge_face_cachel_data (w, findex, &cachel);
|
|
|
1783
|
|
444
|
1784 findex = get_merged_face_cache_index (w, &cachel);
|
|
|
1785 if (cachel.merged_faces &&
|
|
|
1786 /* merged_faces did not get stored and available via return value */
|
|
|
1787 Dynarr_at (w->face_cachels, findex).merged_faces !=
|
|
|
1788 cachel.merged_faces)
|
|
|
1789 {
|
|
|
1790 Dynarr_free (cachel.merged_faces);
|
|
|
1791 cachel.merged_faces = 0;
|
|
|
1792 }
|
|
|
1793 return findex;
|
|
428
|
1794 }
|
|
|
1795 }
|
|
|
1796
|
|
3094
|
1797 /* Return a cache index for window W from merging the faces in FACE_LIST.
|
|
|
1798 COUNT is the number of faces in the list.
|
|
|
1799
|
|
|
1800 The default face should not be included in the list, as it is always
|
|
|
1801 implicitly merged into the cachel.
|
|
|
1802
|
|
|
1803 WARNING: this interface may change. */
|
|
|
1804
|
|
|
1805 face_index
|
|
|
1806 merge_face_list_to_cache_index (struct window *w,
|
|
|
1807 Lisp_Object *face_list, int count)
|
|
|
1808 {
|
|
|
1809 int i;
|
|
|
1810 face_index findex = 0;
|
|
|
1811 struct face_cachel cachel;
|
|
|
1812
|
|
|
1813 reset_face_cachel (&cachel);
|
|
|
1814
|
|
|
1815 for (i = 0; i < count; i++)
|
|
|
1816 {
|
|
|
1817 Lisp_Object face = face_list[i];
|
|
|
1818
|
|
|
1819 if (!NILP (face))
|
|
|
1820 {
|
|
|
1821 CHECK_FACE(face); /* #### presumably unnecessary */
|
|
|
1822 findex = get_builtin_face_cache_index (w, face);
|
|
|
1823 merge_face_cachel_data (w, findex, &cachel);
|
|
|
1824 }
|
|
|
1825 }
|
|
|
1826
|
|
|
1827 /* Now finally merge in the default face. */
|
|
|
1828 findex = get_builtin_face_cache_index (w, Vdefault_face);
|
|
|
1829 merge_face_cachel_data (w, findex, &cachel);
|
|
|
1830
|
|
|
1831 return get_merged_face_cache_index (w, &cachel);
|
|
|
1832 }
|
|
|
1833
|
|
428
|
1834
|
|
|
1835 /*****************************************************************************
|
|
|
1836 interface functions
|
|
|
1837 ****************************************************************************/
|
|
|
1838
|
|
|
1839 static void
|
|
|
1840 update_EmacsFrame (Lisp_Object frame, Lisp_Object name)
|
|
|
1841 {
|
|
|
1842 struct frame *frm = XFRAME (frame);
|
|
|
1843
|
|
3676
|
1844 if (!FRAME_LIVE_P(frm))
|
|
|
1845 return;
|
|
|
1846
|
|
428
|
1847 if (EQ (name, Qfont))
|
|
|
1848 MARK_FRAME_SIZE_SLIPPED (frm);
|
|
|
1849
|
|
|
1850 MAYBE_FRAMEMETH (frm, update_frame_external_traits, (frm, name));
|
|
|
1851 }
|
|
|
1852
|
|
|
1853 static void
|
|
|
1854 update_EmacsFrames (Lisp_Object locale, Lisp_Object name)
|
|
|
1855 {
|
|
|
1856 if (FRAMEP (locale))
|
|
|
1857 {
|
|
|
1858 update_EmacsFrame (locale, name);
|
|
|
1859 }
|
|
|
1860 else if (DEVICEP (locale))
|
|
|
1861 {
|
|
|
1862 Lisp_Object frmcons;
|
|
|
1863
|
|
|
1864 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
|
|
|
1865 update_EmacsFrame (XCAR (frmcons), name);
|
|
|
1866 }
|
|
|
1867 else if (EQ (locale, Qglobal) || EQ (locale, Qfallback))
|
|
|
1868 {
|
|
|
1869 Lisp_Object frmcons, devcons, concons;
|
|
|
1870
|
|
|
1871 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
|
|
|
1872 update_EmacsFrame (XCAR (frmcons), name);
|
|
|
1873 }
|
|
|
1874 }
|
|
|
1875
|
|
|
1876 void
|
|
|
1877 update_frame_face_values (struct frame *f)
|
|
|
1878 {
|
|
793
|
1879 Lisp_Object frm = wrap_frame (f);
|
|
428
|
1880
|
|
|
1881 update_EmacsFrame (frm, Qforeground);
|
|
|
1882 update_EmacsFrame (frm, Qbackground);
|
|
|
1883 update_EmacsFrame (frm, Qfont);
|
|
|
1884 }
|
|
|
1885
|
|
|
1886 void
|
|
|
1887 face_property_was_changed (Lisp_Object face, Lisp_Object property,
|
|
|
1888 Lisp_Object locale)
|
|
|
1889 {
|
|
|
1890 int default_face = EQ (face, Vdefault_face);
|
|
|
1891
|
|
|
1892 /* If the locale could affect the frame value, then call
|
|
|
1893 update_EmacsFrames just in case. */
|
|
|
1894 if (default_face &&
|
|
|
1895 (EQ (property, Qforeground) ||
|
|
|
1896 EQ (property, Qbackground) ||
|
|
|
1897 EQ (property, Qfont)))
|
|
|
1898 update_EmacsFrames (locale, property);
|
|
|
1899
|
|
|
1900 if (WINDOWP (locale))
|
|
|
1901 {
|
|
|
1902 MARK_FRAME_FACES_CHANGED (XFRAME (XWINDOW (locale)->frame));
|
|
|
1903 }
|
|
|
1904 else if (FRAMEP (locale))
|
|
|
1905 {
|
|
|
1906 MARK_FRAME_FACES_CHANGED (XFRAME (locale));
|
|
|
1907 }
|
|
|
1908 else if (DEVICEP (locale))
|
|
|
1909 {
|
|
|
1910 MARK_DEVICE_FRAMES_FACES_CHANGED (XDEVICE (locale));
|
|
|
1911 }
|
|
|
1912 else
|
|
|
1913 {
|
|
|
1914 Lisp_Object devcons, concons;
|
|
|
1915 DEVICE_LOOP_NO_BREAK (devcons, concons)
|
|
|
1916 MARK_DEVICE_FRAMES_FACES_CHANGED (XDEVICE (XCAR (devcons)));
|
|
|
1917 }
|
|
|
1918
|
|
|
1919 /*
|
|
|
1920 * This call to update_faces_inheritance isn't needed and makes
|
|
|
1921 * creating and modifying faces _very_ slow. The point of
|
|
|
1922 * update_face_inheritances is to find all faces that inherit
|
|
|
1923 * directly from this face property and set the specifier "dirty"
|
|
|
1924 * flag on the corresponding specifier. This forces recaching of
|
|
|
1925 * cached specifier values in frame and window struct slots. But
|
|
|
1926 * currently no face properties are cached in frame and window
|
|
|
1927 * struct slots, so calling this function does nothing useful!
|
|
|
1928 *
|
|
|
1929 * Further, since update_faces_inheritance maps over the whole
|
|
|
1930 * face table every time it is called, it gets terribly slow when
|
|
|
1931 * there are many faces. Creating 500 faces on a 50Mhz 486 took
|
|
|
1932 * 433 seconds when update_faces_inheritance was called. With the
|
|
|
1933 * call commented out, creating those same 500 faces took 0.72
|
|
|
1934 * seconds.
|
|
|
1935 */
|
|
|
1936 /* update_faces_inheritance (face, property);*/
|
|
|
1937 XFACE (face)->dirty = 1;
|
|
|
1938 }
|
|
|
1939
|
|
|
1940 DEFUN ("copy-face", Fcopy_face, 2, 6, 0, /*
|
|
|
1941 Define and return a new face which is a copy of an existing one,
|
|
|
1942 or makes an already-existing face be exactly like another.
|
|
|
1943 LOCALE, TAG-SET, EXACT-P, and HOW-TO-ADD are as in `copy-specifier'.
|
|
|
1944 */
|
|
|
1945 (old_face, new_name, locale, tag_set, exact_p, how_to_add))
|
|
|
1946 {
|
|
440
|
1947 Lisp_Face *fold, *fnew;
|
|
428
|
1948 Lisp_Object new_face = Qnil;
|
|
|
1949 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
|
|
|
1950
|
|
|
1951 old_face = Fget_face (old_face);
|
|
|
1952
|
|
|
1953 /* We GCPRO old_face because it might be temporary, and GCing could
|
|
|
1954 occur in various places below. */
|
|
|
1955 GCPRO4 (tag_set, locale, old_face, new_face);
|
|
|
1956 /* check validity of how_to_add now. */
|
|
|
1957 decode_how_to_add_specification (how_to_add);
|
|
|
1958 /* and of tag_set. */
|
|
|
1959 tag_set = decode_specifier_tag_set (tag_set);
|
|
|
1960 /* and of locale. */
|
|
|
1961 locale = decode_locale_list (locale);
|
|
|
1962
|
|
|
1963 new_face = Ffind_face (new_name);
|
|
|
1964 if (NILP (new_face))
|
|
|
1965 {
|
|
|
1966 Lisp_Object temp;
|
|
|
1967
|
|
|
1968 CHECK_SYMBOL (new_name);
|
|
|
1969
|
|
|
1970 /* Create the new face with the same status as the old face. */
|
|
|
1971 temp = (NILP (Fgethash (old_face, Vtemporary_faces_cache, Qnil))
|
|
|
1972 ? Qnil
|
|
|
1973 : Qt);
|
|
|
1974
|
|
|
1975 new_face = Fmake_face (new_name, Qnil, temp);
|
|
|
1976 }
|
|
|
1977
|
|
|
1978 fold = XFACE (old_face);
|
|
|
1979 fnew = XFACE (new_face);
|
|
|
1980
|
|
|
1981 #define COPY_PROPERTY(property) \
|
|
|
1982 Fcopy_specifier (fold->property, fnew->property, \
|
|
|
1983 locale, tag_set, exact_p, how_to_add);
|
|
|
1984
|
|
|
1985 COPY_PROPERTY (foreground);
|
|
|
1986 COPY_PROPERTY (background);
|
|
|
1987 COPY_PROPERTY (font);
|
|
|
1988 COPY_PROPERTY (display_table);
|
|
|
1989 COPY_PROPERTY (background_pixmap);
|
|
|
1990 COPY_PROPERTY (underline);
|
|
|
1991 COPY_PROPERTY (strikethru);
|
|
|
1992 COPY_PROPERTY (highlight);
|
|
|
1993 COPY_PROPERTY (dim);
|
|
|
1994 COPY_PROPERTY (blinking);
|
|
|
1995 COPY_PROPERTY (reverse);
|
|
|
1996 #undef COPY_PROPERTY
|
|
|
1997 /* #### should it copy the individual specifiers, if they exist? */
|
|
|
1998 fnew->plist = Fcopy_sequence (fold->plist);
|
|
|
1999
|
|
|
2000 UNGCPRO;
|
|
|
2001
|
|
|
2002 return new_name;
|
|
|
2003 }
|
|
|
2004
|
|
3659
|
2005 #ifdef MULE
|
|
|
2006
|
|
|
2007 Lisp_Object Qone_dimensional, Qtwo_dimensional;
|
|
|
2008
|
|
|
2009 DEFUN ("specifier-tag-one-dimensional-p",
|
|
|
2010 Fspecifier_tag_one_dimensional_p,
|
|
|
2011 2, 2, 0, /*
|
|
|
2012 Return non-nil if (charset-dimension CHARSET) is 1.
|
|
|
2013
|
|
|
2014 Used by the X11 platform font code; see `define-specifier-tag'. You
|
|
|
2015 shouldn't ever need to call this yourself.
|
|
|
2016 */
|
|
|
2017 (charset, UNUSED(stage)))
|
|
|
2018 {
|
|
|
2019 CHECK_CHARSET(charset);
|
|
|
2020 return (1 == XCHARSET_DIMENSION(charset)) ? Qt : Qnil;
|
|
|
2021 }
|
|
|
2022
|
|
|
2023 DEFUN ("specifier-tag-two-dimensional-p",
|
|
|
2024 Fspecifier_tag_two_dimensional_p,
|
|
|
2025 2, 2, 0, /*
|
|
|
2026 Return non-nil if (charset-dimension CHARSET) is 2.
|
|
|
2027
|
|
|
2028 Used by the X11 platform font code; see `define-specifier-tag'. You
|
|
|
2029 shouldn't ever need to call this yourself.
|
|
|
2030 */
|
|
|
2031 (charset, UNUSED(stage)))
|
|
|
2032 {
|
|
|
2033 CHECK_CHARSET(charset);
|
|
|
2034 return (2 == XCHARSET_DIMENSION(charset)) ? Qt : Qnil;
|
|
|
2035 }
|
|
|
2036
|
|
|
2037 DEFUN ("specifier-tag-final-stage-p",
|
|
|
2038 Fspecifier_tag_final_stage_p,
|
|
|
2039 2, 2, 0, /*
|
|
|
2040 Return non-nil if STAGE is 'final.
|
|
|
2041
|
|
|
2042 Used by the X11 platform font code for giving fallbacks; see
|
|
|
2043 `define-specifier-tag'. You shouldn't ever need to call this.
|
|
|
2044 */
|
|
|
2045 (UNUSED(charset), stage))
|
|
|
2046 {
|
|
|
2047 return EQ(stage, Qfinal) ? Qt : Qnil;
|
|
|
2048 }
|
|
|
2049
|
|
|
2050 DEFUN ("specifier-tag-initial-stage-p",
|
|
|
2051 Fspecifier_tag_initial_stage_p,
|
|
|
2052 2, 2, 0, /*
|
|
|
2053 Return non-nil if STAGE is 'initial.
|
|
|
2054
|
|
|
2055 Used by the X11 platform font code for giving fallbacks; see
|
|
|
2056 `define-specifier-tag'. You shouldn't ever need to call this.
|
|
|
2057 */
|
|
|
2058 (UNUSED(charset), stage))
|
|
|
2059 {
|
|
|
2060 return EQ(stage, Qinitial) ? Qt : Qnil;
|
|
|
2061 }
|
|
|
2062
|
|
|
2063 DEFUN ("specifier-tag-encode-as-utf-8-p",
|
|
|
2064 Fspecifier_tag_encode_as_utf_8_p,
|
|
|
2065 2, 2, 0, /*
|
|
|
2066 Return t if and only if (charset-property CHARSET 'encode-as-utf-8)).
|
|
|
2067
|
|
|
2068 Used by the X11 platform font code; see `define-specifier-tag'. You
|
|
|
2069 shouldn't ever need to call this.
|
|
|
2070 */
|
|
|
2071 (charset, UNUSED(stage)))
|
|
|
2072 {
|
|
|
2073 /* Used to check that the stage was initial too. */
|
|
|
2074 CHECK_CHARSET(charset);
|
|
|
2075 return XCHARSET_ENCODE_AS_UTF_8(charset) ? Qt : Qnil;
|
|
|
2076 }
|
|
|
2077
|
|
|
2078 #endif /* MULE */
|
|
|
2079
|
|
428
|
2080
|
|
|
2081 void
|
|
|
2082 syms_of_faces (void)
|
|
|
2083 {
|
|
442
|
2084 INIT_LRECORD_IMPLEMENTATION (face);
|
|
|
2085
|
|
440
|
2086 /* Qdefault, Qwidget, Qleft_margin, Qright_margin defined in general.c */
|
|
563
|
2087 DEFSYMBOL (Qmodeline);
|
|
|
2088 DEFSYMBOL (Qgui_element);
|
|
|
2089 DEFSYMBOL (Qtext_cursor);
|
|
|
2090 DEFSYMBOL (Qvertical_divider);
|
|
428
|
2091
|
|
|
2092 DEFSUBR (Ffacep);
|
|
|
2093 DEFSUBR (Ffind_face);
|
|
|
2094 DEFSUBR (Fget_face);
|
|
|
2095 DEFSUBR (Fface_name);
|
|
|
2096 DEFSUBR (Fbuilt_in_face_specifiers);
|
|
|
2097 DEFSUBR (Fface_list);
|
|
|
2098 DEFSUBR (Fmake_face);
|
|
|
2099 DEFSUBR (Fcopy_face);
|
|
|
2100
|
|
3659
|
2101 #ifdef MULE
|
|
|
2102 DEFSYMBOL (Qone_dimensional);
|
|
|
2103 DEFSYMBOL (Qtwo_dimensional);
|
|
|
2104 /* I would much prefer these were in Lisp. */
|
|
|
2105 DEFSUBR (Fspecifier_tag_one_dimensional_p);
|
|
|
2106 DEFSUBR (Fspecifier_tag_two_dimensional_p);
|
|
|
2107 DEFSUBR (Fspecifier_tag_initial_stage_p);
|
|
|
2108 DEFSUBR (Fspecifier_tag_final_stage_p);
|
|
|
2109 DEFSUBR (Fspecifier_tag_encode_as_utf_8_p);
|
|
|
2110 #endif /* MULE */
|
|
|
2111
|
|
563
|
2112 DEFSYMBOL (Qfacep);
|
|
|
2113 DEFSYMBOL (Qforeground);
|
|
|
2114 DEFSYMBOL (Qbackground);
|
|
428
|
2115 /* Qfont defined in general.c */
|
|
563
|
2116 DEFSYMBOL (Qdisplay_table);
|
|
|
2117 DEFSYMBOL (Qbackground_pixmap);
|
|
|
2118 DEFSYMBOL (Qunderline);
|
|
|
2119 DEFSYMBOL (Qstrikethru);
|
|
428
|
2120 /* Qhighlight, Qreverse defined in general.c */
|
|
563
|
2121 DEFSYMBOL (Qdim);
|
|
|
2122 DEFSYMBOL (Qblinking);
|
|
428
|
2123
|
|
2865
|
2124 DEFSYMBOL (Qface_alias);
|
|
2867
|
2125 DEFERROR_STANDARD (Qcyclic_face_alias, Qinvalid_state);
|
|
2865
|
2126
|
|
563
|
2127 DEFSYMBOL (Qinit_face_from_resources);
|
|
|
2128 DEFSYMBOL (Qinit_global_faces);
|
|
|
2129 DEFSYMBOL (Qinit_device_faces);
|
|
|
2130 DEFSYMBOL (Qinit_frame_faces);
|
|
428
|
2131 }
|
|
|
2132
|
|
|
2133 void
|
|
|
2134 structure_type_create_faces (void)
|
|
|
2135 {
|
|
|
2136 struct structure_type *st;
|
|
|
2137
|
|
|
2138 st = define_structure_type (Qface, face_validate, face_instantiate);
|
|
|
2139
|
|
|
2140 define_structure_type_keyword (st, Qname, face_name_validate);
|
|
|
2141 }
|
|
|
2142
|
|
|
2143 void
|
|
|
2144 vars_of_faces (void)
|
|
|
2145 {
|
|
|
2146 staticpro (&Vpermanent_faces_cache);
|
|
771
|
2147 Vpermanent_faces_cache =
|
|
|
2148 make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
|
|
428
|
2149 staticpro (&Vtemporary_faces_cache);
|
|
771
|
2150 Vtemporary_faces_cache =
|
|
|
2151 make_lisp_hash_table (0, HASH_TABLE_WEAK, HASH_TABLE_EQ);
|
|
428
|
2152
|
|
|
2153 staticpro (&Vdefault_face);
|
|
|
2154 Vdefault_face = Qnil;
|
|
|
2155 staticpro (&Vgui_element_face);
|
|
|
2156 Vgui_element_face = Qnil;
|
|
|
2157 staticpro (&Vwidget_face);
|
|
|
2158 Vwidget_face = Qnil;
|
|
|
2159 staticpro (&Vmodeline_face);
|
|
|
2160 Vmodeline_face = Qnil;
|
|
|
2161 staticpro (&Vtoolbar_face);
|
|
|
2162 Vtoolbar_face = Qnil;
|
|
|
2163
|
|
|
2164 staticpro (&Vvertical_divider_face);
|
|
|
2165 Vvertical_divider_face = Qnil;
|
|
|
2166 staticpro (&Vleft_margin_face);
|
|
|
2167 Vleft_margin_face = Qnil;
|
|
|
2168 staticpro (&Vright_margin_face);
|
|
|
2169 Vright_margin_face = Qnil;
|
|
|
2170 staticpro (&Vtext_cursor_face);
|
|
|
2171 Vtext_cursor_face = Qnil;
|
|
|
2172 staticpro (&Vpointer_face);
|
|
|
2173 Vpointer_face = Qnil;
|
|
|
2174
|
|
3659
|
2175 #ifdef DEBUG_XEMACS
|
|
|
2176 DEFVAR_INT ("debug-x-faces", &debug_x_faces /*
|
|
|
2177 If non-zero, display debug information about X faces
|
|
|
2178 */ );
|
|
|
2179 debug_x_faces = 0;
|
|
|
2180 #endif
|
|
|
2181
|
|
428
|
2182 {
|
|
|
2183 Lisp_Object syms[20];
|
|
|
2184 int n = 0;
|
|
|
2185
|
|
|
2186 syms[n++] = Qforeground;
|
|
|
2187 syms[n++] = Qbackground;
|
|
|
2188 syms[n++] = Qfont;
|
|
|
2189 syms[n++] = Qdisplay_table;
|
|
|
2190 syms[n++] = Qbackground_pixmap;
|
|
|
2191 syms[n++] = Qunderline;
|
|
|
2192 syms[n++] = Qstrikethru;
|
|
|
2193 syms[n++] = Qhighlight;
|
|
|
2194 syms[n++] = Qdim;
|
|
|
2195 syms[n++] = Qblinking;
|
|
|
2196 syms[n++] = Qreverse;
|
|
|
2197
|
|
|
2198 Vbuilt_in_face_specifiers = Flist (n, syms);
|
|
|
2199 staticpro (&Vbuilt_in_face_specifiers);
|
|
|
2200 }
|
|
|
2201 }
|
|
|
2202
|
|
|
2203 void
|
|
|
2204 complex_vars_of_faces (void)
|
|
|
2205 {
|
|
|
2206 /* Create the default face now so we know what it is immediately. */
|
|
|
2207
|
|
|
2208 Vdefault_face = Qnil; /* so that Fmake_face() doesn't set up a bogus
|
|
|
2209 default value */
|
|
771
|
2210 Vdefault_face = Fmake_face (Qdefault, build_msg_string ("default face"),
|
|
428
|
2211 Qnil);
|
|
|
2212
|
|
|
2213 /* Provide some last-resort fallbacks to avoid utter fuckage if
|
|
|
2214 someone provides invalid values for the global specifications. */
|
|
|
2215
|
|
|
2216 {
|
|
|
2217 Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
|
|
|
2218
|
|
462
|
2219 #ifdef HAVE_GTK
|
|
|
2220 fg_fb = acons (list1 (Qgtk), build_string ("black"), fg_fb);
|
|
|
2221 bg_fb = acons (list1 (Qgtk), build_string ("white"), bg_fb);
|
|
|
2222 #endif
|
|
428
|
2223 #ifdef HAVE_X_WINDOWS
|
|
|
2224 fg_fb = acons (list1 (Qx), build_string ("black"), fg_fb);
|
|
|
2225 bg_fb = acons (list1 (Qx), build_string ("white"), bg_fb);
|
|
|
2226 #endif
|
|
|
2227 #ifdef HAVE_TTY
|
|
|
2228 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
|
|
|
2229 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
|
|
|
2230 #endif
|
|
|
2231 #ifdef HAVE_MS_WINDOWS
|
|
440
|
2232 fg_fb = acons (list1 (Qmsprinter), build_string ("black"), fg_fb);
|
|
|
2233 bg_fb = acons (list1 (Qmsprinter), build_string ("white"), bg_fb);
|
|
428
|
2234 fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
|
|
|
2235 bg_fb = acons (list1 (Qmswindows), build_string ("white"), bg_fb);
|
|
|
2236 #endif
|
|
|
2237 set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb);
|
|
|
2238 set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
|
|
|
2239 }
|
|
|
2240
|
|
|
2241 /* #### We may want to have different fallback values if NeXTstep
|
|
|
2242 support is compiled in. */
|
|
|
2243 {
|
|
|
2244 Lisp_Object inst_list = Qnil;
|
|
462
|
2245
|
|
872
|
2246 #if defined (HAVE_X_WINDOWS) || defined (HAVE_GTK)
|
|
2865
|
2247
|
|
3659
|
2248 #ifdef HAVE_GTK
|
|
|
2249 Lisp_Object device_symbol = Qgtk;
|
|
|
2250 #else
|
|
|
2251 Lisp_Object device_symbol = Qx;
|
|
|
2252 #endif
|
|
|
2253
|
|
|
2254 #ifdef MULE
|
|
|
2255
|
|
2367
|
2256 const Ascbyte *fonts[] =
|
|
428
|
2257 {
|
|
3094
|
2258 #ifdef USE_XFT
|
|
|
2259 /************** Xft fonts *************/
|
|
|
2260
|
|
|
2261 /* Note that fontconfig can search for several font families in one
|
|
|
2262 call. We should use this facility. */
|
|
3659
|
2263 "Monospace-12",
|
|
3094
|
2264 /* do we need to worry about non-Latin characters for monospace?
|
|
|
2265 No, at least in Debian's implementation of Xft.
|
|
|
2266 We should recommend that "gothic" and "mincho" aliases be created? */
|
|
3659
|
2267 "Sazanami Mincho-12",
|
|
|
2268 /* Japanese #### add encoding info? */
|
|
3094
|
2269 /* Arphic for Chinese? */
|
|
|
2270 /* Korean */
|
|
|
2271 #else
|
|
3659
|
2272 /* The default Japanese fonts installed with XFree86 4.0 use this
|
|
|
2273 point size, and the -misc-fixed fonts (which look really bad with
|
|
|
2274 Han characters) don't. We need to prefer the former. */
|
|
|
2275 "-*-*-medium-r-*-*-*-150-*-*-c-*-*-*",
|
|
|
2276 /* And the Chinese ones, maddeningly, use this one. (But on 4.0, while
|
|
|
2277 XListFonts returns them, XLoadQueryFont on the fully-specified XLFD
|
|
|
2278 corresponding to one of them fails!) */
|
|
|
2279 "-*-*-medium-r-*-*-*-160-*-*-c-*-*-*",
|
|
|
2280 "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*",
|
|
3094
|
2281 #endif
|
|
428
|
2282 };
|
|
2367
|
2283 const Ascbyte **fontptr;
|
|
428
|
2284
|
|
3659
|
2285 /* Define some specifier tags for classes of character sets. Combining
|
|
|
2286 these allows for distinct fallback fonts for distinct dimensions of
|
|
|
2287 character sets and stages. */
|
|
|
2288
|
|
|
2289 define_specifier_tag(Qtwo_dimensional, Qnil,
|
|
|
2290 intern ("specifier-tag-two-dimensional-p"));
|
|
|
2291
|
|
|
2292 define_specifier_tag(Qone_dimensional, Qnil,
|
|
|
2293 intern ("specifier-tag-one-dimensional-p"));
|
|
|
2294
|
|
|
2295 define_specifier_tag(Qinitial, Qnil,
|
|
|
2296 intern ("specifier-tag-initial-stage-p"));
|
|
|
2297
|
|
|
2298 define_specifier_tag(Qfinal, Qnil,
|
|
|
2299 intern ("specifier-tag-final-stage-p"));
|
|
|
2300
|
|
|
2301 define_specifier_tag (Qencode_as_utf_8, Qnil,
|
|
|
2302 intern("specifier-tag-encode-as-utf-8-p"));
|
|
|
2303
|
|
|
2304 #endif /* MULE */
|
|
|
2305
|
|
|
2306 inst_list =
|
|
|
2307 Fcons
|
|
|
2308 (Fcons
|
|
|
2309 (list1 (device_symbol),
|
|
|
2310 build_string ("*")),
|
|
|
2311 inst_list);
|
|
|
2312
|
|
|
2313 #ifdef MULE
|
|
|
2314
|
|
|
2315 /* For Han characters and Ethiopic, we want the misc-fixed font used to
|
|
|
2316 be distinct from that for alphabetic scripts, because the font
|
|
|
2317 specified below is distractingly ugly when used for Han characters
|
|
|
2318 (this is slightly less so) and because its coverage isn't up to
|
|
|
2319 handling them (well, chiefly, it's not up to handling Ethiopic--we do
|
|
|
2320 have charset-specific fallbacks for the East Asian charsets.) */
|
|
|
2321 inst_list =
|
|
|
2322 Fcons
|
|
|
2323 (Fcons
|
|
|
2324 (list3(device_symbol, Qtwo_dimensional, Qfinal),
|
|
|
2325 build_string
|
|
|
2326 ("-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1")),
|
|
|
2327 inst_list);
|
|
|
2328
|
|
|
2329 /* Use Markus Kuhn's version of misc-fixed as the font for the font for
|
|
|
2330 when a given charset's registries can't be found and redisplay for
|
|
|
2331 that charset falls back to iso10646-1. */
|
|
428
|
2332
|
|
3659
|
2333 inst_list =
|
|
|
2334 Fcons
|
|
|
2335 (Fcons
|
|
|
2336 (list3(device_symbol, Qone_dimensional, Qfinal),
|
|
|
2337 build_string
|
|
|
2338 ("-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1")),
|
|
|
2339 inst_list);
|
|
|
2340
|
|
462
|
2341 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
|
|
3659
|
2342 inst_list = Fcons (Fcons (list3 (device_symbol,
|
|
|
2343 Qtwo_dimensional, Qinitial),
|
|
|
2344 build_string (*fontptr)),
|
|
462
|
2345 inst_list);
|
|
3659
|
2346
|
|
|
2347 /* We need to set the font for the JIT-ucs-charsets separately from the
|
|
|
2348 final stage, since otherwise it picks up the two-dimensional
|
|
|
2349 specification (see specifier-tag-two-dimensional-initial-stage-p
|
|
|
2350 above). They also use Markus Kuhn's ISO 10646-1 fixed fonts for
|
|
|
2351 redisplay. */
|
|
|
2352
|
|
|
2353 inst_list =
|
|
|
2354 Fcons
|
|
|
2355 (Fcons
|
|
|
2356 (list3(device_symbol, Qencode_as_utf_8, Qinitial),
|
|
|
2357 build_string
|
|
|
2358 ("-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1")),
|
|
|
2359 inst_list);
|
|
|
2360
|
|
|
2361 #endif /* MULE */
|
|
|
2362
|
|
|
2363 /* Needed to make sure that charsets with non-specified fonts don't
|
|
|
2364 use bold and oblique first if medium and regular are available. */
|
|
|
2365 inst_list =
|
|
|
2366 Fcons
|
|
|
2367 (Fcons
|
|
|
2368 (list1 (device_symbol),
|
|
|
2369 build_string ("-*-*-medium-r-*-*-*-120-*-*-c-*-*-*")),
|
|
|
2370 inst_list);
|
|
|
2371
|
|
|
2372 /* With a Cygwin XFree86 install, this returns the best (clearest,
|
|
|
2373 most readable) font I can find when scaling of bitmap fonts is
|
|
|
2374 turned on, as it is by default. (WHO IN THE NAME OF CHRIST THOUGHT
|
|
|
2375 THAT WAS A GOOD IDEA?!?!) The other fonts that used to be specified
|
|
|
2376 here gave horrendous results. */
|
|
|
2377
|
|
|
2378 inst_list =
|
|
|
2379 Fcons
|
|
|
2380 (Fcons
|
|
|
2381 (list1 (device_symbol),
|
|
|
2382 build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
|
|
|
2383 inst_list);
|
|
|
2384
|
|
462
|
2385 #endif /* HAVE_X_WINDOWS || HAVE_GTK */
|
|
|
2386
|
|
428
|
2387 #ifdef HAVE_TTY
|
|
|
2388 inst_list = Fcons (Fcons (list1 (Qtty), build_string ("normal")),
|
|
|
2389 inst_list);
|
|
|
2390 #endif /* HAVE_TTY */
|
|
440
|
2391
|
|
771
|
2392 #ifdef HAVE_MS_WINDOWS
|
|
|
2393 {
|
|
2367
|
2394 const Ascbyte *mswfonts[] =
|
|
771
|
2395 {
|
|
|
2396 "Courier New:Regular:10::",
|
|
|
2397 "Courier:Regular:10::",
|
|
|
2398 ":Regular:10::"
|
|
|
2399 };
|
|
2367
|
2400 const Ascbyte **mswfontptr;
|
|
2865
|
2401
|
|
771
|
2402 for (mswfontptr = mswfonts + countof (mswfonts) - 1;
|
|
|
2403 mswfontptr >= mswfonts; mswfontptr--)
|
|
|
2404 {
|
|
|
2405 /* display device */
|
|
2865
|
2406 inst_list = Fcons (Fcons (list1 (Qmswindows),
|
|
771
|
2407 build_string (*mswfontptr)),
|
|
|
2408 inst_list);
|
|
|
2409 /* printer device */
|
|
2865
|
2410 inst_list = Fcons (Fcons (list1 (Qmsprinter),
|
|
771
|
2411 build_string (*mswfontptr)),
|
|
|
2412 inst_list);
|
|
|
2413 }
|
|
793
|
2414 /* Use Lucida Console rather than Courier New if it exists -- the
|
|
|
2415 line spacing is much less, so many more lines fit with the same
|
|
|
2416 size font. (And it's specifically designed for screens.) */
|
|
2865
|
2417 inst_list = Fcons (Fcons (list1 (Qmswindows),
|
|
793
|
2418 build_string ("Lucida Console:Regular:10::")),
|
|
|
2419 inst_list);
|
|
771
|
2420 }
|
|
428
|
2421 #endif /* HAVE_MS_WINDOWS */
|
|
771
|
2422
|
|
428
|
2423 set_specifier_fallback (Fget (Vdefault_face, Qfont, Qnil), inst_list);
|
|
|
2424 }
|
|
|
2425
|
|
|
2426 set_specifier_fallback (Fget (Vdefault_face, Qunderline, Qnil),
|
|
|
2427 list1 (Fcons (Qnil, Qnil)));
|
|
|
2428 set_specifier_fallback (Fget (Vdefault_face, Qstrikethru, Qnil),
|
|
|
2429 list1 (Fcons (Qnil, Qnil)));
|
|
|
2430 set_specifier_fallback (Fget (Vdefault_face, Qhighlight, Qnil),
|
|
|
2431 list1 (Fcons (Qnil, Qnil)));
|
|
|
2432 set_specifier_fallback (Fget (Vdefault_face, Qdim, Qnil),
|
|
|
2433 list1 (Fcons (Qnil, Qnil)));
|
|
|
2434 set_specifier_fallback (Fget (Vdefault_face, Qblinking, Qnil),
|
|
|
2435 list1 (Fcons (Qnil, Qnil)));
|
|
|
2436 set_specifier_fallback (Fget (Vdefault_face, Qreverse, Qnil),
|
|
|
2437 list1 (Fcons (Qnil, Qnil)));
|
|
|
2438
|
|
|
2439 /* gui-element is the parent face of all gui elements such as
|
|
|
2440 modeline, vertical divider and toolbar. */
|
|
|
2441 Vgui_element_face = Fmake_face (Qgui_element,
|
|
771
|
2442 build_msg_string ("gui element face"),
|
|
428
|
2443 Qnil);
|
|
|
2444
|
|
|
2445 /* Provide some last-resort fallbacks for gui-element face which
|
|
|
2446 mustn't default to default. */
|
|
|
2447 {
|
|
|
2448 Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
|
|
|
2449
|
|
3094
|
2450 /* #### gui-element face doesn't have a font property?
|
|
|
2451 But it gets referred to later! */
|
|
462
|
2452 #ifdef HAVE_GTK
|
|
|
2453 /* We need to put something in there, or error checking gets
|
|
|
2454 #%!@#ed up before the styles are set, which override the
|
|
|
2455 fallbacks. */
|
|
|
2456 fg_fb = acons (list1 (Qgtk), build_string ("black"), fg_fb);
|
|
|
2457 bg_fb = acons (list1 (Qgtk), build_string ("Gray80"), bg_fb);
|
|
|
2458 #endif
|
|
428
|
2459 #ifdef HAVE_X_WINDOWS
|
|
|
2460 fg_fb = acons (list1 (Qx), build_string ("black"), fg_fb);
|
|
|
2461 bg_fb = acons (list1 (Qx), build_string ("Gray80"), bg_fb);
|
|
|
2462 #endif
|
|
|
2463 #ifdef HAVE_TTY
|
|
|
2464 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
|
|
|
2465 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb);
|
|
|
2466 #endif
|
|
|
2467 #ifdef HAVE_MS_WINDOWS
|
|
440
|
2468 fg_fb = acons (list1 (Qmsprinter), build_string ("black"), fg_fb);
|
|
|
2469 bg_fb = acons (list1 (Qmsprinter), build_string ("white"), bg_fb);
|
|
428
|
2470 fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
|
|
|
2471 bg_fb = acons (list1 (Qmswindows), build_string ("Gray75"), bg_fb);
|
|
|
2472 #endif
|
|
|
2473 set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb);
|
|
|
2474 set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);
|
|
|
2475 }
|
|
|
2476
|
|
|
2477 /* Now create the other faces that redisplay needs to refer to
|
|
|
2478 directly. We could create them in Lisp but it's simpler this
|
|
|
2479 way since we need to get them anyway. */
|
|
|
2480
|
|
|
2481 /* modeline is gui element. */
|
|
771
|
2482 Vmodeline_face = Fmake_face (Qmodeline, build_msg_string ("modeline face"),
|
|
428
|
2483 Qnil);
|
|
|
2484
|
|
|
2485 set_specifier_fallback (Fget (Vmodeline_face, Qforeground, Qunbound),
|
|
|
2486 Fget (Vgui_element_face, Qforeground, Qunbound));
|
|
|
2487 set_specifier_fallback (Fget (Vmodeline_face, Qbackground, Qunbound),
|
|
|
2488 Fget (Vgui_element_face, Qbackground, Qunbound));
|
|
|
2489 set_specifier_fallback (Fget (Vmodeline_face, Qbackground_pixmap, Qnil),
|
|
|
2490 Fget (Vgui_element_face, Qbackground_pixmap,
|
|
|
2491 Qunbound));
|
|
|
2492
|
|
|
2493 /* toolbar is another gui element */
|
|
|
2494 Vtoolbar_face = Fmake_face (Qtoolbar,
|
|
771
|
2495 build_msg_string ("toolbar face"),
|
|
428
|
2496 Qnil);
|
|
|
2497 set_specifier_fallback (Fget (Vtoolbar_face, Qforeground, Qunbound),
|
|
|
2498 Fget (Vgui_element_face, Qforeground, Qunbound));
|
|
|
2499 set_specifier_fallback (Fget (Vtoolbar_face, Qbackground, Qunbound),
|
|
|
2500 Fget (Vgui_element_face, Qbackground, Qunbound));
|
|
|
2501 set_specifier_fallback (Fget (Vtoolbar_face, Qbackground_pixmap, Qnil),
|
|
|
2502 Fget (Vgui_element_face, Qbackground_pixmap,
|
|
|
2503 Qunbound));
|
|
|
2504
|
|
|
2505 /* vertical divider is another gui element */
|
|
|
2506 Vvertical_divider_face = Fmake_face (Qvertical_divider,
|
|
771
|
2507 build_msg_string ("vertical divider face"),
|
|
428
|
2508 Qnil);
|
|
|
2509
|
|
|
2510 set_specifier_fallback (Fget (Vvertical_divider_face, Qforeground, Qunbound),
|
|
|
2511 Fget (Vgui_element_face, Qforeground, Qunbound));
|
|
|
2512 set_specifier_fallback (Fget (Vvertical_divider_face, Qbackground, Qunbound),
|
|
|
2513 Fget (Vgui_element_face, Qbackground, Qunbound));
|
|
|
2514 set_specifier_fallback (Fget (Vvertical_divider_face, Qbackground_pixmap,
|
|
|
2515 Qunbound),
|
|
|
2516 Fget (Vgui_element_face, Qbackground_pixmap,
|
|
|
2517 Qunbound));
|
|
|
2518
|
|
|
2519 /* widget is another gui element */
|
|
|
2520 Vwidget_face = Fmake_face (Qwidget,
|
|
771
|
2521 build_msg_string ("widget face"),
|
|
428
|
2522 Qnil);
|
|
3094
|
2523 /* #### weird ... the gui-element face doesn't have its own font yet */
|
|
442
|
2524 set_specifier_fallback (Fget (Vwidget_face, Qfont, Qunbound),
|
|
|
2525 Fget (Vgui_element_face, Qfont, Qunbound));
|
|
428
|
2526 set_specifier_fallback (Fget (Vwidget_face, Qforeground, Qunbound),
|
|
|
2527 Fget (Vgui_element_face, Qforeground, Qunbound));
|
|
|
2528 set_specifier_fallback (Fget (Vwidget_face, Qbackground, Qunbound),
|
|
|
2529 Fget (Vgui_element_face, Qbackground, Qunbound));
|
|
442
|
2530 /* We don't want widgets to have a default background pixmap. */
|
|
428
|
2531
|
|
|
2532 Vleft_margin_face = Fmake_face (Qleft_margin,
|
|
771
|
2533 build_msg_string ("left margin face"),
|
|
428
|
2534 Qnil);
|
|
|
2535 Vright_margin_face = Fmake_face (Qright_margin,
|
|
771
|
2536 build_msg_string ("right margin face"),
|
|
428
|
2537 Qnil);
|
|
|
2538 Vtext_cursor_face = Fmake_face (Qtext_cursor,
|
|
771
|
2539 build_msg_string ("face for text cursor"),
|
|
428
|
2540 Qnil);
|
|
|
2541 Vpointer_face =
|
|
|
2542 Fmake_face (Qpointer,
|
|
771
|
2543 build_msg_string
|
|
428
|
2544 ("face for foreground/background colors of mouse pointer"),
|
|
|
2545 Qnil);
|
|
|
2546 }
|
