Mercurial > hg > xemacs-beta
annotate src/window-impl.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 | 79c6ff3eef26 |
| children | 1e7cc382eb16 |
| rev | line source |
|---|---|
| 872 | 1 /* Window definitions for XEmacs. |
| 2 Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 | |
| 3 Free Software Foundation, Inc. | |
| 4 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 5 Copyright (C) 1995, 1996, 2002 Ben Wing. | |
| 6 Copyright (C) 1996 Chuck Thompson. | |
| 7 | |
| 8 This file is part of XEmacs. | |
| 9 | |
| 10 XEmacs is free software; you can redistribute it and/or modify it | |
| 11 under the terms of the GNU General Public License as published by the | |
| 12 Free Software Foundation; either version 2, or (at your option) any | |
| 13 later version. | |
| 14 | |
| 15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 18 for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
| 21 along with XEmacs; see the file COPYING. If not, write to | |
| 22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 Boston, MA 02111-1307, USA. */ | |
| 24 | |
| 25 /* Synched up with: FSF 19.30. */ | |
| 26 | |
| 27 #ifndef INCLUDED_window_impl_h_ | |
| 28 #define INCLUDED_window_impl_h_ | |
| 29 | |
| 30 #include "window.h" | |
| 31 | |
| 32 /* All windows in use are arranged into a tree, with pointers up and down. | |
| 33 | |
| 34 Windows that are leaves of the tree are actually displayed | |
| 35 and show the contents of buffers. Windows that are not leaves | |
| 36 are used for representing the way groups of leaf windows are | |
| 37 arranged on the frame. Leaf windows never become non-leaves. | |
| 38 They are deleted only by calling delete-window on them (but | |
| 39 this can be done implicitly). Combination windows can be created | |
| 40 and deleted at any time. | |
| 41 | |
| 42 A leaf window has a non-nil buffer field, and also | |
| 43 has markers in its start and pointm fields. Non-leaf windows | |
| 44 have nil in these fields. | |
| 45 | |
| 46 Non-leaf windows are either vertical or horizontal combinations. | |
| 47 | |
| 48 A vertical combination window has children that are arranged on the frame | |
| 49 one above the next. Its vchild field points to the uppermost child. | |
| 50 The parent field of each of the children points to the vertical | |
| 51 combination window. The next field of each child points to the | |
| 52 child below it, or is nil for the lowest child. The prev field | |
| 53 of each child points to the child above it, or is nil for the | |
| 54 highest child. | |
| 55 | |
| 56 A horizontal combination window has children that are side by side. | |
| 57 Its hchild field points to the leftmost child. In each child | |
| 58 the next field points to the child to the right and the prev field | |
| 59 points to the child to the left. | |
| 60 | |
| 61 The children of a vertical combination window may be leaf windows | |
| 62 or horizontal combination windows. The children of a horizontal | |
| 63 combination window may be leaf windows or vertical combination windows. | |
| 64 | |
| 65 At the top of the tree are two windows which have nil as parent. | |
| 66 The second of these is minibuf_window. The first one manages all | |
| 67 the frame area that is not minibuffer, and is called the root window. | |
| 68 Different windows can be the root at different times; | |
| 69 initially the root window is a leaf window, but if more windows | |
| 70 are created then that leaf window ceases to be root and a newly | |
| 71 made combination window becomes root instead. | |
| 72 | |
| 73 In any case, on screens which have an ordinary window and a | |
| 74 minibuffer, prev of the minibuf window is the root window and next of | |
| 75 the root window is the minibuf window. On minibufferless screens or | |
| 76 minibuffer-only screens, the root window and the minibuffer window are | |
| 77 one and the same, so its prev and next members are nil. | |
| 78 | |
| 79 A dead window has the `dead' flag set on it. Note that unlike other | |
| 80 dead objects, dead windows can be made live again through restoring a | |
| 81 window configuration. This means that the values in a dead window | |
| 82 need to be preserved, except for those that are reconstructed by from | |
| 83 the window configuration. */ | |
| 84 | |
| 85 struct window | |
| 86 { | |
| 2720 | 87 #ifdef MC_ALLOC |
| 88 struct lrecord_header header; | |
| 89 #else /* MC_ALLOC */ | |
| 872 | 90 struct lcrecord_header header; |
| 2720 | 91 #endif /* MC_ALLOC */ |
| 872 | 92 |
| 93 /* The upper left corner coordinates of this window, | |
| 94 as integers (pixels) relative to upper left corner of frame = 0, 0 */ | |
| 95 int pixel_left; | |
| 96 int pixel_top; | |
| 97 /* The size of the window (in pixels) */ | |
| 98 int pixel_height; | |
| 99 int pixel_width; | |
| 100 | |
| 101 /* Number of columns display within the window is scrolled to the left. */ | |
| 102 int hscroll; | |
| 103 /* Idem for the window's modeline */ | |
| 104 Charcount modeline_hscroll; | |
| 105 /* Amount to clip off the top line for pixel-based scrolling. Point | |
| 106 will remain constant but this will be incremented to | |
| 107 incrementally shift lines up. */ | |
| 108 int top_yoffset; | |
| 109 /* Amount to clip off the left of the lines for pixel-based | |
| 110 scrolling. Hscroll will remain constant but this will be | |
| 111 incremented to incrementally shift lines left.*/ | |
| 112 int left_xoffset; | |
| 113 | |
| 114 /* face cache elements correct for this window and its current buffer */ | |
| 115 face_cachel_dynarr *face_cachels; | |
| 116 /* glyph cache elements correct for this window and its current buffer */ | |
| 117 glyph_cachel_dynarr *glyph_cachels; | |
| 118 /* List of starting positions for display lines. Only valid if | |
| 119 buffer has not changed. */ | |
| 120 line_start_cache_dynarr *line_start_cache; | |
| 121 int line_cache_validation_override; | |
| 122 | |
| 123 /* Length of longest line currently displayed. Used to control the | |
| 124 width of the horizontal scrollbars. */ | |
| 125 int max_line_len; | |
| 126 | |
| 127 /* Frame coords of point at that time */ | |
| 128 int last_point_x[3]; | |
| 129 int last_point_y[3]; | |
| 130 | |
| 131 /* Number of characters in buffer past bottom of window, | |
| 132 as of last redisplay that finished. */ | |
| 133 /* need one for each set of display structures */ | |
| 134 int window_end_pos[3]; | |
| 135 | |
| 136 /* Set by the extent code when extents in the gutter are changed. */ | |
| 137 int gutter_extent_modiff[4]; | |
| 138 | |
| 139 /* Set by redisplay to the last position seen. This is used | |
| 140 to implement the redisplay-end-trigger-functions. */ | |
| 141 Charbpos last_redisplay_pos; | |
| 142 | |
| 143 #define WINDOW_SLOT_DECLARATION | |
| 144 #define WINDOW_SLOT(slot) Lisp_Object slot; | |
| 145 #include "winslots.h" | |
| 146 | |
| 147 /* one-bit flags: */ | |
| 148 | |
| 149 /* marker used when restoring a window configuration */ | |
| 150 unsigned int config_mark :1; | |
| 151 /* Non-zero means window was dead. */ | |
| 152 unsigned int dead :1; | |
| 153 /* Non-zero means next redisplay must use the value of start | |
| 154 set up for it in advance. Set by scrolling commands. */ | |
| 155 unsigned int force_start :1; | |
| 156 /* Non-zero means must regenerate modeline of this window */ | |
| 157 unsigned int redo_modeline :1; | |
| 158 /* Non-zero means current value of `start' | |
| 159 was the beginning of a line when it was chosen. */ | |
| 160 unsigned int start_at_line_beg :1; | |
| 161 /* new redisplay flag */ | |
| 162 unsigned int windows_changed :1; | |
| 163 unsigned int shadow_thickness_changed :1; | |
| 164 /* Vertical divider flag and validity of it */ | |
| 165 unsigned int need_vertical_divider_p :1; | |
| 166 unsigned int need_vertical_divider_valid_p :1; | |
| 167 }; | |
| 168 | |
| 169 #define CURRENT_DISP 0 | |
| 170 #define DESIRED_DISP 1 | |
| 171 #define CMOTION_DISP 2 | |
| 172 | |
| 173 struct window_mirror | |
| 174 { | |
| 2720 | 175 #ifdef MC_ALLOC |
| 176 struct lrecord_header header; | |
| 177 #else /* MC_ALLOC */ | |
| 872 | 178 struct lcrecord_header header; |
| 2720 | 179 #endif /* MC_ALLOC */ |
| 872 | 180 |
| 181 /* Frame this mirror is on. */ | |
| 182 struct frame *frame; | |
| 183 | |
| 184 /* Following child (to right or down) at same level of tree */ | |
| 185 struct window_mirror *next; | |
| 186 | |
| 187 /* There is no prev field because we never traverse this structure | |
| 188 backwards. Same goes for the parent field. */ | |
| 189 | |
| 190 /* First child of this window. */ | |
| 191 /* vchild is used if this is a vertical combination, | |
| 192 hchild if this is a horizontal combination. */ | |
| 193 struct window_mirror *hchild, *vchild; | |
| 194 | |
| 195 /* Dynamic array of display lines */ | |
| 196 display_line_dynarr *current_display_lines; | |
| 197 display_line_dynarr *desired_display_lines; | |
| 198 | |
| 199 /* Buffer current_display_lines represent. */ | |
| 200 struct buffer *buffer; | |
| 201 | |
| 202 #ifdef HAVE_SCROLLBARS | |
| 203 /* Scrollbars associated with window, if any. */ | |
| 204 struct scrollbar_instance *scrollbar_vertical_instance; | |
| 205 struct scrollbar_instance *scrollbar_horizontal_instance; | |
| 206 #endif /* HAVE_SCROLLBARS */ | |
| 207 | |
| 208 /* Flag indicating whether a subwindow is currently being displayed. */ | |
| 209 unsigned int subwindows_being_displayed :1; | |
| 210 | |
| 211 /* Keep track of the truncation status in this window so we can | |
| 212 detect when it has changed. #### Magic variables would be a huge | |
| 213 win here. */ | |
| 214 unsigned int truncate_win :1; | |
| 215 }; | |
| 216 | |
| 217 /* Redefine basic properties more efficiently */ | |
| 218 | |
| 219 #undef WINDOW_LIVE_P | |
| 220 #define WINDOW_LIVE_P(x) (!(x)->dead) | |
| 221 #undef WINDOW_FRAME | |
| 222 #define WINDOW_FRAME(w) ((w)->frame) | |
| 223 #undef WINDOW_BUFFER | |
| 224 #define WINDOW_BUFFER(w) ((w)->buffer) | |
| 225 | |
| 226 /* 1 if W is a minibuffer window. */ | |
| 227 #define MINI_WINDOW_P(W) (!NILP ((W)->mini_p)) | |
| 228 | |
| 229 /* 1 if we are dealing with a parentless window (this includes the | |
| 230 root window on a frame and the minibuffer window; both of these | |
| 231 are siblings). */ | |
| 232 #define TOP_LEVEL_WINDOW_P(w) NILP ((w)->parent) | |
| 233 | |
| 234 /* Set all redisplay flags indicating a window has changed */ | |
| 235 #define MARK_WINDOWS_CHANGED(w) do { \ | |
| 236 (w)->windows_changed = 1; \ | |
| 237 if (!NILP (w->frame)) \ | |
| 238 { \ | |
| 239 struct frame *mwc_frame = XFRAME (w->frame); \ | |
| 240 MARK_FRAME_WINDOWS_CHANGED (mwc_frame); \ | |
| 241 } \ | |
| 242 else \ | |
| 243 windows_changed = 1; \ | |
| 244 } while (0) | |
| 245 | |
| 246 /* #### This should be fixed not to call MARK_FRAME_CHANGED because | |
| 247 faces are cached per window. Also, other code which changes window's | |
| 248 face should use this macro. | |
| 249 */ | |
| 250 #define MARK_WINDOW_FACES_CHANGED(w) \ | |
| 251 MARK_FRAME_FACES_CHANGED (XFRAME ((w)->frame)) | |
| 252 | |
| 253 #define WINDOW_TTY_P(w) FRAME_TTY_P (XFRAME ((w)->frame)) | |
| 254 #define WINDOW_X_P(w) FRAME_X_P (XFRAME ((w)->frame)) | |
| 255 #define WINDOW_NS_P(w) FRAME_NS_P (XFRAME ((w)->frame)) | |
| 256 #define WINDOW_WIN_P(w) FRAME_WIN_P (XFRAME ((w)->frame)) | |
| 257 | |
| 258 /* XEmacs window size and positioning macros. */ | |
| 259 #define WINDOW_TOP(w) ((w)->pixel_top) | |
| 260 #define WINDOW_TEXT_TOP(w) (WINDOW_TOP (w) + window_top_gutter_height (w)) | |
| 261 #define WINDOW_TEXT_TOP_CLIP(w) ((w)->top_yoffset) | |
| 262 #define WINDOW_BOTTOM(w) ((w)->pixel_top + (w)->pixel_height) | |
| 263 #define WINDOW_TEXT_BOTTOM(w) (WINDOW_BOTTOM (w) - window_bottom_gutter_height (w)) | |
| 264 #define WINDOW_LEFT(w) ((w)->pixel_left) | |
| 265 #define WINDOW_TEXT_LEFT(w) (WINDOW_LEFT (w) + window_left_gutter_width (w, 0)) | |
| 266 #define WINDOW_MODELINE_LEFT(w) \ | |
| 267 (WINDOW_LEFT (w) + window_left_gutter_width (w, 1)) | |
| 268 #define WINDOW_RIGHT(w) ((w)->pixel_left + (w)->pixel_width) | |
| 269 #define WINDOW_TEXT_RIGHT(w) \ | |
| 270 (WINDOW_RIGHT (w) - window_right_gutter_width (w, 0)) | |
| 271 #define WINDOW_MODELINE_RIGHT(w) \ | |
| 272 (WINDOW_RIGHT (w) - window_right_gutter_width (w, 1)) | |
| 273 | |
| 274 #define WINDOW_HEIGHT(w) ((w)->pixel_height) | |
| 275 #define WINDOW_TEXT_HEIGHT(w) (WINDOW_TEXT_BOTTOM (w) - WINDOW_TEXT_TOP (w)) | |
| 276 #define WINDOW_WIDTH(w) ((w)->pixel_width) | |
| 277 #define WINDOW_TEXT_WIDTH(w) (WINDOW_TEXT_RIGHT (w) - WINDOW_TEXT_LEFT (w)) | |
| 278 | |
| 279 #define WINDOW_HAS_MODELINE_P(w) (!NILP (w->has_modeline_p)) | |
| 280 | |
| 281 #define MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED(win) \ | |
| 282 abs ((!WINDOW_HAS_MODELINE_P (win) \ | |
| 283 ? ((XINT (win->modeline_shadow_thickness) > 1) \ | |
| 284 ? XINT (win->modeline_shadow_thickness) - 1 \ | |
| 285 : ((XINT (win->modeline_shadow_thickness) < -1) \ | |
| 286 ? XINT (win->modeline_shadow_thickness) + 1 \ | |
| 287 : XINT (win->modeline_shadow_thickness))) \ | |
| 288 : XINT (win->modeline_shadow_thickness))) | |
| 289 | |
| 290 #define MODELINE_SHADOW_THICKNESS(win) \ | |
| 291 (MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win) > 10 \ | |
| 292 ? 10 \ | |
| 293 : MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win)) | |
| 294 | |
| 295 #endif /* INCLUDED_window_impl_h_ */ |