Mercurial > hg > xemacs-beta
annotate src/gtk-xemacs.c @ 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 | 53d45fc43132 |
| children | dbd2a866e38a |
| rev | line source |
|---|---|
| 462 | 1 /* gtk-xemacs.c |
| 2 ** | |
| 3 ** Description: A widget to encapsulate a XEmacs 'text widget' | |
| 4 ** | |
| 5 ** Created by: William M. Perry | |
| 6 ** Copyright (c) 2000 William M. Perry <wmperry@gnu.org> | |
| 7 ** | |
| 8 */ | |
| 9 | |
| 10 #include <config.h> | |
| 11 | |
| 12 #include "lisp.h" | |
| 13 #include "console-gtk.h" | |
| 14 #include "objects-gtk.h" | |
| 15 #include "gtk-xemacs.h" | |
| 809 | 16 #include "device.h" |
| 17 #include "glyphs.h" | |
| 462 | 18 #include "window.h" |
| 19 #include "faces.h" | |
| 778 | 20 #include "event-gtk.h" |
| 876 | 21 #include "frame-impl.h" |
| 22 #include "console-gtk-impl.h" | |
| 23 #include "device-impl.h" | |
| 462 | 24 |
| 25 extern Lisp_Object Vmodeline_face; | |
| 26 extern Lisp_Object Vscrollbar_on_left_p; | |
| 27 | |
| 28 EXFUN (Fmake_image_instance, 4); | |
| 29 | |
| 30 static void gtk_xemacs_class_init (GtkXEmacsClass *klass); | |
| 31 static void gtk_xemacs_init (GtkXEmacs *xemacs); | |
| 32 static void gtk_xemacs_size_allocate (GtkWidget *widget, GtkAllocation *allocaction); | |
| 33 static void gtk_xemacs_draw (GtkWidget *widget, GdkRectangle *area); | |
| 34 static void gtk_xemacs_paint (GtkWidget *widget, GdkRectangle *area); | |
| 35 static void gtk_xemacs_size_request (GtkWidget *widget, GtkRequisition *requisition); | |
| 36 static void gtk_xemacs_realize (GtkWidget *widget); | |
| 37 static void gtk_xemacs_style_set (GtkWidget *widget, GtkStyle *previous_style); | |
| 38 static gint gtk_xemacs_expose (GtkWidget *widget, GdkEventExpose *event); | |
| 39 | |
| 40 guint | |
| 41 gtk_xemacs_get_type (void) | |
| 42 { | |
| 43 static guint xemacs_type = 0; | |
| 44 | |
| 45 if (!xemacs_type) | |
| 46 { | |
| 47 static const GtkTypeInfo xemacs_info = | |
| 48 { | |
| 49 "GtkXEmacs", | |
| 50 sizeof (GtkXEmacs), | |
| 51 sizeof (GtkXEmacsClass), | |
| 52 (GtkClassInitFunc) gtk_xemacs_class_init, | |
| 53 (GtkObjectInitFunc) gtk_xemacs_init, | |
| 54 /* reserved_1 */ NULL, | |
| 55 /* reserved_2 */ NULL, | |
| 56 (GtkClassInitFunc) NULL, | |
| 57 }; | |
| 58 | |
| 59 xemacs_type = gtk_type_unique (gtk_fixed_get_type (), &xemacs_info); | |
| 60 } | |
| 61 | |
| 62 return xemacs_type; | |
| 63 } | |
| 64 | |
| 65 static GtkWidgetClass *parent_class; | |
| 66 | |
| 67 static void | |
| 1204 | 68 gtk_xemacs_class_init (GtkXEmacsClass *class_) |
| 462 | 69 { |
| 70 GtkWidgetClass *widget_class; | |
| 71 | |
| 1204 | 72 widget_class = (GtkWidgetClass*) class_; |
| 462 | 73 parent_class = (GtkWidgetClass *) gtk_type_class (gtk_fixed_get_type ()); |
| 74 | |
| 75 widget_class->size_allocate = gtk_xemacs_size_allocate; | |
| 76 widget_class->size_request = gtk_xemacs_size_request; | |
| 77 widget_class->draw = gtk_xemacs_draw; | |
| 78 widget_class->expose_event = gtk_xemacs_expose; | |
| 79 widget_class->realize = gtk_xemacs_realize; | |
| 80 widget_class->button_press_event = emacs_gtk_button_event_handler; | |
| 81 widget_class->button_release_event = emacs_gtk_button_event_handler; | |
| 82 widget_class->key_press_event = emacs_gtk_key_event_handler; | |
| 83 widget_class->key_release_event = emacs_gtk_key_event_handler; | |
| 84 widget_class->motion_notify_event = emacs_gtk_motion_event_handler; | |
| 85 widget_class->style_set = gtk_xemacs_style_set; | |
| 86 } | |
| 87 | |
| 88 static void | |
| 89 gtk_xemacs_init (GtkXEmacs *xemacs) | |
| 90 { | |
| 91 GTK_WIDGET_SET_FLAGS (xemacs, GTK_CAN_FOCUS); | |
| 92 } | |
| 93 | |
| 94 GtkWidget* | |
| 95 gtk_xemacs_new (struct frame *f) | |
| 96 { | |
| 97 GtkXEmacs *xemacs; | |
| 98 | |
| 2054 | 99 xemacs = (GtkXEmacs*) gtk_type_new (gtk_xemacs_get_type ()); |
| 462 | 100 xemacs->f = f; |
| 101 | |
| 102 return GTK_WIDGET (xemacs); | |
| 103 } | |
| 104 | |
| 105 static void | |
| 106 __nuke_background_items (GtkWidget *widget) | |
| 107 { | |
| 108 /* This bit of voodoo is here to get around the annoying flicker | |
| 109 when GDK tries to futz with our background pixmap as well as | |
| 110 XEmacs doing it | |
| 111 | |
| 112 We do NOT set the background of this widget window, that way | |
| 113 there is NO flickering, etc. The downside is the XEmacs frame | |
| 114 appears as 'seethru' when XEmacs is too busy to redraw the | |
| 115 frame. | |
| 116 | |
| 117 Well, wait, we do... otherwise there sre weird 'seethru' areas | |
| 118 even when XEmacs does a full redisplay. Most noticable in some | |
| 119 areas of the modeline, or in the right-hand-side of the window | |
| 120 between the scrollbar ad n the edge of the window. | |
| 121 */ | |
| 122 if (widget->window) | |
| 123 { | |
| 124 gdk_window_set_back_pixmap (widget->window, NULL, 0); | |
| 125 gdk_window_set_back_pixmap (widget->parent->window, NULL, 0); | |
| 126 gdk_window_set_background (widget->parent->window, | |
| 127 &widget->style->bg[GTK_STATE_NORMAL]); | |
| 128 gdk_window_set_background (widget->window, | |
| 129 &widget->style->bg[GTK_STATE_NORMAL]); | |
| 130 } | |
| 131 } | |
| 132 | |
| 133 extern Lisp_Object xemacs_gtk_convert_color(GdkColor *c, GtkWidget *w); | |
| 134 | |
| 135 /* From objects-gtk.c */ | |
| 136 extern Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp); | |
| 137 | |
| 138 #define convert_font(f) __get_gtk_font_truename (f, 0) | |
| 139 | |
| 778 | 140 #ifdef SMASH_FACE_FALLBACKS |
| 462 | 141 static void |
| 142 smash_face_fallbacks (struct frame *f, GtkStyle *style) | |
| 143 { | |
| 144 #define FROB(face,prop,slot) do { \ | |
| 145 Lisp_Object fallback = Qnil; \ | |
| 146 Lisp_Object specifier = Fget (face, prop, Qnil); \ | |
| 147 struct Lisp_Specifier *sp = NULL; \ | |
| 148 if (NILP (specifier)) continue; \ | |
| 149 sp = XSPECIFIER (specifier); \ | |
| 150 fallback = sp->fallback; \ | |
| 151 if (EQ (Fcar (Fcar (Fcar (fallback))), Qgtk)) \ | |
| 152 fallback = XCDR (fallback); \ | |
| 153 if (! NILP (slot)) \ | |
| 154 fallback = acons (list1 (Qgtk), \ | |
| 155 slot, \ | |
| 156 fallback); \ | |
| 157 set_specifier_fallback (specifier, fallback); \ | |
| 158 } while (0); | |
| 159 #define FROB_FACE(face,fg_slot,bg_slot) \ | |
| 160 do { \ | |
| 161 FROB (face, Qforeground, xemacs_gtk_convert_color (&style->fg_slot[GTK_STATE_NORMAL], FRAME_GTK_SHELL_WIDGET (f))); \ | |
| 162 FROB (face, Qbackground, xemacs_gtk_convert_color (&style->bg_slot[GTK_STATE_NORMAL], FRAME_GTK_SHELL_WIDGET (f))); \ | |
| 163 if (style->rc_style && style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]) \ | |
| 164 { \ | |
| 165 FROB (Vdefault_face, Qbackground_pixmap, \ | |
| 166 Fmake_image_instance (build_string (style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]), \ | |
| 167 f->device, Qnil, make_int (5))); \ | |
| 168 } \ | |
| 169 else \ | |
| 170 { \ | |
| 171 FROB (Vdefault_face, Qbackground_pixmap, Qnil); \ | |
| 172 } \ | |
| 173 } while (0) | |
| 174 | |
| 175 FROB (Vdefault_face, Qfont, convert_font (style->font)); | |
| 176 FROB_FACE (Vdefault_face, fg, bg); | |
| 177 FROB_FACE (Vgui_element_face, text, mid); | |
| 178 | |
| 179 #undef FROB | |
| 180 #undef FROB_FACE | |
| 181 } | |
| 778 | 182 #endif /* SMASH_FACE_FALLBACKS */ |
| 462 | 183 |
| 184 #ifdef HAVE_SCROLLBARS | |
| 185 static void | |
| 186 smash_scrollbar_specifiers (struct frame *f, GtkStyle *style) | |
| 187 { | |
| 188 Lisp_Object frame; | |
| 189 int slider_size = 0; | |
| 190 int hsize, vsize; | |
| 191 GtkRangeClass *klass; | |
| 192 | |
| 793 | 193 frame = wrap_frame (f); |
| 462 | 194 |
| 195 klass = (GtkRangeClass *) gtk_type_class (GTK_TYPE_SCROLLBAR); | |
| 196 slider_size = klass->slider_width; | |
| 197 hsize = slider_size + (style->klass->ythickness * 2); | |
| 198 vsize = slider_size + (style->klass->xthickness * 2); | |
| 199 | |
| 200 style = gtk_style_attach (style, | |
| 201 GTK_WIDGET (DEVICE_GTK_APP_SHELL (XDEVICE (FRAME_DEVICE (f))))->window); | |
| 202 | |
| 203 Fadd_spec_to_specifier (Vscrollbar_width, make_int (vsize), frame, Qnil, Qnil); | |
| 204 Fadd_spec_to_specifier (Vscrollbar_height, make_int (hsize), frame, Qnil, Qnil); | |
| 205 } | |
| 206 #endif /* HAVE_SCROLLBARS */ | |
| 207 | |
| 744 | 208 #ifdef HAVE_TOOLBARS |
| 209 extern Lisp_Object Vtoolbar_shadow_thickness; | |
| 210 | |
| 211 static void | |
| 212 smash_toolbar_specifiers(struct frame *f, GtkStyle *style) | |
| 213 { | |
| 214 Lisp_Object frame; | |
| 215 GtkStyleClass *klass = (GtkStyleClass *) style->klass; | |
| 216 | |
| 793 | 217 frame = wrap_frame (f); |
| 744 | 218 |
| 219 Fadd_spec_to_specifier (Vtoolbar_shadow_thickness, make_int (klass->xthickness), | |
| 220 Qnil, list2 (Qgtk, Qdefault), Qprepend); | |
| 221 } | |
| 222 #endif /* HAVE_TOOLBARS */ | |
| 223 | |
| 462 | 224 static void |
| 225 gtk_xemacs_realize (GtkWidget *widget) | |
| 226 { | |
| 227 parent_class->realize (widget); | |
| 228 gtk_xemacs_style_set (widget, gtk_widget_get_style (widget)); | |
| 229 } | |
| 230 | |
| 231 static void | |
| 232 gtk_xemacs_style_set (GtkWidget *widget, GtkStyle *previous_style) | |
| 233 { | |
| 234 GtkStyle *new_style = gtk_widget_get_style (widget); | |
| 235 GtkXEmacs *x = GTK_XEMACS (widget); | |
| 236 | |
| 237 parent_class->style_set (widget, previous_style); | |
| 238 | |
| 239 if (x->f) | |
| 240 { | |
| 241 __nuke_background_items (widget); | |
| 778 | 242 #ifdef SMASH_FACE_FALLBACKS |
| 462 | 243 smash_face_fallbacks (x->f, new_style); |
| 244 #endif | |
| 744 | 245 #ifdef HAVE_SCROLLBARS |
| 462 | 246 smash_scrollbar_specifiers (x->f, new_style); |
| 744 | 247 #endif |
| 248 #ifdef HAVE_TOOLBARS | |
| 249 smash_toolbar_specifiers (x->f, new_style); | |
| 250 #endif | |
| 462 | 251 } |
| 252 } | |
| 253 | |
| 254 static void | |
| 255 gtk_xemacs_size_request (GtkWidget *widget, GtkRequisition *requisition) | |
| 256 { | |
| 257 GtkXEmacs *x = GTK_XEMACS (widget); | |
| 258 struct frame *f = GTK_XEMACS_FRAME (x); | |
| 259 int width, height; | |
| 260 | |
| 261 if (f) | |
| 262 { | |
| 263 char_to_pixel_size (f, FRAME_WIDTH (f), FRAME_HEIGHT (f), | |
| 264 &width, &height); | |
| 265 requisition->width = width; | |
| 266 requisition->height = height; | |
| 267 } | |
| 268 else | |
| 269 { | |
| 270 parent_class->size_request (widget, requisition); | |
| 271 } | |
| 272 } | |
| 273 | |
| 2168 | 274 /* Assign a size and position to the child widgets. This differs from the |
| 275 super class method in that for all widgets except the scrollbars the size | |
| 276 and position are not caclulated here. This is because these widgets have | |
| 277 this function performed for them by the redisplay code (see | |
| 278 gtk_map_subwindow()). If the superclass method is called then the widgets | |
| 279 can change size and position as the two pieces of code move the widgets at | |
| 280 random. | |
| 281 */ | |
| 462 | 282 static void |
| 283 gtk_xemacs_size_allocate (GtkWidget *widget, GtkAllocation *allocation) | |
| 284 { | |
| 285 GtkXEmacs *x = GTK_XEMACS (widget); | |
| 2168 | 286 GtkFixed *fixed = GTK_FIXED (widget); |
| 462 | 287 struct frame *f = GTK_XEMACS_FRAME (x); |
| 288 int columns, rows; | |
| 2168 | 289 GList *children; |
| 290 guint16 border_width; | |
| 462 | 291 |
| 2168 | 292 widget->allocation = *allocation; |
| 293 if (GTK_WIDGET_REALIZED (widget)) | |
| 294 gdk_window_move_resize (widget->window, | |
| 295 allocation->x, | |
| 296 allocation->y, | |
| 297 allocation->width, | |
| 298 allocation->height); | |
| 299 | |
| 300 border_width = GTK_CONTAINER (fixed)->border_width; | |
| 301 | |
| 302 children = fixed->children; | |
| 303 while (children) | |
| 304 { | |
| 2336 | 305 GtkFixedChild* child = (GtkFixedChild*) children->data; |
| 2168 | 306 children = children->next; |
| 307 | |
| 308 /* | |
| 309 Scrollbars are the only widget that is managed by GTK. See | |
| 310 comments in gtk_create_scrollbar_instance(). | |
| 311 */ | |
| 312 if (GTK_WIDGET_VISIBLE (child->widget) && | |
| 313 gtk_type_is_a(GTK_OBJECT_TYPE(child->widget), GTK_TYPE_SCROLLBAR)) | |
| 314 { | |
| 315 GtkAllocation child_allocation; | |
| 316 GtkRequisition child_requisition; | |
| 317 | |
| 318 gtk_widget_get_child_requisition (child->widget, &child_requisition); | |
| 319 child_allocation.x = child->x + border_width; | |
| 320 child_allocation.y = child->y + border_width; | |
| 321 child_allocation.width = child_requisition.width; | |
| 322 child_allocation.height = child_requisition.height; | |
| 323 gtk_widget_size_allocate (child->widget, &child_allocation); | |
| 324 } | |
| 325 } | |
| 462 | 326 |
| 327 if (f) | |
| 328 { | |
| 329 f->pixwidth = allocation->width; | |
| 330 f->pixheight = allocation->height; | |
| 331 | |
| 332 pixel_to_char_size (f, | |
| 333 allocation->width, | |
| 334 allocation->height, &columns, &rows); | |
| 335 | |
| 336 change_frame_size (f, rows, columns, 1); | |
| 337 } | |
| 338 } | |
| 339 | |
| 340 static void | |
| 341 gtk_xemacs_paint (GtkWidget *widget, GdkRectangle *area) | |
| 342 { | |
| 343 GtkXEmacs *x = GTK_XEMACS (widget); | |
| 344 struct frame *f = GTK_XEMACS_FRAME (x); | |
| 2195 | 345 |
| 346 if (GTK_WIDGET_DRAWABLE (widget)) | |
| 347 redisplay_redraw_exposed_area (f, area->x, area->y, area->width, | |
| 348 area->height); | |
| 462 | 349 } |
| 350 | |
| 351 static void | |
| 352 gtk_xemacs_draw (GtkWidget *widget, GdkRectangle *area) | |
| 353 { | |
| 354 GtkFixed *fixed = GTK_FIXED (widget); | |
| 355 GtkFixedChild *child; | |
| 356 GdkRectangle child_area; | |
| 357 GList *children; | |
| 358 | |
| 359 /* I need to manually iterate over the children instead of just | |
| 360 chaining to parent_class->draw() because it calls | |
| 361 gtk_fixed_paint() directly, which clears the background window, | |
| 362 which causes A LOT of flashing. */ | |
| 363 | |
| 2195 | 364 if (GTK_WIDGET_DRAWABLE (widget)) |
| 365 { | |
| 366 gtk_xemacs_paint (widget, area); | |
| 462 | 367 |
| 2195 | 368 children = fixed->children; |
| 462 | 369 |
| 2195 | 370 while (children) |
| 371 { | |
| 372 child = (GtkFixedChild*) children->data; | |
| 373 children = children->next; | |
| 374 /* #### This is what causes the scrollbar flickering! | |
| 375 Evidently the scrollbars pretty much take care of drawing | |
| 376 themselves in most cases. Then we come along and tell them | |
| 377 to redraw again! | |
| 462 | 378 |
| 2195 | 379 But if we just leave it out, then they do not get drawn |
| 380 correctly the first time! | |
| 462 | 381 |
| 2195 | 382 Scrollbar flickering has been greatly helped by the |
| 383 optimizations in scrollbar-gtk.c / | |
| 384 gtk_update_scrollbar_instance_status (), so this is not that | |
| 385 big a deal anymore. | |
| 386 */ | |
| 387 if (gtk_widget_intersect (child->widget, area, &child_area)) | |
| 388 { | |
| 389 gtk_widget_draw (child->widget, &child_area); | |
| 390 } | |
| 391 } | |
| 392 } | |
| 462 | 393 } |
| 394 | |
| 395 static gint | |
| 396 gtk_xemacs_expose (GtkWidget *widget, GdkEventExpose *event) | |
| 397 { | |
| 398 GtkXEmacs *x = GTK_XEMACS (widget); | |
| 399 struct frame *f = GTK_XEMACS_FRAME (x); | |
| 400 GdkRectangle *a = &event->area; | |
| 401 | |
| 2195 | 402 if (GTK_WIDGET_DRAWABLE (widget)) |
| 403 { | |
| 404 /* This takes care of drawing the scrollbars, etc */ | |
| 405 parent_class->expose_event (widget, event); | |
| 462 | 406 |
| 2195 | 407 /* Now draw the actual frame data */ |
| 408 if (!check_for_ignored_expose (f, a->x, a->y, a->width, a->height) && | |
| 409 !find_matching_subwindow (f, a->x, a->y, a->width, a->height)) | |
| 410 redisplay_redraw_exposed_area (f, a->x, a->y, a->width, a->height); | |
| 411 return (TRUE); | |
| 412 } | |
| 462 | 413 } |
| 414 | |
| 415 Lisp_Object | |
| 2286 | 416 xemacs_gtk_convert_color(GdkColor *c, GtkWidget *UNUSED (w)) |
| 462 | 417 { |
| 418 char color_buf[255]; | |
| 419 | |
| 420 sprintf (color_buf, "#%04x%04x%04x", c->red, c->green, c->blue); | |
| 421 | |
| 422 return (build_string (color_buf)); | |
| 423 } |