Mercurial > hg > xemacs-beta
view src/scrollbar-gtk.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 | 3d8143fc88e1 |
| children | 1e7cc382eb16 |
line wrap: on
line source
/* scrollbar implementation -- GTK interface. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994 Amdhal Corporation. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995 Darrell Kindred <dkindred+@cmu.edu>. 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Gtk version by William M. Perry */ #include <config.h> #include "lisp.h" #include "frame-impl.h" #include "window.h" #include "console-gtk-impl.h" #include "glyphs-gtk.h" #include "scrollbar-gtk.h" static gboolean scrollbar_cb (GtkAdjustment *adj, gpointer user_data); /* Used to prevent changing the size of the slider while drag scrolling, under Motif. This is necessary because the Motif scrollbar is incredibly stupid about updating the slider and causes lots of flicker if it is done too often. */ static int inhibit_slider_size_change; static int vertical_drag_in_progress; /* A device method. */ static int gtk_inhibit_scrollbar_slider_size_change (void) { return inhibit_slider_size_change; } /* A device method. */ static void gtk_free_scrollbar_instance (struct scrollbar_instance *instance) { if (SCROLLBAR_GTK_WIDGET (instance)) { gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance)); } if (instance->scrollbar_data) xfree (instance->scrollbar_data, void *); } /* A device method. */ static void gtk_release_scrollbar_instance (struct scrollbar_instance *instance) { /* It won't hurt to hide it all the time, will it? */ gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); } static gboolean scrollbar_drag_hack_cb (GtkWidget *UNUSED (w), GdkEventButton *UNUSED (ev), gpointer v) { vertical_drag_in_progress = (int) v; inhibit_slider_size_change = (int) v; return (FALSE); } /* A device method. */ static void gtk_create_scrollbar_instance (struct frame *f, int vertical, struct scrollbar_instance *instance) { GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_adjustment_new (0,0,0,0,0,0)); GtkScrollbar *sb = NULL; /* initialize the X specific data section. */ instance->scrollbar_data = xnew_and_zero (struct gtk_scrollbar_data); SCROLLBAR_GTK_ID (instance) = new_gui_id (); SCROLLBAR_GTK_VDRAG_ORIG_VALUE (instance) = -1; SCROLLBAR_GTK_LAST_VALUE (instance) = adj->value; gtk_object_set_data (GTK_OBJECT (adj), GTK_DATA_GUI_IDENTIFIER, (void *) SCROLLBAR_GTK_ID (instance)); gtk_object_set_data (GTK_OBJECT (adj), GTK_DATA_FRAME_IDENTIFIER, f); sb = GTK_SCROLLBAR (vertical ? gtk_vscrollbar_new (adj) : gtk_hscrollbar_new (adj)); SCROLLBAR_GTK_WIDGET (instance) = GTK_WIDGET (sb); gtk_signal_connect (GTK_OBJECT (adj),"value-changed", GTK_SIGNAL_FUNC (scrollbar_cb), (gpointer) vertical); gtk_signal_connect (GTK_OBJECT (sb), "button-press-event", GTK_SIGNAL_FUNC (scrollbar_drag_hack_cb), (gpointer) 1); gtk_signal_connect (GTK_OBJECT (sb), "button-release-event", GTK_SIGNAL_FUNC (scrollbar_drag_hack_cb), (gpointer) 0); gtk_fixed_put (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)), SCROLLBAR_GTK_WIDGET (instance), 0, 0); /* ** With gtk version > 1.2.8 the scrollbars in gtk-xemacs and xemacs ** from CVS are invisible. In fact they are not invisible but very ** thin (0 pixels wide). This is so, because the new gtk code does ** not call gtk_widget_request_size() on the newly created ** scrollbars anymore. this change was done to allow the theme ** engines to manipulate the scrollbar width. This patch calls ** gtk_widget_request_size with the newly created scollbars. Maybe ** it is better to postpone this call just before the ** gtk_widget_show() call is done on the scrolbar. */ gtk_widget_size_request(GTK_WIDGET(sb), &(GTK_WIDGET(sb)->requisition)); gtk_widget_hide (SCROLLBAR_GTK_WIDGET (instance)); } #define UPDATE_DATA_FIELD(field) \ if (new_##field >= 0 && \ SCROLLBAR_GTK_POS_DATA (inst).field != new_##field) { \ SCROLLBAR_GTK_POS_DATA (inst).field = new_##field; \ inst->scrollbar_instance_changed = 1; \ } /* A device method. */ /* #### The -1 check is such a hack. */ static void gtk_update_scrollbar_instance_values (struct window *w, struct scrollbar_instance *inst, int new_line_increment, int new_page_increment, int new_minimum, int new_maximum, int new_slider_size, int new_slider_position, int new_scrollbar_width, int new_scrollbar_height, int new_scrollbar_x, int new_scrollbar_y) { UPDATE_DATA_FIELD (line_increment); UPDATE_DATA_FIELD (page_increment); UPDATE_DATA_FIELD (minimum); UPDATE_DATA_FIELD (maximum); UPDATE_DATA_FIELD (slider_size); UPDATE_DATA_FIELD (slider_position); UPDATE_DATA_FIELD (scrollbar_width); UPDATE_DATA_FIELD (scrollbar_height); UPDATE_DATA_FIELD (scrollbar_x); UPDATE_DATA_FIELD (scrollbar_y); if (w && !vertical_drag_in_progress) { int new_vov = SCROLLBAR_GTK_POS_DATA (inst).slider_position; int new_vows = marker_position (w->start[CURRENT_DISP]); if (SCROLLBAR_GTK_VDRAG_ORIG_VALUE (inst) != new_vov) { SCROLLBAR_GTK_VDRAG_ORIG_VALUE (inst) = new_vov; inst->scrollbar_instance_changed = 1; } if (SCROLLBAR_GTK_VDRAG_ORIG_WINDOW_START (inst) != new_vows) { SCROLLBAR_GTK_VDRAG_ORIG_WINDOW_START (inst) = new_vows; inst->scrollbar_instance_changed = 1; } } } /* Used by gtk_update_scrollbar_instance_status. */ static void update_one_widget_scrollbar_pointer (struct window *w, GtkWidget *wid) { if (!wid->window) gtk_widget_realize (wid); if (POINTER_IMAGE_INSTANCEP (w->scrollbar_pointer)) { gdk_window_set_cursor (GET_GTK_WIDGET_WINDOW (wid), XIMAGE_INSTANCE_GTK_CURSOR (w->scrollbar_pointer)); gdk_flush (); } } /* A device method. */ static void gtk_update_scrollbar_instance_status (struct window *w, int active, int size, struct scrollbar_instance *instance) { struct frame *f = XFRAME (w->frame); GtkWidget *wid = SCROLLBAR_GTK_WIDGET (instance); gboolean managed = GTK_WIDGET_MAPPED (wid); if (active && size) { if (instance->scrollbar_instance_changed) { /* Need to set the height, width, and position of the widget */ GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (wid)); scrollbar_values *pos_data = & SCROLLBAR_GTK_POS_DATA (instance); int modified_p = 0; /* We do not want to update the size all the time if we can help it. This cuts down on annoying flicker. */ if ((wid->allocation.width != pos_data->scrollbar_width) || (wid->allocation.height != pos_data->scrollbar_height)) { gtk_widget_set_usize (wid, pos_data->scrollbar_width, pos_data->scrollbar_height); /* UGLY! UGLY! UGLY! Changes to wid->allocation are queued and not performed until the GTK event loop. However, when the fontlock progress bar is run, the vertical scrollbar's height is change and then changed back before events are again processed. This means that the change back is not seen and the scrollbar is left too short. Fix this by making the change manually so the test above sees the change. This does not seem to cause problems in other cases. */ wid->allocation.width = pos_data->scrollbar_width; wid->allocation.height = pos_data->scrollbar_height; modified_p = 1; } /* Ditto for the x/y position. */ if ((wid->allocation.x != pos_data->scrollbar_x) || (wid->allocation.y != pos_data->scrollbar_y)) { gtk_fixed_move (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)), wid, pos_data->scrollbar_x, pos_data->scrollbar_y); /* UGLY! UGLY! UGLY! Changes to wid->allocation are queued and not performed until the GTK event loop. However, when the fontlock progress bar is run, the horizontal scrollbar's position is change and then changed back before events are again processed. This means that the change back is not seen and the scrollbar is left in the wrong position. Fix this by making the change manually so the test above sees the change. This does not seem to cause problems in other cases. */ wid->allocation.x = pos_data->scrollbar_x; wid->allocation.y = pos_data->scrollbar_y; modified_p = 1; } adj->lower = pos_data->minimum; adj->upper = pos_data->maximum; adj->page_increment = pos_data->slider_size + 1; adj->step_increment = w->max_line_len - 1; adj->page_size = pos_data->slider_size + 1; adj->value = pos_data->slider_position; /* But, if we didn't resize or move the scrollbar, the widget will not get redrawn correctly when the user scrolls around in the XEmacs frame manually. So we update the slider manually here. */ if (!modified_p) gtk_range_slider_update (GTK_RANGE (wid)); instance->scrollbar_instance_changed = 0; } if (!managed) { gtk_widget_show (wid); update_one_widget_scrollbar_pointer (w, wid); } } else if (managed) { gtk_widget_hide (wid); } } enum gtk_scrollbar_loop { GTK_FIND_SCROLLBAR_WINDOW_MIRROR, GTK_SET_SCROLLBAR_POINTER, GTK_WINDOW_IS_SCROLLBAR, GTK_UPDATE_FRAME_SCROLLBARS }; static struct window_mirror * gtk_scrollbar_loop (enum gtk_scrollbar_loop type, Lisp_Object window, struct window_mirror *mir, GUI_ID id, GdkWindow *x_win) { struct window_mirror *retval = NULL; while (mir) { struct scrollbar_instance *vinstance = mir->scrollbar_vertical_instance; struct scrollbar_instance *hinstance = mir->scrollbar_horizontal_instance; struct window *w = XWINDOW (window); if (mir->vchild) retval = gtk_scrollbar_loop (type, w->vchild, mir->vchild, id, x_win); else if (mir->hchild) retval = gtk_scrollbar_loop (type, w->hchild, mir->hchild, id, x_win); if (retval) return retval; if (hinstance || vinstance) { switch (type) { case GTK_FIND_SCROLLBAR_WINDOW_MIRROR: if ((vinstance && SCROLLBAR_GTK_ID (vinstance) == id) || (hinstance && SCROLLBAR_GTK_ID (hinstance) == id)) return mir; break; case GTK_UPDATE_FRAME_SCROLLBARS: if (!mir->vchild && !mir->hchild) update_window_scrollbars (w, mir, 1, 0); break; case GTK_SET_SCROLLBAR_POINTER: if (!mir->vchild && !mir->hchild) { GtkWidget *widget; widget = SCROLLBAR_GTK_WIDGET (hinstance); if (widget && GTK_WIDGET_MAPPED (widget)) update_one_widget_scrollbar_pointer (w, widget); widget = SCROLLBAR_GTK_WIDGET (vinstance); if (widget && GTK_WIDGET_MAPPED (widget)) update_one_widget_scrollbar_pointer (w, widget); } break; case GTK_WINDOW_IS_SCROLLBAR: if (!mir->vchild && !mir->hchild) { GtkWidget *widget; widget = SCROLLBAR_GTK_WIDGET (hinstance); if (widget && GTK_WIDGET_MAPPED (widget) && GET_GTK_WIDGET_WINDOW (widget) == x_win) return (struct window_mirror *) 1; widget = SCROLLBAR_GTK_WIDGET (vinstance); if (widget && GTK_WIDGET_MAPPED (widget) && GET_GTK_WIDGET_WINDOW (widget) == x_win) return (struct window_mirror *) 1; } break; default: ABORT (); } } mir = mir->next; window = w->next; } return NULL; } /* Used by callbacks. */ static struct window_mirror * find_scrollbar_window_mirror (struct frame *f, GUI_ID id) { if (f->mirror_dirty) update_frame_window_mirror (f); return gtk_scrollbar_loop (GTK_FIND_SCROLLBAR_WINDOW_MIRROR, f->root_window, XWINDOW_MIRROR (f->root_mirror), id, (GdkWindow *) NULL); } static gboolean scrollbar_cb (GtkAdjustment *adj, gpointer user_data) { /* This function can GC */ int vertical = (int) user_data; struct frame *f = (struct frame*) gtk_object_get_data (GTK_OBJECT (adj), GTK_DATA_FRAME_IDENTIFIER); struct scrollbar_instance *instance; GUI_ID id = (GUI_ID) gtk_object_get_data (GTK_OBJECT (adj), GTK_DATA_GUI_IDENTIFIER); Lisp_Object win, frame; struct window_mirror *mirror; Lisp_Object event_type = Qnil; Lisp_Object event_data = Qnil; if (!f) return(FALSE); mirror = find_scrollbar_window_mirror (f, id); if (!mirror) return(FALSE); win = real_window (mirror, 1); if (NILP (win)) return(FALSE); instance = vertical ? mirror->scrollbar_vertical_instance : mirror->scrollbar_horizontal_instance; frame = WINDOW_FRAME (XWINDOW (win)); inhibit_slider_size_change = 0; switch (GTK_RANGE (SCROLLBAR_GTK_WIDGET (instance))->scroll_type) { case GTK_SCROLL_PAGE_BACKWARD: event_type = vertical ? Qscrollbar_page_up : Qscrollbar_page_left; event_data = Fcons (win, Qnil); break; case GTK_SCROLL_PAGE_FORWARD: event_type = vertical ? Qscrollbar_page_down : Qscrollbar_page_right; event_data = Fcons (win, Qnil); break; case GTK_SCROLL_STEP_FORWARD: event_type = vertical ? Qscrollbar_line_down : Qscrollbar_char_right; event_data = win; break; case GTK_SCROLL_STEP_BACKWARD: event_type = vertical ? Qscrollbar_line_up : Qscrollbar_char_left; event_data = win; break; case GTK_SCROLL_NONE: case GTK_SCROLL_JUMP: inhibit_slider_size_change = 1; event_type = vertical ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag; event_data = Fcons (win, make_int ((int)adj->value)); break; default: ABORT(); } signal_special_gtk_user_event (frame, event_type, event_data); return (TRUE); } static void gtk_scrollbar_pointer_changed_in_window (struct window *w) { Lisp_Object window = wrap_window (w); gtk_scrollbar_loop (GTK_SET_SCROLLBAR_POINTER, window, find_window_mirror (w), 0, (GdkWindow *) NULL); } /* #### BILL!!! This comment is not true for Gtk - should it be? */ /* Make sure that all scrollbars on frame are up-to-date. Called directly from gtk_set_frame_properties in frame-gtk.c*/ void gtk_update_frame_scrollbars (struct frame *f) { gtk_scrollbar_loop (GTK_UPDATE_FRAME_SCROLLBARS, f->root_window, XWINDOW_MIRROR (f->root_mirror), 0, (GdkWindow *) NULL); } #ifdef MEMORY_USAGE_STATS static int gtk_compute_scrollbar_instance_usage (struct device *UNUSED (d), struct scrollbar_instance *inst, struct overhead_stats *ovstats) { int total = 0; while (inst) { struct gtk_scrollbar_data *data = (struct gtk_scrollbar_data *) inst->scrollbar_data; #ifdef MC_ALLOC total += mc_alloced_storage_size (sizeof (*data), ovstats); #else /* not MC_ALLOC */ total += malloced_storage_size (data, sizeof (*data), ovstats); #endif /* not MC_ALLOC */ inst = inst->next; } return total; } #endif /* MEMORY_USAGE_STATS */ /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_scrollbar_gtk (void) { CONSOLE_HAS_METHOD (gtk, inhibit_scrollbar_slider_size_change); CONSOLE_HAS_METHOD (gtk, free_scrollbar_instance); CONSOLE_HAS_METHOD (gtk, release_scrollbar_instance); CONSOLE_HAS_METHOD (gtk, create_scrollbar_instance); CONSOLE_HAS_METHOD (gtk, update_scrollbar_instance_values); CONSOLE_HAS_METHOD (gtk, update_scrollbar_instance_status); CONSOLE_HAS_METHOD (gtk, scrollbar_pointer_changed_in_window); #ifdef MEMORY_USAGE_STATS CONSOLE_HAS_METHOD (gtk, compute_scrollbar_instance_usage); #endif /* MEMORY_USAGE_STATS */ } void vars_of_scrollbar_gtk (void) { Fprovide (intern ("gtk-scrollbars")); }