annotate src/faces.c @ 181:bfd6434d15b3 r20-3b17

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