Mercurial > hg > xemacs-beta
annotate 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 |
| rev | line source |
|---|---|
| 2168 | 1 /* scrollbar implementation -- GTK interface. |
| 462 | 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. |
| 3 Copyright (C) 1994 Amdhal Corporation. | |
| 4 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 5 Copyright (C) 1995 Darrell Kindred <dkindred+@cmu.edu>. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. */ | |
| 23 | |
| 24 /* Synched up with: Not in FSF. */ | |
| 25 /* Gtk version by William M. Perry */ | |
| 26 | |
| 27 #include <config.h> | |
| 28 #include "lisp.h" | |
| 29 | |
| 872 | 30 #include "frame-impl.h" |
| 31 #include "window.h" | |
| 32 | |
| 33 #include "console-gtk-impl.h" | |
| 462 | 34 #include "glyphs-gtk.h" |
| 35 #include "scrollbar-gtk.h" | |
| 36 | |
| 37 static gboolean scrollbar_cb (GtkAdjustment *adj, gpointer user_data); | |
| 38 | |
| 39 /* Used to prevent changing the size of the slider while drag | |
| 40 scrolling, under Motif. This is necessary because the Motif | |
| 41 scrollbar is incredibly stupid about updating the slider and causes | |
| 42 lots of flicker if it is done too often. */ | |
| 43 static int inhibit_slider_size_change; | |
| 44 | |
| 45 static int vertical_drag_in_progress; | |
| 46 | |
| 47 | |
| 48 /* A device method. */ | |
| 49 static int | |
| 50 gtk_inhibit_scrollbar_slider_size_change (void) | |
| 51 { | |
| 52 return inhibit_slider_size_change; | |
| 53 } | |
| 54 | |
| 55 /* A device method. */ | |
| 56 static void | |
| 57 gtk_free_scrollbar_instance (struct scrollbar_instance *instance) | |
| 58 { | |
| 59 if (SCROLLBAR_GTK_WIDGET (instance)) | |
| 60 { | |
| 61 gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); | |
| 62 gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance)); | |
| 63 } | |
| 64 | |
| 65 if (instance->scrollbar_data) | |
| 1726 | 66 xfree (instance->scrollbar_data, void *); |
| 462 | 67 } |
| 68 | |
| 69 /* A device method. */ | |
| 70 static void | |
| 71 gtk_release_scrollbar_instance (struct scrollbar_instance *instance) | |
| 72 { | |
| 73 /* It won't hurt to hide it all the time, will it? */ | |
| 74 gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); | |
| 75 } | |
| 76 | |
| 77 static gboolean | |
| 2286 | 78 scrollbar_drag_hack_cb (GtkWidget *UNUSED (w), GdkEventButton *UNUSED (ev), |
| 79 gpointer v) | |
| 462 | 80 { |
| 81 vertical_drag_in_progress = (int) v; | |
| 82 inhibit_slider_size_change = (int) v; | |
| 83 return (FALSE); | |
| 84 } | |
| 85 | |
| 86 /* A device method. */ | |
| 87 static void | |
| 88 gtk_create_scrollbar_instance (struct frame *f, int vertical, | |
| 89 struct scrollbar_instance *instance) | |
| 90 { | |
| 91 GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_adjustment_new (0,0,0,0,0,0)); | |
| 92 GtkScrollbar *sb = NULL; | |
| 93 | |
| 94 /* initialize the X specific data section. */ | |
| 95 instance->scrollbar_data = xnew_and_zero (struct gtk_scrollbar_data); | |
| 96 | |
| 97 SCROLLBAR_GTK_ID (instance) = new_gui_id (); | |
| 98 SCROLLBAR_GTK_VDRAG_ORIG_VALUE (instance) = -1; | |
| 99 SCROLLBAR_GTK_LAST_VALUE (instance) = adj->value; | |
| 100 | |
| 2168 | 101 gtk_object_set_data (GTK_OBJECT (adj), GTK_DATA_GUI_IDENTIFIER, (void *) SCROLLBAR_GTK_ID (instance)); |
| 102 gtk_object_set_data (GTK_OBJECT (adj), GTK_DATA_FRAME_IDENTIFIER, f); | |
| 462 | 103 |
| 104 sb = GTK_SCROLLBAR (vertical ? gtk_vscrollbar_new (adj) : gtk_hscrollbar_new (adj)); | |
| 105 SCROLLBAR_GTK_WIDGET (instance) = GTK_WIDGET (sb); | |
| 106 | |
| 107 gtk_signal_connect (GTK_OBJECT (adj),"value-changed", | |
| 108 GTK_SIGNAL_FUNC (scrollbar_cb), (gpointer) vertical); | |
| 109 | |
| 110 gtk_signal_connect (GTK_OBJECT (sb), "button-press-event", | |
| 111 GTK_SIGNAL_FUNC (scrollbar_drag_hack_cb), (gpointer) 1); | |
| 112 gtk_signal_connect (GTK_OBJECT (sb), "button-release-event", | |
| 113 GTK_SIGNAL_FUNC (scrollbar_drag_hack_cb), (gpointer) 0); | |
| 114 | |
| 115 gtk_fixed_put (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)), SCROLLBAR_GTK_WIDGET (instance), 0, 0); | |
| 525 | 116 |
| 117 /* | |
| 118 ** With gtk version > 1.2.8 the scrollbars in gtk-xemacs and xemacs | |
| 119 ** from CVS are invisible. In fact they are not invisible but very | |
| 120 ** thin (0 pixels wide). This is so, because the new gtk code does | |
| 121 ** not call gtk_widget_request_size() on the newly created | |
| 122 ** scrollbars anymore. this change was done to allow the theme | |
| 123 ** engines to manipulate the scrollbar width. This patch calls | |
| 124 ** gtk_widget_request_size with the newly created scollbars. Maybe | |
| 125 ** it is better to postpone this call just before the | |
| 126 ** gtk_widget_show() call is done on the scrolbar. | |
| 127 */ | |
| 128 gtk_widget_size_request(GTK_WIDGET(sb), &(GTK_WIDGET(sb)->requisition)); | |
| 129 | |
| 462 | 130 gtk_widget_hide (SCROLLBAR_GTK_WIDGET (instance)); |
| 131 } | |
| 132 | |
| 133 #define UPDATE_DATA_FIELD(field) \ | |
| 134 if (new_##field >= 0 && \ | |
| 135 SCROLLBAR_GTK_POS_DATA (inst).field != new_##field) { \ | |
| 136 SCROLLBAR_GTK_POS_DATA (inst).field = new_##field; \ | |
| 137 inst->scrollbar_instance_changed = 1; \ | |
| 138 } | |
| 139 | |
| 140 /* A device method. */ | |
| 141 /* #### The -1 check is such a hack. */ | |
| 142 static void | |
| 143 gtk_update_scrollbar_instance_values (struct window *w, | |
| 144 struct scrollbar_instance *inst, | |
| 145 int new_line_increment, | |
| 146 int new_page_increment, | |
| 147 int new_minimum, int new_maximum, | |
| 148 int new_slider_size, | |
| 149 int new_slider_position, | |
| 150 int new_scrollbar_width, | |
| 151 int new_scrollbar_height, | |
| 152 int new_scrollbar_x, int new_scrollbar_y) | |
| 153 { | |
| 154 UPDATE_DATA_FIELD (line_increment); | |
| 155 UPDATE_DATA_FIELD (page_increment); | |
| 156 UPDATE_DATA_FIELD (minimum); | |
| 157 UPDATE_DATA_FIELD (maximum); | |
| 158 UPDATE_DATA_FIELD (slider_size); | |
| 159 UPDATE_DATA_FIELD (slider_position); | |
| 160 UPDATE_DATA_FIELD (scrollbar_width); | |
| 161 UPDATE_DATA_FIELD (scrollbar_height); | |
| 162 UPDATE_DATA_FIELD (scrollbar_x); | |
| 163 UPDATE_DATA_FIELD (scrollbar_y); | |
| 164 | |
| 165 if (w && !vertical_drag_in_progress) | |
| 166 { | |
| 167 int new_vov = SCROLLBAR_GTK_POS_DATA (inst).slider_position; | |
| 168 int new_vows = marker_position (w->start[CURRENT_DISP]); | |
| 169 | |
| 170 if (SCROLLBAR_GTK_VDRAG_ORIG_VALUE (inst) != new_vov) | |
| 171 { | |
| 172 SCROLLBAR_GTK_VDRAG_ORIG_VALUE (inst) = new_vov; | |
| 173 inst->scrollbar_instance_changed = 1; | |
| 174 } | |
| 175 if (SCROLLBAR_GTK_VDRAG_ORIG_WINDOW_START (inst) != new_vows) | |
| 176 { | |
| 177 SCROLLBAR_GTK_VDRAG_ORIG_WINDOW_START (inst) = new_vows; | |
| 178 inst->scrollbar_instance_changed = 1; | |
| 179 } | |
| 180 } | |
| 181 } | |
| 182 | |
| 183 /* Used by gtk_update_scrollbar_instance_status. */ | |
| 184 static void | |
| 185 update_one_widget_scrollbar_pointer (struct window *w, GtkWidget *wid) | |
| 186 { | |
| 187 if (!wid->window) | |
| 188 gtk_widget_realize (wid); | |
| 189 | |
| 190 if (POINTER_IMAGE_INSTANCEP (w->scrollbar_pointer)) | |
| 191 { | |
| 192 gdk_window_set_cursor (GET_GTK_WIDGET_WINDOW (wid), | |
| 193 XIMAGE_INSTANCE_GTK_CURSOR (w->scrollbar_pointer)); | |
| 194 gdk_flush (); | |
| 195 } | |
| 196 } | |
| 197 | |
| 198 /* A device method. */ | |
| 199 static void | |
| 200 gtk_update_scrollbar_instance_status (struct window *w, int active, int size, | |
| 201 struct scrollbar_instance *instance) | |
| 202 { | |
| 203 struct frame *f = XFRAME (w->frame); | |
| 204 GtkWidget *wid = SCROLLBAR_GTK_WIDGET (instance); | |
| 205 gboolean managed = GTK_WIDGET_MAPPED (wid); | |
| 206 | |
| 207 if (active && size) | |
| 208 { | |
| 209 if (instance->scrollbar_instance_changed) | |
| 210 { | |
| 211 /* Need to set the height, width, and position of the widget */ | |
| 212 GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (wid)); | |
| 213 scrollbar_values *pos_data = & SCROLLBAR_GTK_POS_DATA (instance); | |
| 214 int modified_p = 0; | |
| 215 | |
| 216 /* We do not want to update the size all the time if we can | |
| 217 help it. This cuts down on annoying flicker. | |
| 218 */ | |
| 219 if ((wid->allocation.width != pos_data->scrollbar_width) || | |
| 220 (wid->allocation.height != pos_data->scrollbar_height)) | |
| 221 { | |
| 222 gtk_widget_set_usize (wid, | |
| 223 pos_data->scrollbar_width, | |
| 224 pos_data->scrollbar_height); | |
| 2195 | 225 |
| 226 /* | |
| 227 UGLY! UGLY! UGLY! Changes to wid->allocation are queued and | |
| 228 not performed until the GTK event loop. However, when the | |
| 229 fontlock progress bar is run, the vertical scrollbar's height | |
| 230 is change and then changed back before events are again | |
| 231 processed. This means that the change back is not seen and | |
| 232 the scrollbar is left too short. Fix this by making the | |
| 233 change manually so the test above sees the change. This does | |
| 234 not seem to cause problems in other cases. | |
| 235 */ | |
| 236 | |
| 237 wid->allocation.width = pos_data->scrollbar_width; | |
| 238 wid->allocation.height = pos_data->scrollbar_height; | |
| 239 | |
| 462 | 240 modified_p = 1; |
| 241 } | |
| 242 | |
| 243 /* Ditto for the x/y position. */ | |
| 244 if ((wid->allocation.x != pos_data->scrollbar_x) || | |
| 245 (wid->allocation.y != pos_data->scrollbar_y)) | |
| 246 { | |
| 247 gtk_fixed_move (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)), | |
| 248 wid, | |
| 249 pos_data->scrollbar_x, | |
| 250 pos_data->scrollbar_y); | |
| 2195 | 251 |
| 252 /* | |
| 253 UGLY! UGLY! UGLY! Changes to wid->allocation are queued and | |
| 254 not performed until the GTK event loop. However, when the | |
| 255 fontlock progress bar is run, the horizontal scrollbar's | |
| 256 position is change and then changed back before events are | |
| 257 again processed. This means that the change back is not seen | |
| 258 and the scrollbar is left in the wrong position. Fix this by | |
| 259 making the change manually so the test above sees the change. | |
| 260 This does not seem to cause problems in other cases. | |
| 261 */ | |
| 262 | |
| 263 wid->allocation.x = pos_data->scrollbar_x; | |
| 264 wid->allocation.y = pos_data->scrollbar_y; | |
| 265 | |
| 462 | 266 modified_p = 1; |
| 267 } | |
| 268 | |
| 269 adj->lower = pos_data->minimum; | |
| 270 adj->upper = pos_data->maximum; | |
| 271 adj->page_increment = pos_data->slider_size + 1; | |
| 272 adj->step_increment = w->max_line_len - 1; | |
| 273 adj->page_size = pos_data->slider_size + 1; | |
| 274 adj->value = pos_data->slider_position; | |
| 275 | |
| 276 /* But, if we didn't resize or move the scrollbar, the | |
| 277 widget will not get redrawn correctly when the user | |
| 278 scrolls around in the XEmacs frame manually. So we | |
| 279 update the slider manually here. | |
| 280 */ | |
| 281 if (!modified_p) | |
| 282 gtk_range_slider_update (GTK_RANGE (wid)); | |
| 283 | |
| 284 instance->scrollbar_instance_changed = 0; | |
| 285 } | |
| 286 | |
| 287 if (!managed) | |
| 288 { | |
| 289 gtk_widget_show (wid); | |
| 290 update_one_widget_scrollbar_pointer (w, wid); | |
| 291 } | |
| 292 } | |
| 293 else if (managed) | |
| 294 { | |
| 295 gtk_widget_hide (wid); | |
| 296 } | |
| 297 } | |
| 298 | |
| 299 enum gtk_scrollbar_loop | |
| 300 { | |
| 301 GTK_FIND_SCROLLBAR_WINDOW_MIRROR, | |
| 302 GTK_SET_SCROLLBAR_POINTER, | |
| 303 GTK_WINDOW_IS_SCROLLBAR, | |
| 304 GTK_UPDATE_FRAME_SCROLLBARS | |
| 305 }; | |
| 306 | |
| 307 static struct window_mirror * | |
| 308 gtk_scrollbar_loop (enum gtk_scrollbar_loop type, Lisp_Object window, | |
| 309 struct window_mirror *mir, | |
| 310 GUI_ID id, GdkWindow *x_win) | |
| 311 { | |
| 312 struct window_mirror *retval = NULL; | |
| 313 | |
| 314 while (mir) | |
| 315 { | |
| 316 struct scrollbar_instance *vinstance = mir->scrollbar_vertical_instance; | |
| 317 struct scrollbar_instance *hinstance = mir->scrollbar_horizontal_instance; | |
| 318 struct window *w = XWINDOW (window); | |
| 319 | |
| 320 if (mir->vchild) | |
| 321 retval = gtk_scrollbar_loop (type, w->vchild, mir->vchild, id, x_win); | |
| 322 else if (mir->hchild) | |
| 323 retval = gtk_scrollbar_loop (type, w->hchild, mir->hchild, id, x_win); | |
| 324 if (retval) | |
| 325 return retval; | |
| 326 | |
| 327 if (hinstance || vinstance) | |
| 328 { | |
| 329 switch (type) | |
| 330 { | |
| 331 case GTK_FIND_SCROLLBAR_WINDOW_MIRROR: | |
| 332 if ((vinstance && SCROLLBAR_GTK_ID (vinstance) == id) || | |
| 333 (hinstance && SCROLLBAR_GTK_ID (hinstance) == id)) | |
| 334 return mir; | |
| 335 break; | |
| 336 case GTK_UPDATE_FRAME_SCROLLBARS: | |
| 337 if (!mir->vchild && !mir->hchild) | |
| 338 update_window_scrollbars (w, mir, 1, 0); | |
| 339 break; | |
| 340 case GTK_SET_SCROLLBAR_POINTER: | |
| 341 if (!mir->vchild && !mir->hchild) | |
| 342 { | |
| 343 GtkWidget *widget; | |
| 344 | |
| 345 widget = SCROLLBAR_GTK_WIDGET (hinstance); | |
| 346 if (widget && GTK_WIDGET_MAPPED (widget)) | |
| 347 update_one_widget_scrollbar_pointer (w, widget); | |
| 348 | |
| 349 widget = SCROLLBAR_GTK_WIDGET (vinstance); | |
| 350 if (widget && GTK_WIDGET_MAPPED (widget)) | |
| 351 update_one_widget_scrollbar_pointer (w, widget); | |
| 352 } | |
| 353 break; | |
| 354 case GTK_WINDOW_IS_SCROLLBAR: | |
| 355 if (!mir->vchild && !mir->hchild) | |
| 356 { | |
| 357 GtkWidget *widget; | |
| 358 | |
| 359 widget = SCROLLBAR_GTK_WIDGET (hinstance); | |
| 360 if (widget && GTK_WIDGET_MAPPED (widget) && | |
| 361 GET_GTK_WIDGET_WINDOW (widget) == x_win) | |
| 362 return (struct window_mirror *) 1; | |
| 363 | |
| 364 widget = SCROLLBAR_GTK_WIDGET (vinstance); | |
| 365 if (widget && GTK_WIDGET_MAPPED (widget) && | |
| 366 GET_GTK_WIDGET_WINDOW (widget) == x_win) | |
| 367 return (struct window_mirror *) 1; | |
| 368 } | |
| 369 break; | |
| 370 default: | |
| 2500 | 371 ABORT (); |
| 462 | 372 } |
| 373 } | |
| 374 | |
| 375 mir = mir->next; | |
| 376 window = w->next; | |
| 377 } | |
| 378 | |
| 379 return NULL; | |
| 380 } | |
| 381 | |
| 382 /* Used by callbacks. */ | |
| 383 static struct window_mirror * | |
| 384 find_scrollbar_window_mirror (struct frame *f, GUI_ID id) | |
| 385 { | |
| 386 if (f->mirror_dirty) | |
| 387 update_frame_window_mirror (f); | |
| 388 return gtk_scrollbar_loop (GTK_FIND_SCROLLBAR_WINDOW_MIRROR, f->root_window, | |
| 617 | 389 XWINDOW_MIRROR (f->root_mirror), id, |
| 390 (GdkWindow *) NULL); | |
| 462 | 391 } |
| 392 | |
| 393 static gboolean | |
| 394 scrollbar_cb (GtkAdjustment *adj, gpointer user_data) | |
| 395 { | |
| 396 /* This function can GC */ | |
| 397 int vertical = (int) user_data; | |
| 2168 | 398 struct frame *f = (struct frame*) gtk_object_get_data (GTK_OBJECT (adj), GTK_DATA_FRAME_IDENTIFIER); |
| 617 | 399 struct scrollbar_instance *instance; |
| 2168 | 400 GUI_ID id = (GUI_ID) gtk_object_get_data (GTK_OBJECT (adj), GTK_DATA_GUI_IDENTIFIER); |
| 462 | 401 Lisp_Object win, frame; |
| 402 struct window_mirror *mirror; | |
| 403 Lisp_Object event_type = Qnil; | |
| 404 Lisp_Object event_data = Qnil; | |
| 405 | |
| 406 if (!f) | |
| 407 return(FALSE); | |
| 408 | |
| 409 mirror = find_scrollbar_window_mirror (f, id); | |
| 410 if (!mirror) | |
| 411 return(FALSE); | |
| 412 | |
| 413 win = real_window (mirror, 1); | |
| 414 | |
| 415 if (NILP (win)) | |
| 416 return(FALSE); | |
| 417 instance = vertical ? mirror->scrollbar_vertical_instance : mirror->scrollbar_horizontal_instance; | |
| 418 frame = WINDOW_FRAME (XWINDOW (win)); | |
| 419 | |
| 420 inhibit_slider_size_change = 0; | |
| 421 switch (GTK_RANGE (SCROLLBAR_GTK_WIDGET (instance))->scroll_type) | |
| 422 { | |
| 423 case GTK_SCROLL_PAGE_BACKWARD: | |
| 424 event_type = vertical ? Qscrollbar_page_up : Qscrollbar_page_left; | |
| 425 event_data = Fcons (win, Qnil); | |
| 426 break; | |
| 427 case GTK_SCROLL_PAGE_FORWARD: | |
| 428 event_type = vertical ? Qscrollbar_page_down : Qscrollbar_page_right; | |
| 429 event_data = Fcons (win, Qnil); | |
| 430 break; | |
| 431 case GTK_SCROLL_STEP_FORWARD: | |
| 432 event_type = vertical ? Qscrollbar_line_down : Qscrollbar_char_right; | |
| 433 event_data = win; | |
| 434 break; | |
| 435 case GTK_SCROLL_STEP_BACKWARD: | |
| 436 event_type = vertical ? Qscrollbar_line_up : Qscrollbar_char_left; | |
| 437 event_data = win; | |
| 438 break; | |
| 439 case GTK_SCROLL_NONE: | |
| 440 case GTK_SCROLL_JUMP: | |
| 441 inhibit_slider_size_change = 1; | |
| 442 event_type = vertical ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag; | |
| 443 event_data = Fcons (win, make_int ((int)adj->value)); | |
| 444 break; | |
| 445 default: | |
| 2500 | 446 ABORT(); |
| 462 | 447 } |
| 448 | |
| 449 signal_special_gtk_user_event (frame, event_type, event_data); | |
| 450 | |
| 451 return (TRUE); | |
| 452 } | |
| 453 | |
| 454 static void | |
| 455 gtk_scrollbar_pointer_changed_in_window (struct window *w) | |
| 456 { | |
| 793 | 457 Lisp_Object window = wrap_window (w); |
| 462 | 458 |
| 617 | 459 gtk_scrollbar_loop (GTK_SET_SCROLLBAR_POINTER, window, |
| 460 find_window_mirror (w), 0, (GdkWindow *) NULL); | |
| 462 | 461 } |
| 462 | |
| 463 /* #### BILL!!! This comment is not true for Gtk - should it be? */ | |
| 464 /* Make sure that all scrollbars on frame are up-to-date. Called | |
| 465 directly from gtk_set_frame_properties in frame-gtk.c*/ | |
| 466 void | |
| 467 gtk_update_frame_scrollbars (struct frame *f) | |
| 468 { | |
| 617 | 469 gtk_scrollbar_loop (GTK_UPDATE_FRAME_SCROLLBARS, f->root_window, |
| 470 XWINDOW_MIRROR (f->root_mirror), | |
| 462 | 471 0, (GdkWindow *) NULL); |
| 472 } | |
| 473 | |
| 474 #ifdef MEMORY_USAGE_STATS | |
| 475 static int | |
| 2286 | 476 gtk_compute_scrollbar_instance_usage (struct device *UNUSED (d), |
| 462 | 477 struct scrollbar_instance *inst, |
| 478 struct overhead_stats *ovstats) | |
| 479 { | |
| 480 int total = 0; | |
| 481 | |
| 482 while (inst) | |
| 483 { | |
| 484 struct gtk_scrollbar_data *data = | |
| 485 (struct gtk_scrollbar_data *) inst->scrollbar_data; | |
| 486 | |
| 2720 | 487 #ifdef MC_ALLOC |
| 488 total += mc_alloced_storage_size (sizeof (*data), ovstats); | |
| 489 #else /* not MC_ALLOC */ | |
| 462 | 490 total += malloced_storage_size (data, sizeof (*data), ovstats); |
| 2720 | 491 #endif /* not MC_ALLOC */ |
| 462 | 492 inst = inst->next; |
| 493 } | |
| 494 | |
| 495 return total; | |
| 496 } | |
| 497 | |
| 498 #endif /* MEMORY_USAGE_STATS */ | |
| 499 | |
| 500 | |
| 501 /************************************************************************/ | |
| 502 /* initialization */ | |
| 503 /************************************************************************/ | |
| 504 | |
| 505 void | |
| 506 console_type_create_scrollbar_gtk (void) | |
| 507 { | |
| 508 CONSOLE_HAS_METHOD (gtk, inhibit_scrollbar_slider_size_change); | |
| 509 CONSOLE_HAS_METHOD (gtk, free_scrollbar_instance); | |
| 510 CONSOLE_HAS_METHOD (gtk, release_scrollbar_instance); | |
| 511 CONSOLE_HAS_METHOD (gtk, create_scrollbar_instance); | |
| 512 CONSOLE_HAS_METHOD (gtk, update_scrollbar_instance_values); | |
| 513 CONSOLE_HAS_METHOD (gtk, update_scrollbar_instance_status); | |
| 514 CONSOLE_HAS_METHOD (gtk, scrollbar_pointer_changed_in_window); | |
| 515 #ifdef MEMORY_USAGE_STATS | |
| 516 CONSOLE_HAS_METHOD (gtk, compute_scrollbar_instance_usage); | |
| 517 #endif /* MEMORY_USAGE_STATS */ | |
| 518 } | |
| 519 | |
| 520 void | |
| 521 vars_of_scrollbar_gtk (void) | |
| 522 { | |
| 523 Fprovide (intern ("gtk-scrollbars")); | |
| 524 } |