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