Mercurial > hg > xemacs-beta
annotate src/faces.h @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | e38acbeb1cae |
| children | 1e7cc382eb16 |
| rev | line source |
|---|---|
| 428 | 1 /* Face data structures. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 771 | 3 Copyright (C) 1995, 2002 Ben Wing |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 440 | 24 #ifndef INCLUDED_faces_h_ |
| 25 #define INCLUDED_faces_h_ | |
| 428 | 26 |
| 771 | 27 #include "charset.h" /* for NUM_LEADING_BYTES */ |
| 428 | 28 |
| 440 | 29 /* a Lisp_Face is the C object corresponding to a face. There is one |
| 30 of these per face. It basically contains all of the specifiers for | |
| 31 the built-in face properties, plus the plist of user-specified | |
| 428 | 32 properties. */ |
| 33 | |
| 34 struct Lisp_Face | |
| 35 { | |
| 2720 | 36 #ifdef MC_ALLOC |
| 37 struct lrecord_header header; | |
| 38 #else /* MC_ALLOC */ | |
| 428 | 39 struct lcrecord_header header; |
| 2720 | 40 #endif /* MC_ALLOC */ |
| 428 | 41 |
| 42 Lisp_Object name; | |
| 43 Lisp_Object doc_string; | |
| 44 unsigned int dirty :1; /* Set whenever a face property is changed on | |
| 45 a face. */ | |
| 46 | |
| 47 Lisp_Object foreground; | |
| 48 Lisp_Object background; | |
| 49 Lisp_Object font; | |
| 50 | |
| 51 Lisp_Object display_table; | |
| 52 Lisp_Object background_pixmap; | |
| 53 | |
| 54 Lisp_Object underline; | |
| 55 Lisp_Object strikethru; | |
| 56 Lisp_Object highlight; | |
| 57 Lisp_Object dim; | |
| 58 Lisp_Object blinking; | |
| 59 Lisp_Object reverse; | |
| 60 | |
| 61 Lisp_Object plist; | |
| 62 | |
| 63 Lisp_Object charsets_warned_about; | |
| 64 }; | |
| 65 | |
| 66 /* | |
| 67 | |
| 68 A face cache element caches the results of instantiating the | |
| 69 properties of a face in a particular window. (Instantiation can | |
| 70 take a long time so this is very important.) Each window contains | |
| 71 an array of face cache elements (called the "face cache"), one for | |
| 72 each face that has been seen in the window so far. | |
| 73 | |
| 74 Some tricky stuff is done to make sure the face cache does not | |
| 75 become inconsistent: | |
| 76 | |
| 77 1) Switching buffers in a window clears the face cache for that | |
| 78 window, because this can change the way any property is | |
| 79 instantiated in the window. | |
| 80 2) Setting a face property causes that face to be marked as | |
| 81 dirty. This causes various stuff to happen to make sure | |
| 82 the appropriate face cache elements are invalidated. | |
| 83 (#### Actually this doesn't work quite right, and errs | |
| 84 too much on the side of invalidating unnecessary stuff.) | |
| 85 | |
| 86 There are also face cache elements for "merged faces", which are the | |
| 87 result of merging all the faces that overlap a particular buffer | |
| 88 position. The merging is always done in the context of a particular | |
| 89 domain (specifically, a window), and the face cache element is | |
| 90 specific to a particular window. (Face cache elements are contained | |
| 91 in an array that is attached to each struct_window.) The reason that | |
| 92 the merging takes place in the context of a particular window has | |
| 93 to do with the way the merging works: | |
| 94 | |
| 95 1) All extents overlying the buffer position are sorted by descending | |
| 96 priority. | |
| 97 2) The property of a particular merged face comes from the highest- | |
| 98 priority face that specifies a value for that particular property. | |
| 99 3) The way to determine whether a face specifies a value for a | |
| 100 particular property is to instantiate that face's property in | |
| 101 the window in question with the no-fallback option set, to | |
| 102 see if we got anything. | |
| 103 | |
| 104 For Mule, things get a bit trickier because there can be multiple | |
| 105 fonts per face/window combination -- the charset is an argument | |
| 106 to specifier-instance. | |
| 107 | |
| 108 We have two possible data structure representations: | |
| 109 | |
| 110 1) Keep the original "one font per face cache element" representation | |
| 111 and use a different face cache element for each charset. | |
| 112 2) Allow multiple fonts to be in a single face cache element. | |
| 113 | |
| 114 I've chosen to use (2) -- the data structure gets more complicated | |
| 115 but the algorithms for maintaining face cache elements end up | |
| 116 simpler. | |
| 117 */ | |
| 118 | |
| 119 #define NUM_STATIC_CACHEL_FACES 4 | |
| 120 | |
| 121 typedef struct face_cachel face_cachel; | |
| 122 struct face_cachel | |
| 123 { | |
| 124 /* There are two kinds of cachels; those created from a single face | |
| 125 and those created by merging more than one face. In the former | |
| 126 case, the FACE element specifies the face used. In the latter | |
| 127 case, the MERGED_FACES_STATIC and MERGED_FACES elements specify | |
| 128 the faces used for merging by giving the indices of the | |
| 129 corresponding single-face cachels. | |
| 130 | |
| 131 Formerly we didn't bother to keep track of the faces used for | |
| 442 | 132 merging. We do now because we need to do so because there is no |
| 428 | 133 other way to properly handle multiple charsets for Mule in the |
| 134 presence of display tables short of always computing the values | |
| 135 for all charsets, which is very expensive. Instead, we use a | |
| 136 lazy scheme where we only compute the font for a particular charset | |
| 137 when it is needed. (The exception is the font for the ASCII charset. | |
| 138 We always compute it, just like the other attributes, because | |
| 139 many places in the C code refer to the font of the ASCII charset | |
| 140 and expect it to always be there.) | |
| 141 | |
| 142 We store the first four faces in a static array, and use a | |
| 143 Dynarr for the rest. This has the advantage that the space used | |
| 144 is small but the Dynarr will almost never be created, so we | |
| 145 won't spend much time in malloc()/free(). | |
| 146 | |
| 147 The order of the faces here is decreasing extent priority. */ | |
| 148 Lisp_Object face; | |
| 149 int merged_faces_static[NUM_STATIC_CACHEL_FACES]; | |
| 150 int_dynarr *merged_faces; | |
| 151 int nfaces; | |
| 152 | |
| 153 /* The values stored here are computed by calling specifier_instance() | |
| 154 on the appropriate specifiers. This means that we will have either | |
| 155 a value computed from the face itself or a value computed from the | |
| 156 default face. We need to distinguish the two so that merging works | |
| 157 properly -- a value that comes from the default face is treated | |
| 158 as "unspecified" during merging and is overridden by lower-priority | |
| 159 faces. This is what the _specified flags below are for. */ | |
| 160 | |
| 161 Lisp_Object foreground; | |
| 162 Lisp_Object background; | |
| 771 | 163 /* There are currently 128 or 129 possible charsets under Mule. For the |
| 428 | 164 moment we just take the easy way out and allocate space for each |
| 165 of them. This avoids messing with Dynarrs. | |
| 166 | |
| 167 #### We should look into this and probably clean it up | |
| 168 to use Dynarrs. This may be a big space hog as is. */ | |
| 169 Lisp_Object font[NUM_LEADING_BYTES]; | |
| 170 | |
| 171 Lisp_Object display_table; | |
| 172 Lisp_Object background_pixmap; | |
| 173 | |
| 174 unsigned int underline :1; | |
| 175 unsigned int strikethru :1; | |
| 176 unsigned int highlight :1; | |
| 177 unsigned int dim :1; | |
| 178 unsigned int blinking :1; | |
| 179 unsigned int reverse :1; | |
| 180 | |
| 181 /* Used when merging to tell if the above field represents an actual | |
| 182 value of this face or a fallback value. */ | |
| 183 /* #### Of course we should use a bit array or something. */ | |
| 184 unsigned char font_specified[NUM_LEADING_BYTES]; | |
| 185 unsigned int foreground_specified :1; | |
| 186 unsigned int background_specified :1; | |
| 187 unsigned int display_table_specified :1; | |
| 188 unsigned int background_pixmap_specified :1; | |
| 189 | |
| 190 unsigned int strikethru_specified :1; | |
| 191 unsigned int underline_specified :1; | |
| 192 unsigned int highlight_specified :1; | |
| 193 unsigned int dim_specified :1; | |
| 194 unsigned int blinking_specified :1; | |
| 195 unsigned int reverse_specified :1; | |
| 196 | |
| 197 /* The updated flag is set after we calculate the values for the | |
| 198 face cachel and cleared whenever a face changes, to indicate | |
| 199 that the values stored here might be wrong. The next time | |
| 200 we go to access the values, we recompute them; if any values | |
| 201 change, we set the DIRTY flag, which tells the output routines | |
| 202 that a face value has in fact changed and the sections of text | |
| 203 using this face need to be redrawn. | |
| 204 | |
| 205 It is trickier with fonts because we don't automatically | |
| 206 recompute the fonts but do it only when it is necessary. | |
| 207 (The ASCII font is an exception, of course; see above). | |
| 208 | |
| 209 In the case of fonts, we maintain a separate updated flag | |
| 210 for each font. Whenever we need to access the font for | |
| 211 a particular charset, we recalculate it if either its | |
| 212 value is Qunbound (meaning it's never been computed at all) | |
| 213 or the updated flag is not set. We set the dirty flag if | |
| 214 the value is not the same as before and the previous value | |
| 215 was not Qunbound. | |
| 216 | |
| 217 #### Note that we don't yet deal with the case of the new | |
| 218 value being Qunbound, as could happen if no fonts of the | |
| 219 right sort are available on the system. In this case, the | |
| 220 whole program will just crash. For the moment, this is | |
| 221 OK (for debugging purposes) but we should fix this by | |
| 222 storing a "blank font" if the instantiation fails. */ | |
| 223 unsigned int dirty :1; | |
| 224 unsigned int updated :1; | |
| 225 /* #### Of course we should use a bit array or something. */ | |
| 226 unsigned char font_updated[NUM_LEADING_BYTES]; | |
| 227 }; | |
| 228 | |
| 440 | 229 DECLARE_LRECORD (face, Lisp_Face); |
| 230 #define XFACE(x) XRECORD (x, face, Lisp_Face) | |
| 617 | 231 #define wrap_face(p) wrap_record (p, face) |
| 428 | 232 #define FACEP(x) RECORDP (x, face) |
| 233 #define CHECK_FACE(x) CHECK_RECORD (x, face) | |
| 234 | |
| 235 Lisp_Object ensure_face_cachel_contains_charset (struct face_cachel *cachel, | |
| 236 Lisp_Object domain, | |
| 237 Lisp_Object charset); | |
| 238 void ensure_face_cachel_complete (struct face_cachel *cachel, | |
| 239 Lisp_Object domain, | |
| 240 unsigned char *charsets); | |
| 241 void update_face_cachel_data (struct face_cachel *cachel, | |
| 242 Lisp_Object domain, | |
| 243 Lisp_Object face); | |
| 244 void face_cachel_charset_font_metric_info (struct face_cachel *cachel, | |
| 245 unsigned char *charsets, | |
| 246 struct font_metric_info *fm); | |
| 247 void mark_face_cachels (face_cachel_dynarr *elements); | |
| 248 void mark_face_cachels_as_clean (struct window *w); | |
| 249 void mark_face_cachels_as_not_updated (struct window *w); | |
| 250 void reset_face_cachel (struct face_cachel *inst); | |
| 251 void reset_face_cachels (struct window *w); | |
| 252 face_index get_builtin_face_cache_index (struct window *w, | |
| 253 Lisp_Object face); | |
| 254 #ifdef MEMORY_USAGE_STATS | |
| 255 int compute_face_cachel_usage (face_cachel_dynarr *face_cachels, | |
| 256 struct overhead_stats *ovstats); | |
| 257 #endif /* MEMORY_USAGE_STATS */ | |
| 258 | |
| 259 EXFUN (Fface_name, 1); | |
| 260 EXFUN (Ffind_face, 1); | |
| 261 EXFUN (Fget_face, 1); | |
| 262 | |
| 263 extern Lisp_Object Qstrikethru, Vbuilt_in_face_specifiers, Vdefault_face; | |
| 264 extern Lisp_Object Vleft_margin_face, Vpointer_face, Vright_margin_face; | |
| 432 | 265 extern Lisp_Object Vtext_cursor_face, Vvertical_divider_face; |
| 428 | 266 extern Lisp_Object Vtoolbar_face, Vgui_element_face, Vwidget_face; |
| 267 | |
| 268 void mark_all_faces_as_clean (void); | |
| 269 void init_frame_faces (struct frame *f); | |
| 270 void init_device_faces (struct device *d); | |
| 271 void init_global_faces (struct device *d); | |
| 272 face_index get_extent_fragment_face_cache_index (struct window *w, | |
| 273 struct extent_fragment *ef); | |
| 274 void update_frame_face_values (struct frame *f); | |
| 275 void face_property_was_changed (Lisp_Object face, Lisp_Object property, | |
| 276 Lisp_Object locale); | |
| 277 void default_face_font_info (Lisp_Object domain, int *ascent, | |
| 278 int *descent, int *height, int *width, | |
| 279 int *proportional_p); | |
| 280 void default_face_height_and_width (Lisp_Object domain, | |
| 281 int *height, int *width); | |
| 282 void default_face_height_and_width_1 (Lisp_Object domain, | |
| 283 int *height, int *width); | |
| 284 | |
| 285 #define FACE_CACHEL_FONT(cachel, charset) \ | |
| 771 | 286 (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE]) |
| 428 | 287 |
| 288 #define WINDOW_FACE_CACHEL(window, index) \ | |
| 289 Dynarr_atp ((window)->face_cachels, index) | |
| 290 | |
| 291 #define FACE_CACHEL_FINDEX_UNSAFE(cachel, offset) \ | |
| 292 ((offset) < NUM_STATIC_CACHEL_FACES \ | |
| 293 ? (cachel)->merged_faces_static[offset] \ | |
| 294 : Dynarr_at ((cachel)->merged_faces, (offset) - NUM_STATIC_CACHEL_FACES)) | |
| 295 | |
| 296 #define WINDOW_FACE_CACHEL_FACE(window, index) \ | |
| 297 (WINDOW_FACE_CACHEL (window, index)->face) | |
| 298 #define WINDOW_FACE_CACHEL_FOREGROUND(window, index) \ | |
| 299 (WINDOW_FACE_CACHEL (window, index)->foreground) | |
| 300 #define WINDOW_FACE_CACHEL_BACKGROUND(window, index) \ | |
| 301 (WINDOW_FACE_CACHEL (window, index)->background) | |
| 302 /* #### This can be referenced by various functions, | |
| 303 but face_cachels isn't initialized for the stream device. | |
| 304 Since it doesn't need the value we just return nil here to avoid | |
| 305 blowing up in multiple places. */ | |
| 306 #define WINDOW_FACE_CACHEL_FONT(window, index, charset) \ | |
| 307 ((window)->face_cachels \ | |
| 308 ? FACE_CACHEL_FONT (WINDOW_FACE_CACHEL (window, index), charset) \ | |
| 309 : Qnil) | |
| 310 #define WINDOW_FACE_CACHEL_DISPLAY_TABLE(window, index) \ | |
| 311 (WINDOW_FACE_CACHEL (window, index)->display_table) | |
| 312 #define WINDOW_FACE_CACHEL_BACKGROUND_PIXMAP(window, index) \ | |
| 313 (WINDOW_FACE_CACHEL (window, index)->background_pixmap) | |
| 314 #define WINDOW_FACE_CACHEL_DIRTY(window, index) \ | |
| 315 (WINDOW_FACE_CACHEL (window, index)->dirty) | |
| 316 #define WINDOW_FACE_CACHEL_UNDERLINE_P(window, index) \ | |
| 317 (WINDOW_FACE_CACHEL (window, index)->underline) | |
| 318 #define WINDOW_FACE_CACHEL_HIGHLIGHT_P(window, index) \ | |
| 319 (WINDOW_FACE_CACHEL (window, index)->highlight) | |
| 320 #define WINDOW_FACE_CACHEL_DIM_P(window, index) \ | |
| 321 (WINDOW_FACE_CACHEL (window, index)->dim) | |
| 322 #define WINDOW_FACE_CACHEL_BLINKING_P(window, index) \ | |
| 323 (WINDOW_FACE_CACHEL (window, index)->blinking) | |
| 324 #define WINDOW_FACE_CACHEL_REVERSE_P(window, index) \ | |
| 325 (WINDOW_FACE_CACHEL (window, index)->reverse) | |
| 326 | |
| 327 #define FACE_PROPERTY_SPECIFIER(face, property) Fget (face, property, Qnil) | |
| 328 | |
| 329 #define FACE_PROPERTY_INSTANCE_1(face, property, domain, errb, no_fallback, depth) \ | |
| 330 specifier_instance (FACE_PROPERTY_SPECIFIER (face, property), Qunbound, \ | |
| 331 domain, errb, 1, no_fallback, depth) | |
| 332 | |
| 333 #define FACE_PROPERTY_INSTANCE(face, property, domain, no_fallback, depth) \ | |
| 793 | 334 FACE_PROPERTY_INSTANCE_1 (face, property, domain, ERROR_ME_DEBUG_WARN, \ |
| 428 | 335 no_fallback, depth) |
| 336 | |
| 337 Lisp_Object face_property_matching_instance (Lisp_Object face, | |
| 338 Lisp_Object property, | |
| 339 Lisp_Object charset, | |
| 340 Lisp_Object domain, | |
| 578 | 341 Error_Behavior errb, |
| 428 | 342 int no_fallback, |
| 343 Lisp_Object depth); | |
| 344 | |
| 345 #define FACE_PROPERTY_SPEC_LIST(face, property, locale) \ | |
| 346 Fspecifier_spec_list (FACE_PROPERTY_SPECIFIER (face, property), \ | |
| 347 locale, Qnil, Qnil) | |
| 498 | 348 #define SET_FACE_PROPERTY(face, property, value, locale, tag, how_to_add) \ |
| 428 | 349 Fadd_spec_to_specifier (FACE_PROPERTY_SPECIFIER (face, property), \ |
| 498 | 350 value, locale, tag, how_to_add) |
| 428 | 351 |
| 352 #define FACE_FOREGROUND(face, domain) \ | |
| 353 FACE_PROPERTY_INSTANCE (face, Qforeground, domain, 0, Qzero) | |
| 354 #define FACE_BACKGROUND(face, domain) \ | |
| 355 FACE_PROPERTY_INSTANCE (face, Qbackground, domain, 0, Qzero) | |
| 356 #define FACE_FONT(face, domain, charset) \ | |
| 357 face_property_matching_instance (face, Qfont, charset, domain, \ | |
| 793 | 358 ERROR_ME_DEBUG_WARN, 0, Qzero) |
| 428 | 359 #define FACE_DISPLAY_TABLE(face, domain) \ |
| 360 FACE_PROPERTY_INSTANCE (face, Qdisplay_table, domain, 0, Qzero) | |
| 361 #define FACE_BACKGROUND_PIXMAP(face, domain) \ | |
| 362 FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero) | |
| 363 #define FACE_UNDERLINE_P(face, domain) \ | |
| 364 (!NILP (FACE_PROPERTY_INSTANCE (face, Qunderline, domain, 0, Qzero))) | |
| 440 | 365 #define FACE_STRIKETHRU_P(face, domain) \ |
| 366 (!NILP (FACE_PROPERTY_INSTANCE (face, Qstrikethru, domain, 0, Qzero))) | |
| 428 | 367 #define FACE_HIGHLIGHT_P(face, domain) \ |
| 368 (!NILP (FACE_PROPERTY_INSTANCE (face, Qhighlight, domain, 0, Qzero))) | |
| 369 #define FACE_DIM_P(face, domain) \ | |
| 370 (!NILP (FACE_PROPERTY_INSTANCE (face, Qdim, domain, 0, Qzero))) | |
| 371 #define FACE_BLINKING_P(face, domain) \ | |
| 372 (!NILP (FACE_PROPERTY_INSTANCE (face, Qblinking, domain, 0, Qzero))) | |
| 373 #define FACE_REVERSE_P(face, domain) \ | |
| 374 (!NILP (FACE_PROPERTY_INSTANCE (face, Qreverse, domain, 0, Qzero))) | |
| 375 | |
| 440 | 376 #endif /* INCLUDED_faces_h_ */ |