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