Mercurial > hg > xemacs-beta
view lisp/modeline.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 | 943eaba38521 |
children | b325de44db27 |
line wrap: on
line source
;;; modeline.el --- modeline hackery. ;; Copyright (C) 1988, 1992-1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 2002 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: 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 in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; General mouse modeline stuff ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defgroup modeline nil "Modeline customizations." :group 'environment) (defcustom modeline-3d-p ;; added for the options menu (let ((thickness (specifier-instance modeline-shadow-thickness))) (and (integerp thickness) (> thickness 0))) "Whether the default toolbar is globally visible. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type 'boolean :set #'(lambda (var val) (if val (set-specifier modeline-shadow-thickness 2) (set-specifier modeline-shadow-thickness 0)) (redraw-modeline t) (setq modeline-3d-p val)) ) (defcustom drag-divider-event-lag 150 "*The pause (in msecs) between divider drag events before redisplaying. If this value is too small, dragging will be choppy because redisplay cannot keep up. If it is too large, dragging will be choppy because of the explicit redisplay delay specified." :type 'integer ;; #### Fix group. :group 'modeline) (define-obsolete-variable-alias 'drag-modeline-event-lag 'drag-divider-event-lag) (defcustom modeline-click-swaps-buffers nil "*If non-nil, clicking on the modeline changes the current buffer. Click on the left half of the modeline cycles forward through the buffer list and clicking on the right half cycles backward." :type 'boolean :group 'modeline) (defcustom modeline-scrolling-method nil "*If non-nil, dragging the modeline with the mouse may also scroll its text horizontally (vertical motion controls window resizing and horizontal motion controls modeline scrolling). With a value of t, the modeline text is scrolled in the same direction as the mouse motion. With a value of 'scrollbar, the modeline is considered as a scrollbar for its own text, which then moves in the opposite direction. This option should be set using `customize-set-variable'." :type '(choice (const :tag "none" nil) (const :tag "text" t) (const :tag "scrollbar" scrollbar)) :set (lambda (sym val) (set-default sym val) (when (featurep 'x) (cond ((eq val t) (set-glyph-image modeline-pointer-glyph "hand2" 'global 'x)) ((eq val 'scrollbar) (set-glyph-image modeline-pointer-glyph "fleur" 'global 'x)) (t (set-glyph-image modeline-pointer-glyph "sb_v_double_arrow" 'global 'x)))) (when (featurep 'mswindows) (cond ((eq val t) (set-glyph-image modeline-pointer-glyph [mswindows-resource :resource-type cursor :resource-id "SizeAll"] 'global 'mswindows)) ((eq val 'scrollbar) (set-glyph-image modeline-pointer-glyph [mswindows-resource :resource-type cursor :resource-id "Normal"] 'global 'mswindows)) (t (set-glyph-image modeline-pointer-glyph [mswindows-resource :resource-type cursor :resource-id "SizeNS"] 'global 'mswindows))))) :group 'modeline) (defun mouse-drag-modeline (event) "Resize a window by dragging its modeline. This command should be bound to a button-press event in modeline-map. Holding down a mouse button and moving the mouse up and down will make the clicked-on window taller or shorter. See also the variable `modeline-scrolling-method'." (interactive "e") (or (button-press-event-p event) (error "%s must be invoked by a mouse-press" this-command)) (or (event-over-modeline-p event) (error "not over a modeline")) ;; Give the modeline a "pressed" look. --hniksic (let-specifier ((modeline-shadow-thickness (- (specifier-instance modeline-shadow-thickness (event-window event))) (event-window event))) (let ((done nil) (depress-line (event-y event)) (start-event-frame (event-frame event)) (start-event-window (event-window event)) (start-nwindows (count-windows t)) (hscroll-delta (face-width 'modeline)) (start-hscroll (modeline-hscroll (event-window event))) (start-x-pixel (event-x-pixel event)) (last-timestamp 0) default-line-height modeline-height should-enlarge-minibuffer event min-height minibuffer y top bot edges wconfig growth) (setq minibuffer (minibuffer-window start-event-frame) default-line-height (face-height 'default start-event-window) min-height (+ (* window-min-height default-line-height) ;; Don't let the window shrink by a ;; non-multiple of the default line ;; height. (enlarge-window -1) will do ;; this if the difference between the ;; current window height and the minimum ;; window height is less than the height ;; of the default font. These extra ;; lost pixels of height don't come back ;; if you grow the window again. This ;; can make it impossible to drag back ;; to the exact original size, which is ;; disconcerting. (% (window-pixel-height start-event-window) default-line-height)) modeline-height (if (specifier-instance has-modeline-p start-event-window) (+ (face-height 'modeline start-event-window) (* 2 (specifier-instance modeline-shadow-thickness start-event-window))) (* 2 (specifier-instance modeline-shadow-thickness start-event-window)))) (if (not (eq (window-frame minibuffer) start-event-frame)) (setq minibuffer nil)) (if (and (null minibuffer) (one-window-p t)) (error "Attempt to resize sole window")) ;; if this is the bottommost ordinary window, then to ;; move its modeline the minibuffer must be enlarged. (setq should-enlarge-minibuffer (and minibuffer (window-lowest-p start-event-window))) ;; loop reading events (while (not done) (setq event (next-event event)) ;; requeue event and quit if this is a misc-user, eval or ;; keypress event. ;; quit if this is a button press or release event, or if the event ;; occurred in some other frame. ;; drag if this is a mouse motion event and the time ;; between this event and the last event is greater than ;; drag-divider-event-lag. ;; do nothing if this is any other kind of event. (cond ((or (misc-user-event-p event) (key-press-event-p event)) (setq unread-command-events (nconc unread-command-events (list event)) done t)) ((button-release-event-p event) (setq done t) ;; Consider we have a mouse click neither X pos (modeline ;; scroll) nore Y pos (modeline drag) have changed. (and modeline-click-swaps-buffers (= depress-line (event-y event)) (or (not modeline-scrolling-method) (= start-hscroll (modeline-hscroll start-event-window))) (modeline-swap-buffers event))) ((button-event-p event) (setq done t)) ((not (motion-event-p event)) (dispatch-event event)) ((not (eq start-event-frame (event-frame event))) (setq done t)) ((< (abs (- (event-timestamp event) last-timestamp)) drag-divider-event-lag) nil) (t (when modeline-scrolling-method (let ((delta (/ (- (event-x-pixel event) start-x-pixel) hscroll-delta))) (set-modeline-hscroll start-event-window (if (eq modeline-scrolling-method t) (- start-hscroll delta) (+ start-hscroll delta))) )) (setq last-timestamp (event-timestamp event) y (event-y-pixel event) edges (window-pixel-edges start-event-window) top (nth 1 edges) bot (nth 3 edges)) ;; scale back a move that would make the ;; window too short. (cond ((< (- y top (- modeline-height)) min-height) (setq y (+ top min-height (- modeline-height))))) ;; compute size change needed (setq growth (- y bot (/ (- modeline-height) 2)) wconfig (current-window-configuration)) ;; grow/shrink minibuffer? (if should-enlarge-minibuffer (progn ;; yes. scale back shrinkage if it ;; would make the minibuffer less than 1 ;; line tall. ;; ;; also flip the sign of the computed growth, ;; since if we want to grow the window with the ;; modeline we need to shrink the minibuffer ;; and vice versa. (if (and (> growth 0) (< (- (window-pixel-height minibuffer) growth) default-line-height)) (setq growth (- (window-pixel-height minibuffer) default-line-height))) (setq growth (- growth)))) ;; window grow and shrink by lines not pixels, so ;; divide the pixel height by the height of the ;; default face. (setq growth (/ growth default-line-height)) ;; grow/shrink the window (enlarge-window growth nil (if should-enlarge-minibuffer minibuffer start-event-window)) ;; if this window's growth caused another ;; window to be deleted because it was too ;; short, rescind the change. ;; ;; if size change caused space to be stolen ;; from a window above this one, rescind the ;; change, but only if we didn't grow/shrink ;; the minibuffer. minibuffer size changes ;; can cause all windows to shrink... no way ;; around it. (if (or (/= start-nwindows (count-windows t)) (and (not should-enlarge-minibuffer) (/= top (nth 1 (window-pixel-edges start-event-window))))) (set-window-configuration wconfig)))))))) ;; from Bob Weiner (bob_weiner@pts.mot.com) ;; Whether this function should be called is now decided in ;; mouse-drag-modeline - dverna feb. 98 (defun modeline-swap-buffers (event) "Handle mouse clicks on modeline by switching buffers. If click on left half of a frame's modeline, bury current buffer. If click on right half of a frame's modeline, raise bottommost buffer. Arg EVENT is the button release event that occurred on the modeline." (or (event-over-modeline-p event) (error "not over a modeline")) (or (button-release-event-p event) (error "not a button release event")) (if (< (event-x event) (/ (window-width (event-window event)) 2)) ;; On left half of modeline, bury current buffer, ;; displaying second buffer on list. (mouse-bury-buffer event) ;; On right half of modeline, raise and display bottommost ;; buffer in buffer list. (mouse-unbury-buffer event))) (defconst modeline-menu '("Window Commands" ["Delete Window Above" delete-window t] ["Delete Other Windows" delete-other-windows t] ["Split Window Above" split-window-vertically t] ["Split Window Horizontally" split-window-horizontally t] ["Balance Windows" balance-windows t] )) (defun modeline-menu (event) (interactive "e") (popup-menu-and-execute-in-window (cons (format "Window Commands for %S:" (buffer-name (event-buffer event))) (cdr modeline-menu)) event)) (defvar modeline-map (make-sparse-keymap 'modeline-map) "Keymap consulted for mouse-clicks on the modeline of a window. This variable may be buffer-local; its value will be looked up in the buffer of the window whose modeline was clicked upon.") (define-key modeline-map 'button1 'mouse-drag-modeline) ;; button2 selects the window without setting point (define-key modeline-map 'button2 (lambda () (interactive "@"))) (define-key modeline-map 'button3 'modeline-menu) (make-face 'modeline-mousable "Face for mousable portions of the modeline.") (set-face-parent 'modeline-mousable 'modeline nil '(default)) (when (featurep 'window-system) (set-face-foreground 'modeline-mousable "firebrick" nil '(default color win)) (set-face-font 'modeline-mousable [bold] nil '(default mono win)) (set-face-font 'modeline-mousable [bold] nil '(default grayscale win))) (defmacro make-modeline-command-wrapper (command) `#'(lambda (event) (interactive "e") (save-selected-window (select-window (event-window event)) (call-interactively ',(eval command))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Minor modes ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defvar minor-mode-alist nil "Alist saying how to show minor modes in the modeline. Each element looks like (VARIABLE STRING); STRING is included in the modeline iff VARIABLE's value is non-nil. Actually, STRING need not be a string; any possible modeline element is okay. See `modeline-format'.") ;; Used by C code (lookup-key and friends) but defined here. (defvar minor-mode-map-alist nil "Alist of keymaps to use for minor modes. Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read key sequences and look up bindings iff VARIABLE's value is non-nil. If two active keymaps bind the same key, the keymap appearing earlier in the list takes precedence.") (make-face 'modeline-mousable-minor-mode "Face for mousable minor-mode strings in the modeline.") (set-face-parent 'modeline-mousable-minor-mode 'modeline-mousable nil '(default)) (when (featurep 'window-system) (set-face-foreground 'modeline-mousable-minor-mode '("green4" "forestgreen") nil '(default color win))) (defvar modeline-mousable-minor-mode-extent (make-extent nil nil) ;; alliteration at its finest. "Extent managing the mousable minor mode modeline strings.") (set-extent-face modeline-mousable-minor-mode-extent 'modeline-mousable-minor-mode) ;; This replaces the idiom ;; ;; (or (assq 'isearch-mode minor-mode-alist) ;; (setq minor-mode-alist ;; (purecopy ;; (append minor-mode-alist ;; '((isearch-mode isearch-mode)))))) (defun add-minor-mode (toggle name &optional keymap after toggle-fun) "Add a minor mode to `minor-mode-alist' and `minor-mode-map-alist'. TOGGLE is a symbol whose value as a variable specifies whether the minor mode is active. NAME is the name that should appear in the modeline. It should either be a string beginning with a space, or a symbol with a similar string as its value. KEYMAP is a keymap to make active when the minor mode is active. AFTER is the toggling symbol used for another minor mode. If AFTER is non-nil, then it is used to position the new mode in the minor-mode alists. TOGGLE-FUN specifies an interactive function that is called to toggle the mode on and off; this affects what happens when button2 is pressed on the mode, and when button3 is pressed somewhere in the list of modes. If TOGGLE-FUN is nil and TOGGLE names an interactive function, TOGGLE is used as the toggle function. Example: (add-minor-mode 'view-minor-mode \" View\" view-mode-map)" (let* ((add-elt #'(lambda (elt sym) (let (place) (cond ((null after) ; add to front (push elt (symbol-value sym))) ((and (not (eq after t)) (setq place (memq (assq after (symbol-value sym)) (symbol-value sym)))) (push elt (cdr place))) (t (set sym (append (symbol-value sym) (list elt)))))) (symbol-value sym))) el toggle-keymap) (if toggle-fun (check-argument-type 'commandp toggle-fun) (when (commandp toggle) (setq toggle-fun toggle))) (when (and toggle-fun name) (setq toggle-keymap (make-sparse-keymap (intern (concat "modeline-minor-" (symbol-name toggle) "-map")))) (define-key toggle-keymap 'button2 ;; defeat the DUMB-ASS byte-compiler, which tries to ;; expand the macro at compile time and fucks up. (eval '(make-modeline-command-wrapper toggle-fun))) (put toggle 'modeline-toggle-function toggle-fun)) (when name (let ((hacked-name (if toggle-keymap (cons (let ((extent (make-extent nil nil))) (set-extent-keymap extent toggle-keymap) (set-extent-property extent 'help-echo (concat "button2 turns off " (if (symbolp toggle-fun) (symbol-name toggle-fun) (symbol-name toggle)))) extent) (cons modeline-mousable-minor-mode-extent name)) name))) (if (setq el (assq toggle minor-mode-alist)) (setcdr el (list hacked-name)) (funcall add-elt (list toggle hacked-name) 'minor-mode-alist)))) (when keymap (if (setq el (assq toggle minor-mode-map-alist)) (setcdr el keymap) (funcall add-elt (cons toggle keymap) 'minor-mode-map-alist))))) (defcustom abbrev-mode-line-string " Abbrev" "*String to display in the modeline when `abbrev-mode' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'abbrev-mode) (defcustom overwrite-mode-line-string " Ovwrt" "*String to display in the modeline when `overwrite-mode' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'editing-basics) (defcustom auto-fill-mode-line-string " Fill" "*String to display in the modeline when `auto-fill-mode' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'fill) (defcustom defining-kbd-macro-mode-line-string " Def" "*String to display in the modeline when `defining-kbd-macro' is active. Set this to nil if you don't want a modeline indicator." :type '(choice string (const :tag "none" nil)) :group 'keyboard) ;; #### TODO: Add `:menu-tag' keyword to add-minor-mode. Or create a ;; separate function to manage the minor mode menu. ;(put 'abbrev-mode :menu-tag "Abbreviation Expansion") (add-minor-mode 'abbrev-mode 'abbrev-mode-line-string) ;; only when visiting a file... (add-minor-mode 'overwrite-mode 'overwrite-mode-line-string) ;(put 'auto-fill-function :menu-tag "Auto Fill") (add-minor-mode 'auto-fill-function 'auto-fill-mode-line-string nil nil 'auto-fill-mode) ;(put 'defining-kbd-macro :menu-tag "Keyboard Macro") (add-minor-mode 'defining-kbd-macro 'defining-kbd-macro-mode-line-string nil nil (lambda () (interactive) (if defining-kbd-macro (progn ;; #### This means to disregard the last event. ;; It is needed because the last recorded ;; event is usually the mouse event that ;; invoked the menu item (and this function), ;; and having it in the macro causes problems. (zap-last-kbd-macro-event) (end-kbd-macro nil)) (start-kbd-macro nil)))) (defun modeline-minor-mode-menu (event) "The menu that pops up when you press `button3' inside the parentheses on the modeline." (interactive "e") (save-excursion (set-buffer (event-buffer event)) (popup-menu-and-execute-in-window (cons "Minor Mode Toggles" (sort (delq nil (mapcar #'(lambda (x) (let* ((toggle-sym (car x)) (toggle-fun (or (get toggle-sym 'modeline-toggle-function) (and (commandp toggle-sym) toggle-sym))) (menu-tag (symbol-name (if (symbolp toggle-fun) toggle-fun toggle-sym)) ;; Here a function should ;; maybe be invoked to ;; beautify the symbol's ;; menu appearance. )) (and toggle-fun (vector menu-tag toggle-fun ;; The following two are wrong ;; because of possible name ;; clashes. ;:active (get toggle-sym :active t) ;:included (get toggle-sym :included t) :style 'toggle :selected (and (boundp toggle-sym) toggle-sym))))) minor-mode-alist)) (lambda (e1 e2) (string< (aref e1 0) (aref e2 0))))) event))) (defvar modeline-minor-mode-map (make-sparse-keymap 'modeline-minor-mode-map) "Keymap consulted for mouse-clicks on the minor-mode modeline list.") (define-key modeline-minor-mode-map 'button3 'modeline-minor-mode-menu) (defvar modeline-minor-mode-extent (make-extent nil nil) "Extent covering the minor mode modeline strings.") (set-extent-face modeline-minor-mode-extent 'modeline-mousable) (set-extent-keymap modeline-minor-mode-extent modeline-minor-mode-map) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Modeline definition ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defmacro define-modeline-control (name contents doc-string &optional face help-echo) "Define a modeline control named NAME, a symbol. A modeline control is a section of the modeline whose contents can easily be changed independently of the rest of the modeline, which can have its own color, and which can have its own mouse commands, which apply when the mouse is over the control. Logically, a modeline control should be an object; but we have terrible object support in XEmacs, and so history has given us a series of related variables, which [hopefully] all follow the same conventions. Three variables are created: 1. The variable holding the control specification is called `modeline-NAME', and is automatically buffer-local. 2. The variable holding the extent that covers the control area in the modeline is called `modeline-NAME-extent'. Onto this extent, colors and keymaps (and possibly glyphs?) can be added, and will be noticed by the modeline redisplay code. The attachment of the extent and its control is done somewhere in the modeline specification: either in the main spec in `modeline-format', or in some other control, like this: (cons modeline-NAME-extent 'modeline-NAME) 3. The keymap holding the mousable commands for the control is called `modeline-NAME-map'. This is automatically attached to the extent by this macro. Initial contents of the control are CONTENTS (see `modeline-format' for information about the structure of this contents). DOC-STRING specifies help text that will be placed in the control variable's documentation, indicating what's supposed to be in the control. Optional argument FACE specifies the face of the control's extent. (`modeline-mousable' is a good choice if your control is, in fact, mousable (i.e. it has some mouse commands defined for it). Optional argument HELP-ECHO specifies some help-echo to be displayed when the mouse moves over the control, indicating what mouse strokes are available. " (let ((control-var (intern (format "modeline-%s" name))) (extent-var (intern (format "modeline-%s-extent" name))) (map-var (intern (format "modeline-%s-map" name))) ) `(progn (defconst ,control-var ,contents ,(format "%s The format of the contents of this variable is documented in `modeline-format'. The way the control is displayed can be changed by setting the face of `%s'. Mouse commands for the control can be set using `%s'." doc-string extent-var map-var)) (make-variable-buffer-local ',control-var) (defvar ,extent-var (make-extent nil nil) ,(format "Extent covering the `%s' control." control-var)) (defvar ,map-var (make-sparse-keymap 'modeline-narrowed-map) ,(format "Keymap consulted for mouse-clicks on the `%s' control." control-var)) (set-extent-face ,extent-var ,face) (set-extent-keymap ,extent-var ,map-var) (set-extent-property ,extent-var 'help-echo ,help-echo)))) (put 'define-modeline-control 'lisp-indent-function 2) ;; ------------------------ modeline buffer id ------------------- (defun modeline-buffers-menu (event) (interactive "e") (popup-menu-and-execute-in-window '("Buffers Popup Menu" :filter buffers-menu-filter ["List All Buffers" list-buffers t] "--" ) event)) (define-modeline-control buffer-id-left 'modeline-modified-buffer-highlighted-name ;; "XEmacs:" "Modeline control for left half of buffer ID." 'modeline-mousable "button2 cycles to the previous buffer") (define-modeline-control buffer-id-right 'modeline-modified-buffer-non-highlighted-name ;; " %17b" "Modeline control for right half of buffer ID." nil "button2 cycles to the next buffer") (define-key modeline-buffer-id-left-map 'button2 'mouse-unbury-buffer) (define-key modeline-buffer-id-right-map 'button2 'mouse-bury-buffer) (define-key modeline-buffer-id-left-map 'button3 'modeline-buffers-menu) (define-key modeline-buffer-id-right-map 'button3 'modeline-buffers-menu) (make-face 'modeline-buffer-id "Face for the buffer ID string in the modeline.") (set-face-parent 'modeline-buffer-id 'modeline nil '(default)) (when (featurep 'window-system) (set-face-foreground 'modeline-buffer-id "blue4" nil '(default color win)) (set-face-font 'modeline-buffer-id [bold-italic] nil '(default mono win)) (set-face-font 'modeline-buffer-id [bold-italic] nil '(default grayscale win))) (when (featurep 'tty) (set-face-font 'modeline-buffer-id [bold-italic] nil '(default tty))) (define-modeline-control buffer-id (list (cons modeline-buffer-id-left-extent 'modeline-buffer-id-left) (cons modeline-buffer-id-right-extent 'modeline-buffer-id-right)) "Modeline control for identifying the buffer being displayed. Its default value is (list (cons modeline-buffer-id-left-extent 'modeline-buffer-id-left) (cons modeline-buffer-id-right-extent 'modeline-buffer-id-right)) Major modes that edit things other than ordinary files may change this (e.g. Info, Dired,...)." 'modeline-buffer-id) (defvaralias 'modeline-buffer-identification 'modeline-buffer-id) (defvar modeline-modified-buffer-non-highlighted-name nil) (make-variable-buffer-local 'modeline-modified-buffer-non-highlighted-name) (put 'modeline-modified-buffer-non-highlighted-name 'permanent-local t) (defvar modeline-modified-buffer-highlighted-name nil) (make-variable-buffer-local 'modeline-modified-buffer-highlighted-name) (put 'modeline-modified-buffer-highlighted-name 'permanent-local t) (defvar modeline-recorded-buffer-name nil) (make-variable-buffer-local 'modeline-recorded-buffer-name) (put 'modeline-recorded-buffer-name 'permanent-local t) (defvar modeline-recorded-buffer-file-name nil) (make-variable-buffer-local 'modeline-recorded-buffer-file-name) (put 'modeline-recorded-buffer-file-name 'permanent-local t) (add-hook 'buffer-list-changed-hook 'modeline-update-buffer-names) (defvar modeline-max-buffer-name-size 30) (defun modeline-update-buffer-names (frame) (mapc #'(lambda (buf) (when (or (not (eq (buffer-name buf) (symbol-value-in-buffer 'modeline-recorded-buffer-name buf))) (not (eq (buffer-file-name buf) (symbol-value-in-buffer 'modeline-recorded-buffer-file-name buf)))) ;(dp "processing %s" buf) (with-current-buffer buf (setq modeline-recorded-buffer-name (buffer-name)) (setq modeline-recorded-buffer-file-name (buffer-file-name)) (if (not modeline-recorded-buffer-file-name) (setq modeline-modified-buffer-non-highlighted-name modeline-recorded-buffer-name modeline-modified-buffer-highlighted-name nil) (let ((fn (if (<= (length modeline-recorded-buffer-file-name) modeline-max-buffer-name-size) modeline-recorded-buffer-file-name (concat "..." (substring modeline-recorded-buffer-file-name (- modeline-max-buffer-name-size)))))) (setq modeline-modified-buffer-non-highlighted-name ;; if the filename is very long, the entire ;; directory will get truncated to ;; non-existence. (let ((dir (file-name-directory fn))) (if dir (concat " (" (directory-file-name (file-name-directory fn)) ")") "")) modeline-modified-buffer-highlighted-name (file-name-nondirectory fn)))) (redraw-modeline)))) (buffer-list))) (defcustom modeline-new-buffer-id-format t "Whether the new format for the modeline buffer ID (with directory) is used. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'modeline :type 'boolean :set #'(lambda (var val) (if val (progn (setq-default modeline-buffer-id-left 'modeline-modified-buffer-highlighted-name modeline-buffer-id-right 'modeline-modified-buffer-non-highlighted-name) (set-extent-face modeline-buffer-id-left-extent 'modeline-mousable)) (setq-default modeline-buffer-id-left "XEmacs:" modeline-buffer-id-right '(" %17b")) (set-extent-face modeline-buffer-id-left-extent nil)))) ;; ------------------------ other modeline controls ------------------- ;; These are for the sake of minor mode menu. #### All of this is ;; kind of dirty. `add-minor-mode' started out as a simple substitute ;; for (or (assq ...) ...) FSF stuff, but now is used for all kind of ;; stuff. There should perhaps be a separate function to add toggles ;; to the minor-mode-menu. (add-minor-mode 'line-number-mode "") (add-minor-mode 'column-number-mode "") (define-modeline-control coding-system '("%C") "Modeline control for showing current coding system.") ;; added March 7, 2002 (define-obsolete-variable-alias 'modeline-multibyte-status 'modeline-coding-system) (define-modeline-control modified '("--%1*%1+-") "Modeline control for displaying whether current buffer is modified." 'modeline-mousable "button2 toggles the buffer's read-only status") (define-key modeline-modified-map 'button2 (make-modeline-command-wrapper 'modeline-toggle-read-only)) ;;; Added for XEmacs 20.3. Provide wrapper for vc since it may not always be ;;; present, and its symbols are not visible this early in the dump if it ;;; is. (defun modeline-toggle-read-only () "Change whether this buffer is visiting its file read-only. With arg, set read-only iff arg is positive. This function is designed to be called when the read-only indicator on the modeline is clicked. It will call `vc-toggle-read-only' if available, otherwise it will call the usual `toggle-read-only'." (interactive) (if-fboundp 'vc-toggle-read-only (vc-toggle-read-only) (toggle-read-only))) (define-modeline-control line-number (list 'line-number-mode "L%l ") "Modeline control for displaying the line number of point.") (define-modeline-control column-number (list 'column-number-mode "C%c ") "Modeline control for displaying the column number of point.") (define-modeline-control percentage (cons -3 "%p") "Modeline control for displaying percentage of file above point.") (define-modeline-control position-status (cons 15 (list (cons modeline-line-number-extent 'modeline-line-number) (cons modeline-column-number-extent 'modeline-column-number) (cons modeline-percentage-extent 'modeline-percentage))) "Modeline control for providing status about the location of point. Generally includes the line number of point, its column number, and the percentage of the file above point." 'modeline-buffer-id) (defconst modeline-tty-frame-specifier (make-specifier 'boolean)) (add-hook 'create-frame-hook 'modeline-update-tty-frame-specifier) (defun modeline-update-tty-frame-specifier (f) (if-fboundp 'frame-tty-p (if (and (frame-tty-p f) (> (frame-property f 'frame-number) 1)) (set-specifier modeline-tty-frame-specifier t f)))) (define-modeline-control tty-frame-id (list modeline-tty-frame-specifier " [%S]" ) "Modeline control for showing which TTY frame is selected.") (define-modeline-control narrowed '("%n") "Modeline control for displaying whether current buffer is narrowed." 'modeline-mousable "button2 widens the buffer") (define-key modeline-narrowed-map 'button2 (make-modeline-command-wrapper 'widen)) (define-modeline-control process nil "Modeline control for displaying info on process status. Normally nil in most modes, since there is no process to display.") (setq-default modeline-format (list "" (cons modeline-coding-system-extent 'modeline-coding-system) (cons modeline-modified-extent 'modeline-modified) (cons modeline-position-status-extent 'modeline-position-status) (cons modeline-tty-frame-id-extent 'modeline-tty-frame-id) (cons modeline-buffer-id-extent 'modeline-buffer-id) " " 'global-mode-string " %[(" (cons modeline-minor-mode-extent (list "" 'mode-name 'minor-mode-alist)) (cons modeline-narrowed-extent 'modeline-narrowed) (cons modeline-process-extent 'modeline-process) ")%]%-")) ;;; modeline.el ends here