Mercurial > hg > xemacs-beta
view lisp/window-xemacs.el @ 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 | 627e25731054 |
| children | 5bf18ccb05df |
line wrap: on
line source
;;; window-xemacs.el --- XEmacs window commands aside from those written in C. ;; Copyright (C) 1985, 1989, 1993-94, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: frames, extensions, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not synched. ;;; Commentary: ;; This file is dumped with XEmacs. ;; slb - 5/29/97 ;; Split apart from window.el in order to keep that file better in synch ;; with Emacs. ;;; Code: (defgroup windows nil "Windows within a frame." :group 'environment) (defun recenter (&optional n window) "Center point in WINDOW and redisplay frame. With N, put point on line N. The desired position of point is always relative to the window. Just C-u as prefix means put point in the center of the window. No N (i.e., it is nil) erases the entire frame and then redraws with point in the center of the window. If WINDOW is nil, the selected window is used." (interactive "_P") (center-to-window-line (if (consp n) nil n) window) (when (null n) (redraw-frame (window-frame window) t))) (defun backward-other-window (count &optional which-frames which-devices) "Select the COUNT'th different window on this frame, going backwards. This is just like calling `other-window' with COUNT negated." (interactive "p") (other-window (- count) which-frames which-devices)) (defalias 'windows-of-buffer 'get-buffer-window-list) (defun buffer-in-multiple-windows-p (&optional buffer) "Return t if BUFFER is in multiple windows. If BUFFER is not specified, the current buffer will be used." (setq buffer (or buffer (get-buffer buffer) (get-file-buffer buffer) (current-buffer))) (> (length (windows-of-buffer buffer)) 1)) (defun window-list (&optional frame minibuf window) "Return a list of windows on FRAME, beginning with WINDOW. FRAME and WINDOW default to the selected ones. Optional second arg MINIBUF t means count the minibuffer window even if not active. If MINIBUF is neither t nor nil it means not to count the minibuffer even if it is active." (setq frame (or frame (selected-frame)) window (or window (selected-window frame))) (if (not (eq (window-frame window) frame)) (error "Window must be on frame.")) (let ((current-frame (selected-frame)) list) (unwind-protect (save-window-excursion (select-frame frame) (walk-windows (function (lambda (cur-window) (if (not (eq window cur-window)) (setq list (cons cur-window list))))) minibuf) (setq list (cons window list))) (select-frame current-frame)))) ;; We used to have set-window-dedicated-p as an obsolete version ;; of set-window-buffer-dedicated, but it really makes more sense ;; this way. (make-obsolete 'set-window-buffer-dedicated 'set-window-dedicated-p) (defun set-window-buffer-dedicated (window buffer) "Make WINDOW display BUFFER and be dedicated to that buffer. Then Emacs will not automatically change which buffer appears in WINDOW. If BUFFER is nil, make WINDOW not be dedicated (but don't change which buffer appears in it currently)." (if (bufferp buffer) (set-window-buffer window (get-buffer-create buffer))) (set-window-dedicated-p window (not (null buffer)))) ;; Window configurations (defstruct saved-window currentp minibufferp minibuffer-scrollp buffer mark-marker start-marker point-marker pixel-left pixel-top pixel-right pixel-bottom hscroll modeline-hscroll dedicatedp first-hchild first-vchild next-child) (defstruct window-configuration frame frame-pixel-width frame-pixel-height current-buffer minibuffer-pixel-height min-width min-height saved-root-window) (defun window-configuration-equal (conf-1 conf-2) "Returns a boolean indicating whether the two given configurations are identical." (or (eq conf-1 conf-2) (and (eq (window-configuration-frame conf-1) (window-configuration-frame conf-2)) (= (window-configuration-frame-pixel-width conf-1) (window-configuration-frame-pixel-width conf-2)) (= (window-configuration-frame-pixel-height conf-1) (window-configuration-frame-pixel-height conf-2)) (eq (window-configuration-current-buffer conf-1) (window-configuration-current-buffer conf-2)) (saved-window-equal (window-configuration-saved-root-window conf-1) (window-configuration-saved-root-window conf-2))))) (defun saved-window-equal (saved-1 saved-2) "Returns a boolean indicating whether the two given saved windows are identical." (or (eq saved-1 saved-2) (and (eq (saved-window-currentp saved-1) (saved-window-currentp saved-2)) (eq (saved-window-minibuffer-scrollp saved-1) (saved-window-minibuffer-scrollp saved-2)) (eq (saved-window-buffer saved-1) (saved-window-buffer saved-2)) (equal (saved-window-mark-marker saved-1) (saved-window-mark-marker saved-2)) (or (and (saved-window-currentp saved-1) (saved-window-currentp saved-2)) (equal (saved-window-start-marker saved-1) (saved-window-start-marker saved-2))) (or (and (saved-window-currentp saved-1) (saved-window-currentp saved-2)) (equal (saved-window-point-marker saved-1) (saved-window-point-marker saved-2))) (= (saved-window-pixel-left saved-1) (saved-window-pixel-left saved-2)) (= (saved-window-pixel-top saved-1) (saved-window-pixel-top saved-2)) (= (saved-window-pixel-right saved-1) (saved-window-pixel-right saved-2)) (= (saved-window-pixel-bottom saved-1) (saved-window-pixel-bottom saved-2)) (= (saved-window-hscroll saved-1) (saved-window-hscroll saved-2)) (equal (saved-window-modeline-hscroll saved-1) (saved-window-modeline-hscroll saved-2)) (eq (saved-window-dedicatedp saved-1) (saved-window-dedicatedp saved-2)) (maybe-saved-window-equal (saved-window-first-hchild saved-1) (saved-window-first-hchild saved-2)) (maybe-saved-window-equal (saved-window-first-vchild saved-1) (saved-window-first-vchild saved-2)) (maybe-saved-window-equal (saved-window-next-child saved-1) (saved-window-next-child saved-2))))) (defun maybe-saved-window-equal (maybe-saved-1 maybe-saved-2) "Returns a boolean indicating whether the two given saved windows or NILs are identical." (cond ((and (not maybe-saved-1) (not maybe-saved-2)) t) ((not maybe-saved-1) (not maybe-saved-2)) ((not maybe-saved-2) (not maybe-saved-1)) (t (saved-window-equal maybe-saved-1 maybe-saved-2)))) (defun current-window-configuration (&optional frame) "Return an object representing the current window configuration of FRAME. If FRAME is nil or omitted, use the selected frame. This describes the number of windows, their sizes and current buffers, and for each window on FRAME the displayed buffer, where display starts, and the positions of point and mark. An exception is made for point in the current buffer: its value is -not- saved." (let ((frame (or frame (selected-frame)))) ;; The original C code used complicated but still incomplete logic ;; to decide if and how to restore the size of the minibuffer. It ;; goes something like this: ; (let ((real-font-height ; (font-height (face-font 'default) frame)) ; (minibuffer-height ; (if (and (minibuffer-window frame) ; (not (frame-minibuffer-only-p frame))) ; (window-pixel-height (minibuffer-window frame)) ; 0))) ; ...) (make-window-configuration :frame frame :frame-pixel-width (frame-pixel-width frame) :frame-pixel-height (frame-pixel-height frame) :current-buffer (current-buffer) :min-width window-min-width :min-height window-min-height :minibuffer-pixel-height (window-pixel-height (minibuffer-window frame)) ;; this tries to do what the old code did: ; :minibuffer-height (if (zerop (% minibuffer-height real-font-height)) ; (- (/ minibuffer-height real-font-height)) ; lines ; minibuffer-height) ; pixels :saved-root-window (root-window->saved-window (frame-root-window frame))))) (defun root-window->saved-window (window) "Converts a root window into a tree of saved-window structures." (let ((buffer (window-buffer window)) (edges (window-pixel-edges window))) (let ((left (nth 0 edges)) (top (nth 1 edges)) (right (nth 2 edges)) (bottom (nth 3 edges))) (let ((saved-window (make-saved-window :currentp (eq window (selected-window (window-frame window))) :minibufferp (eq window (minibuffer-window (window-frame window))) :minibuffer-scrollp (eq window minibuffer-scroll-window) :buffer buffer :pixel-left left :pixel-top top :pixel-right right :pixel-bottom bottom :hscroll (window-hscroll window) :modeline-hscroll (modeline-hscroll window) :dedicatedp (window-dedicated-p window) :first-hchild (if (window-first-hchild window) (root-window->saved-window (window-first-hchild window)) nil) :first-vchild (if (window-first-vchild window) (root-window->saved-window (window-first-vchild window)) nil) :next-child (if (window-next-child window) (root-window->saved-window (window-next-child window)) nil)))) (if buffer (progn (let ((marker (make-marker))) (set-marker marker (window-start window) buffer) (setf (saved-window-start-marker saved-window) marker)) (let ((marker (make-marker))) (if (eq window (selected-window)) (set-marker marker (point buffer) buffer) (set-marker marker (window-point window) buffer)) (setf (saved-window-point-marker saved-window) marker)) (setf (saved-window-mark-marker saved-window) (copy-marker (mark-marker t buffer))))) saved-window)))) (defun set-window-configuration (configuration) "Set the configuration of windows and buffers as specified by CONFIGURATION. CONFIGURATION must be a value previously returned by `current-window-configuration'." (let ((frame (window-configuration-frame configuration))) (if (and (frame-live-p frame) (not (window-configuration-equal configuration (current-window-configuration)))) (really-set-window-configuration frame configuration)))) (defun really-set-window-configuration (frame configuration) "Set the window configuration CONFIGURATION on live frame FRAME." ;; avoid potential temporary problems (setq window-min-width 0) (setq window-min-height 0) (setq minibuffer-scroll-window nil) (frame-reduce-to-one-window frame) (set-window-configuration-frame-size configuration) ;; these may have changed because of the delete (let ((root-window (frame-root-window frame))) (enlarge-window-pixels (- (window-configuration-minibuffer-pixel-height configuration) (window-pixel-height (minibuffer-window frame))) nil (minibuffer-window frame)) ;; avoid that `set-window-point' will set the buffer's point for ;; the selected window (select-window (minibuffer-window frame)) (let ((window-configuration-current-window nil)) (declare (special window-configuration-current-window)) (restore-saved-window configuration root-window (window-configuration-saved-root-window configuration) 'vertical) (if window-configuration-current-window (select-window window-configuration-current-window)))) (setq window-min-width (window-configuration-min-width configuration)) (setq window-min-height (window-configuration-min-height configuration)) (let ((buffer (window-configuration-current-buffer configuration))) (if (buffer-live-p buffer) (set-buffer buffer) (set-buffer (car (buffer-list)))))) (defun set-window-configuration-frame-size (configuration) "Restore the frame size of a window configuration." (set-frame-pixel-size (window-configuration-frame configuration) (window-configuration-frame-pixel-width configuration) (window-configuration-frame-pixel-height configuration))) (defun frame-reduce-to-one-window (frame) "Delete all windows except the minibuffer and one other in FRAME." (let* ((root-window (frame-root-window frame)) (combination-start (or (window-first-hchild root-window) (window-first-vchild root-window)))) (if combination-start (window-reduce-to-one combination-start)))) ;; Note that simply using `delete-other-windows' causes obscure ;; breakage. --Mike (defun window-reduce-to-one (window) "Make sure only one subwindow of WINDOW is left." (let ((window (window-next-child window))) (while window (if (window-live-p window) (let ((next (window-next-child window))) (delete-window window) (setq window next))))) (cond ((window-first-hchild window) (window-reduce-to-one (window-first-hchild window))) ((window-first-vchild window) (window-reduce-to-one (window-first-vchild window))))) (defun restore-saved-window (configuration window saved-window direction) "Within CONFIGURATION, restore WINDOW to the state of SAVED-WINDOW." (and (saved-window-next-child saved-window) (not (saved-window-minibufferp (saved-window-next-child saved-window))) (progn (cond ((eq direction 'vertical) (split-window window nil nil)) ((eq direction 'horizontal) (split-window window nil t))) (restore-saved-window configuration (window-next-child window) (saved-window-next-child saved-window) direction))) (if (saved-window-first-hchild saved-window) (restore-saved-window configuration window (saved-window-first-hchild saved-window) 'horizontal)) (if (saved-window-first-vchild saved-window) (restore-saved-window configuration window (saved-window-first-vchild saved-window) 'vertical)) (if (not (saved-window-minibufferp saved-window)) (restore-saved-window-parameters configuration window saved-window))) (defun restore-saved-window-parameters (configuration window saved-window) "Restore the window parameters stored in SAVED-WINDOW on WINDOW." (declare (special window-configuration-current-window)) (let ((buffer (saved-window-buffer saved-window))) (if (and buffer (buffer-live-p buffer)) (progn (set-window-buffer window (saved-window-buffer saved-window)) (set-window-start window (marker-position (saved-window-start-marker saved-window)) t) (set-window-point window (marker-position (saved-window-point-marker saved-window))) (set-marker (mark-marker t buffer) (marker-position (saved-window-mark-marker saved-window)) buffer) (if (not (eq buffer (window-configuration-current-buffer configuration))) (goto-char (window-point window) buffer))))) (if (and (not (saved-window-first-hchild saved-window)) (not (saved-window-first-vchild saved-window))) ;; only set size for non-container windows (progn ;; If this is the root window, it may be the only window. ;; Because of mismatches between actual and reported frame ;; size, it may not let us actually set the size of the root ;; window to what we want. --Mike (if (not (eq window (frame-root-window (window-frame window)))) (progn (enlarge-window-pixels (- (saved-window-pixel-width saved-window) (window-pixel-width window)) t window) (enlarge-window-pixels (- (saved-window-pixel-height saved-window) (window-pixel-height window)) nil window))) (set-window-hscroll window (saved-window-hscroll saved-window)) (set-modeline-hscroll window (saved-window-modeline-hscroll saved-window)) (set-window-dedicated-p window (saved-window-dedicatedp saved-window)))) (if (saved-window-currentp saved-window) (setq window-configuration-current-window window)) (if (saved-window-minibuffer-scrollp saved-window) (setq minibuffer-scroll-window window))) (defun saved-window-pixel-width (saved-window) "Compute the pixel width of SAVED-WINDOW." (- (saved-window-pixel-right saved-window) (saved-window-pixel-left saved-window))) (defun saved-window-pixel-height (saved-window) "Compute the pixel height of SAVED-WINDOW." (- (saved-window-pixel-bottom saved-window) (saved-window-pixel-top saved-window))) ;; The window-config stack is stored as a list in frame property ;; 'window-config-stack, with the most recent element at the front. ;; When you pop off an element, the popped off element gets put at the ;; front of frame property 'window-config-unpop-stack, so you can ;; retrieve it using unpop-window-configuration. (defcustom window-config-stack-max 16 "*Maximum size of window configuration stack. Start discarding off end if it gets this big." :type 'integer :group 'windows) (defun window-config-stack (&optional frame) (or frame (setq frame (selected-frame))) (let ((stack (frame-property frame 'window-config-stack))) (if stack (set-undoable-stack-max stack window-config-stack-max) (progn (setq stack (make-undoable-stack window-config-stack-max)) (set-frame-property frame 'window-config-stack stack))) stack)) (defun push-window-configuration (&optional config) "Push the current window configuration onto the window-config stack. If CONFIG is specified, push it instead of the current window configuration. Each frame has its own window-config stack." (interactive) (let ((wc (or config (current-window-configuration))) (stack (window-config-stack))) (if (or (= 0 (undoable-stack-a-length stack)) (not (equal (undoable-stack-a-top stack) wc))) (undoable-stack-push stack wc)))) (defun pop-window-configuration () "Pop the top window configuration off the window-config stack and set it. Before setting the new window configuration, the current window configuration is pushed onto the \"unpop\" stack. `unpop-window-configuration' undoes what this function does. Each frame has its own window-config and \"unpop\" stack." (interactive) (let ((stack (window-config-stack)) (wc (current-window-configuration)) popped) (condition-case nil (progn (setq popped (undoable-stack-pop stack)) (while (equal popped wc) (setq popped (undoable-stack-pop stack))) (undoable-stack-push stack wc) (undoable-stack-undo stack) (set-window-configuration popped) popped) (trunc-stack-bottom (error "Bottom of window config stack"))))) (defun unpop-window-configuration () "Undo the effect of the most recent `pop-window-configuration'. This does exactly the inverse of what `pop-window-configuration' does: i.e. it pops a window configuration off of the \"unpop\" stack and pushes the current window configuration onto the window-config stack. Each frame has its own window-config and \"unpop\" stack." (interactive) (let ((stack (window-config-stack)) (wc (current-window-configuration)) popped) (condition-case nil (progn (setq popped (progn (undoable-stack-redo stack) (undoable-stack-pop stack))) (while (equal popped wc) (setq popped (progn (undoable-stack-redo stack) (undoable-stack-pop stack)))) (undoable-stack-push stack wc) (set-window-configuration popped) popped) (trunc-stack-bottom (error "Top of window config stack"))))) ;;;;;;;;;;;;; display-buffer, moved here from C. Hallelujah. (make-variable-buffer-local '__buffer-dedicated-frame) (defun buffer-dedicated-frame (&optional buffer) "Return the frame dedicated to this BUFFER, or nil if there is none. No argument or nil as argument means use current buffer as BUFFER." (let ((buffer (decode-buffer buffer))) (let ((frame (symbol-value-in-buffer '__buffer-dedicated-frame buffer))) ;; XEmacs addition: if the frame is dead, silently make it go away. (when (and (framep frame) (not (frame-live-p frame))) (with-current-buffer buffer (setq __buffer-dedicated-frame nil)) (setq frame nil)) frame))) (defun set-buffer-dedicated-frame (buffer frame) "For this BUFFER, set the FRAME dedicated to it. FRAME must be a frame or nil." (let ((buffer (decode-buffer buffer))) (and frame (check-argument-type #'frame-live-p frame)) (with-current-buffer buffer (setq __buffer-dedicated-frame frame)))) (defvar display-buffer-function nil "If non-nil, function to call to handle `display-buffer'. It will receive four args: the same as those to `display-buffer'.") (defvar pre-display-buffer-function nil "If non-nil, function that will be called from `display-buffer' as the first action. It will receive four args: the same as those to `display-buffer'. This function may be used to select an appropriate frame for the buffer, for example. See also the variable `display-buffer-function', which may be used to completely replace the `display-buffer' function. If the return value of this function is non-nil, it should be a frame, and that frame will be used to display the buffer.") (defcustom pop-up-frames nil "*Non-nil means `display-buffer' should make a separate frame." :type 'boolean :group 'frames) (defvar pop-up-frame-function nil "Function to call to handle automatic new frame creation. It is called with no arguments and should return a newly created frame. A typical value might be `(lambda () (new-frame pop-up-frame-alist))' where `pop-up-frame-alist' would hold the default frame parameters.") (defcustom special-display-buffer-names nil "*List of buffer names that should have their own special frames. Displaying a buffer whose name is in this list makes a special frame for it using `special-display-function'. An element of the list can be a cons cell instead of just a string. Then the car should be a buffer name, and the cdr specifies frame parameters for creating the frame for that buffer. More precisely, the cdr is passed as the second argument to the function found in `special-display-function', when making that frame. See also `special-display-regexps'." :type '(repeat (choice :value "" (string :tag "Name") (cons :menu-tag "Properties" :value ("" . nil) (string :tag "Name") (repeat :tag "Properties" (group :inline t (symbol :tag "Property") (sexp :tag "Value")))))) :group 'frames) (defcustom special-display-regexps nil "*List of regexps saying which buffers should have their own special frames. If a buffer name matches one of these regexps, it gets its own frame. Displaying a buffer whose name is in this list makes a special frame for it using `special-display-function'. An element of the list can be a cons cell instead of just a string. Then the car should be the regexp, and the cdr specifies frame parameters for creating the frame for buffers that match. More precisely, the cdr is passed as the second argument to the function found in `special-display-function', when making that frame. See also `special-display-buffer-names'." :type '(repeat (choice :value "" regexp (cons :menu-tag "Properties" :value ("" . nil) regexp (repeat :tag "Properties" (group :inline t (symbol :tag "Property") (sexp :tag "Value")))))) :group 'frames) (defvar special-display-function nil "Function to call to make a new frame for a special buffer. It is called with two arguments, the buffer and optional buffer specific data, and should return a window displaying that buffer. The default value makes a separate frame for the buffer, using `special-display-frame-alist' to specify the frame parameters. A buffer is special if its is listed in `special-display-buffer-names' or matches a regexp in `special-display-regexps'.") (defcustom same-window-buffer-names nil "*List of buffer names that should appear in the selected window. Displaying one of these buffers using `display-buffer' or `pop-to-buffer' switches to it in the selected window, rather than making it appear in some other window. An element of the list can be a cons cell instead of just a string. Then the car must be a string, which specifies the buffer name. This is for compatibility with `special-display-buffer-names'; the cdr of the cons cell is ignored. See also `same-window-regexps'." :type '(repeat (string :tag "Name")) :group 'windows) (defcustom same-window-regexps nil "*List of regexps saying which buffers should appear in the selected window. If a buffer name matches one of these regexps, then displaying it using `display-buffer' or `pop-to-buffer' switches to it in the selected window, rather than making it appear in some other window. An element of the list can be a cons cell instead of just a string. Then the car must be a string, which specifies the buffer name. This is for compatibility with `special-display-buffer-names'; the cdr of the cons cell is ignored. See also `same-window-buffer-names'." :type '(repeat regexp) :group 'windows) (defcustom pop-up-windows t "*Non-nil means display-buffer should make new windows." :type 'boolean :group 'windows) (defcustom split-height-threshold 500 "*display-buffer would prefer to split the largest window if this large. If there is only one window, it is split regardless of this value." :type 'integer :group 'windows) (defcustom split-width-threshold 500 "*display-buffer would prefer to split the largest window if this large. If there is only one window, it is split regardless of this value." :type 'integer :group 'windows) ;; Deiconify the frame containing the window WINDOW, then return WINDOW. (defun display-buffer-1 (window) (if (frame-iconified-p (window-frame window)) (make-frame-visible (window-frame window))) window) ;; Can you believe that all of this crap was formerly in C? ;; Praise Jesus that it's not there any more. (defun display-buffer (buffer &optional not-this-window-p override-frame shrink-to-fit) "Make BUFFER appear in some window on the current frame, but don't select it. BUFFER can be a buffer or a buffer name. If BUFFER is shown already in some window in the current frame, just uses that one, unless the window is the selected window and NOT-THIS-WINDOW-P is non-nil (interactively, with prefix arg). If BUFFER has a dedicated frame, display on that frame instead of the current frame, unless OVERRIDE-FRAME is non-nil. If OVERRIDE-FRAME is non-nil, display on that frame instead of the current frame (or the dedicated frame). If SHRINK-TO-FIT is non-nil and splitting the window is appropriate, give the new buffer less than half the space if it is small enough to fit. If `pop-up-windows' is non-nil, always use the current frame and create a new window regardless of whether the buffer has a dedicated frame, and regardless of whether OVERRIDE-FRAME was specified. If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER. If the buffer name is a member of the `same-window-buffer-names' list, or matches one of the `same-window-regexps' expressions, display the buffer in the currently selected window. Returns the window displaying BUFFER." (interactive "BDisplay buffer:\nP") (let ((wconfig (current-window-configuration)) (result ;; We just simulate a `return' in C. This function is way ugly ;; and does `returns' all over the place and there's no sense ;; in trying to rewrite it to be more Lispy. (catch 'done (let (window old-frame target-frame explicit-frame shrink-it) (setq old-frame (or (last-nonminibuf-frame) (selected-frame))) (setq buffer (get-buffer buffer)) (check-argument-type 'bufferp buffer) (setq explicit-frame (if pre-display-buffer-function (funcall pre-display-buffer-function buffer not-this-window-p override-frame shrink-to-fit))) ;; Give the user the ability to completely reimplement ;; this function via the `display-buffer-function'. (if display-buffer-function (throw 'done (funcall display-buffer-function buffer not-this-window-p override-frame shrink-to-fit))) ;; If the buffer has a dedicated frame, that takes ;; precedence over the current frame, and over what the ;; pre-display-buffer-function did. (let ((dedi (buffer-dedicated-frame buffer))) (if (frame-live-p dedi) (setq explicit-frame dedi))) ;; if override-frame is supplied, that takes precedence over ;; everything. This is gonna look bad if the ;; pre-display-buffer-function raised some other frame ;; already. (if override-frame (progn (check-argument-type 'frame-live-p override-frame) (setq explicit-frame override-frame))) (setq target-frame (or explicit-frame (last-nonminibuf-frame) (selected-frame))) ;; If we have switched frames, then set not-this-window-p ;; to false. Switching frames means that selected-window ;; is no longer the same as it was on entry -- it's the ;; selected-window of target_frame instead of old_frame, ;; so it's a fine candidate for display. (if (not (eq old-frame target-frame)) (setq not-this-window-p nil)) ;; if it's in the selected window, and that's ok, then we're done. (if (and (not not-this-window-p) (eq buffer (window-buffer (selected-window)))) (throw 'done (display-buffer-1 (selected-window)))) ;; See if the user has specified this buffer should appear ;; in the selected window. (if not-this-window-p nil (if (or (member (buffer-name buffer) same-window-buffer-names) (assoc (buffer-name buffer) same-window-buffer-names)) (progn (switch-to-buffer buffer) (throw 'done (display-buffer-1 (selected-window))))) (let ((tem same-window-regexps)) (while tem (let ((car (car tem))) (if (or (and (stringp car) (string-match car (buffer-name buffer))) (and (consp car) (stringp (car car)) (string-match (car car) (buffer-name buffer)))) (progn (switch-to-buffer buffer) (throw 'done (display-buffer-1 (selected-window)))))) (setq tem (cdr tem))))) ;; If pop-up-frames, look for a window showing BUFFER on ;; any visible or iconified frame. Otherwise search only ;; the current frame. (if (and (not explicit-frame) (or pop-up-frames (not (last-nonminibuf-frame)))) (setq target-frame 0)) ;; Otherwise, find some window that it's already in, and ;; return that, unless that window is the selected window ;; and that isn't ok. What a contorted mess! (setq window (or (if (not explicit-frame) ;; search the selected frame ;; first if the user didn't ;; specify an explicit frame. (get-buffer-window buffer nil)) (get-buffer-window buffer target-frame))) (if (and window (or (not not-this-window-p) (not (eq window (selected-window))))) (throw 'done (display-buffer-1 window))) ;; Certain buffer names get special handling. (if special-display-function (progn (if (member (buffer-name buffer) special-display-buffer-names) (throw 'done (funcall special-display-function buffer))) (let ((tem (assoc (buffer-name buffer) special-display-buffer-names))) (if tem (throw 'done (funcall special-display-function buffer (cdr tem))))) (let ((tem special-display-regexps)) (while tem (let ((car (car tem))) (if (and (stringp car) (string-match car (buffer-name buffer))) (throw 'done (funcall special-display-function buffer))) (if (and (consp car) (stringp (car car)) (string-match (car car) (buffer-name buffer))) (throw 'done (funcall special-display-function buffer (cdr car))))) (setq tem (cdr tem)))))) ;; If there are no frames open that have more than a minibuffer, ;; we need to create a new frame. (if (or pop-up-frames (null (last-nonminibuf-frame))) (progn (setq window (frame-selected-window (funcall pop-up-frame-function))) (set-window-buffer window buffer) (throw 'done (display-buffer-1 window)))) ;; Otherwise, make it be in some window, splitting if ;; appropriate/possible. Do not split a window if we are ;; displaying the buffer in a different frame than that which ;; was current when we were called. (It is already in a ;; different window by virtue of being in another frame.) (if (or (and pop-up-windows (eq target-frame old-frame)) (eq 'only (frame-property (selected-frame) 'minibuffer)) ;; If the current frame is a special display frame, ;; don't try to reuse its windows. (window-dedicated-p (frame-root-window (selected-frame)))) (progn (if (eq 'only (frame-property (selected-frame) 'minibuffer)) (setq target-frame (last-nonminibuf-frame))) ;; Don't try to create a window if would get an error with ;; height. (if (< split-height-threshold (* 2 window-min-height)) (setq split-height-threshold (* 2 window-min-height))) ;; Same with width. (if (< split-width-threshold (* 2 window-min-width)) (setq split-width-threshold (* 2 window-min-width))) ;; If the frame we would try to split cannot be split, ;; try other frames. (if (frame-property (if (null target-frame) (selected-frame) (last-nonminibuf-frame)) 'unsplittable) (setq window ;; Try visible frames first. (or (get-largest-window 'visible) ;; If that didn't work, try iconified frames. (get-largest-window 0) (get-largest-window t))) (setq window (get-largest-window target-frame))) ;; If we got a tall enough full-width window that ;; can be split, split it. (if (and window (not (frame-property (window-frame window) 'unsplittable)) (>= (window-height window) split-height-threshold) (or (>= (window-width window) split-width-threshold) (and (window-leftmost-p window) (window-rightmost-p window)))) (setq window (split-window window)) (let (upper other) (setq window (get-lru-window target-frame)) ;; If the LRU window is selected, and big enough, ;; and can be split, split it. (if (and window (not (frame-property (window-frame window) 'unsplittable)) (or (eq window (selected-window)) (not (window-parent window))) (>= (window-height window) (* 2 window-min-height))) (setq window (split-window window))) ;; If get-lru-window returned nil, try other approaches. ;; Try visible frames first. (or window (setq window (or (get-largest-window 'visible) ;; If that didn't work, try ;; iconified frames. (get-largest-window 0) ;; Try invisible frames. (get-largest-window t) ;; As a last resort, make ;; a new frame. (frame-selected-window (funcall pop-up-frame-function))))) ;; If window appears above or below another, ;; even out their heights. (if (window-previous-child window) (setq other (window-previous-child window) upper other)) (if (window-next-child window) (setq other (window-next-child window) upper window)) ;; Check that OTHER and WINDOW are vertically arrayed. (if (and other (not (= (nth 1 (window-pixel-edges other)) (nth 1 (window-pixel-edges window)))) (> (window-pixel-height other) (window-pixel-height window))) (enlarge-window (- (/ (+ (window-height other) (window-height window)) 2) (window-height upper)) nil upper)) ;; Klaus Berndl <klaus.berndl@sdm.de>: Only in ;; this situation we shrink-to-fit but we can do ;; this first after we have displayed buffer in ;; window (s.b. (set-window-buffer window buffer)) (setq shrink-it shrink-to-fit)))) (setq window (get-lru-window target-frame))) ;; Bring the window's previous buffer to the top of the MRU chain. (if (window-buffer window) (save-excursion (save-selected-window (select-window window) (record-buffer (window-buffer window))))) (set-window-buffer window buffer) ;; Now window's previous buffer has been brought to the top ;; of the MRU chain and window displays buffer - now we can ;; shrink-to-fit if necessary (if shrink-it (shrink-window-if-larger-than-buffer window)) (display-buffer-1 window))))) (or (equal wconfig (current-window-configuration)) (push-window-configuration wconfig)) result)) ;;; window-xemacs.el ends here