Mercurial > hg > xemacs-beta
annotate src/dialog-msw.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 | ab71ad6ff3dd |
| children | 1e7cc382eb16 |
| rev | line source |
|---|---|
| 428 | 1 /* Implements elisp-programmable dialog boxes -- MS Windows interface. |
| 2 Copyright (C) 1998 Kirill M. Katsnelson <kkm@kis.ru> | |
| 2421 | 3 Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 771 | 24 /* This file essentially Mule-ized (except perhaps some Unicode splitting). |
| 25 5-2000. */ | |
| 26 | |
| 428 | 27 /* Author: |
| 28 Initially written by kkm, May 1998 | |
| 29 */ | |
| 30 | |
| 31 #include <config.h> | |
| 32 #include "lisp.h" | |
| 33 | |
| 34 #include "buffer.h" | |
| 872 | 35 #include "frame-impl.h" |
| 428 | 36 #include "gui.h" |
| 37 #include "opaque.h" | |
| 38 | |
| 872 | 39 #include "console-msw-impl.h" |
| 40 | |
| 771 | 41 #include "sysfile.h" |
| 442 | 42 |
| 43 Lisp_Object Qdialog_box_error; | |
| 44 | |
| 45 static Lisp_Object Q_initial_directory; | |
| 46 static Lisp_Object Q_initial_filename; | |
| 47 static Lisp_Object Q_filter_list; | |
| 48 static Lisp_Object Q_allow_multi_select; | |
| 49 static Lisp_Object Q_create_prompt_on_nonexistent; | |
| 50 static Lisp_Object Q_overwrite_prompt; | |
| 51 static Lisp_Object Q_file_must_exist; | |
| 52 static Lisp_Object Q_no_network_button; | |
| 53 static Lisp_Object Q_no_read_only_return; | |
| 54 | |
| 428 | 55 /* List containing all dialog data structures of currently popped up |
| 442 | 56 dialogs. */ |
| 428 | 57 static Lisp_Object Vdialog_data_list; |
| 58 | |
| 442 | 59 /* List of popup frames wanting keyboard traversal handled */ |
| 60 static Lisp_Object Vpopup_frame_list; | |
| 61 | |
| 62 Lisp_Object Vdefault_file_dialog_filter_alist; | |
| 63 | |
| 428 | 64 /* DLUs per character metrics */ |
| 65 #define X_DLU_PER_CHAR 4 | |
| 66 #define Y_DLU_PER_CHAR 8 | |
| 67 | |
| 68 /* | |
| 69 Button metrics | |
| 70 -------------- | |
| 71 All buttons have height of 15 DLU. The minimum width for a button is 32 DLU, | |
| 72 but it can be expanded to accommodate its text, so the width is calculated as | |
| 73 8 DLU per button plus 4 DLU per character. | |
| 74 max (32, 6 * text_length). The factor of six is rather empirical, but it | |
| 75 works better than 8 which comes from the definition of a DLU. Buttons are | |
| 76 spaced with 6 DLU gap. Minimum distance from the button to the left or right | |
| 77 dialog edges is 6 DLU, and the distance between the dialog bottom edge and | |
| 78 buttons is 7 DLU. | |
| 79 */ | |
| 80 | |
| 81 #define X_MIN_BUTTON 32 | |
| 82 #define X_BUTTON_MARGIN 8 | |
| 83 #define Y_BUTTON 15 | |
| 84 #define X_BUTTON_SPACING 6 | |
| 85 #define X_BUTTON_FROM_EDGE 6 | |
| 86 #define Y_BUTTON_FROM_EDGE 7 | |
| 87 | |
| 88 /* | |
| 89 Text field metrics | |
| 90 ------------------ | |
| 91 Text distance from left and right edges is the same as for buttons, and the | |
| 92 top margin is 11 DLU. The static control has height of 2 DLU per control | |
| 93 plus 8 DLU per each line of text. Distance between the bottom edge of the | |
| 94 control and the button row is 15 DLU. Minimum width of the static control | |
| 95 is 100 DLU, thus giving minimum dialog weight of 112 DLU. Maximum width is | |
| 96 300 DLU, and, if the text is wider than that, the text is wrapped on the | |
| 97 next line. Each character in the text is considered 4 DLU wide. | |
| 98 */ | |
| 99 | |
| 100 #define X_MIN_TEXT 100 | |
| 101 #define X_AVE_TEXT 200 | |
| 102 #define X_MAX_TEXT 300 | |
| 103 #define X_TEXT_FROM_EDGE X_BUTTON_FROM_EDGE | |
| 104 #define Y_TEXT_FROM_EDGE 11 | |
| 105 #define Y_TEXT_MARGIN 2 | |
| 106 #define Y_TEXT_FROM_BUTTON 15 | |
| 107 | |
| 108 #define X_MIN_TEXT_CHAR (X_MIN_TEXT / X_DLU_PER_CHAR) | |
| 109 #define X_AVE_TEXT_CHAR (X_AVE_TEXT / X_DLU_PER_CHAR) | |
| 110 #define X_MAX_TEXT_CHAR (X_MAX_TEXT / X_DLU_PER_CHAR) | |
| 111 | |
| 112 /* | |
| 113 Layout algorithm | |
| 114 ---------------- | |
| 115 First we calculate the minimum width of the button row, excluding "from | |
| 116 edge" distances. Note that the static control text can be narrower than | |
| 117 X_AVE_TEXT only if both text and button row are narrower than that (so, | |
| 118 even if text *can* be wrapped into 2 rows narrower than ave width, it is not | |
| 119 done). Let WBR denote the width of the button row. | |
| 120 | |
| 121 Next, the width of the static field is determined. | |
| 122 First, if all lines of text fit into max (WBR, X_MAX_TEXT), the width of the | |
| 123 control is the same as the width of the longest line. | |
| 124 Second, if all lines of text are narrower than X_MIN_TEXT, then width of | |
| 125 the control is set to X_MIN_TEXT. | |
| 126 Otherwise, width is set to max(WBR, X_AVE_TEXT). In this case, line wrapping will | |
| 127 happen. | |
| 128 | |
| 129 If width of the text control is larger than that of the button row, then the | |
| 130 latter is centered across the dialog, by giving it extra edge | |
| 131 margins. Otherwise, minimal margins are given to the button row. | |
| 132 */ | |
| 133 | |
| 134 #define ID_ITEM_BIAS 32 | |
| 135 | |
| 442 | 136 void |
| 137 mswindows_register_popup_frame (Lisp_Object frame) | |
| 138 { | |
| 139 Vpopup_frame_list = Fcons (frame, Vpopup_frame_list); | |
| 140 } | |
| 141 | |
| 142 void | |
| 143 mswindows_unregister_popup_frame (Lisp_Object frame) | |
| 144 { | |
| 145 Vpopup_frame_list = delq_no_quit (frame, Vpopup_frame_list); | |
| 146 } | |
| 147 | |
| 148 /* Dispatch message to any dialog boxes. Return non-zero if dispatched. */ | |
| 149 int | |
| 150 mswindows_is_dialog_msg (MSG *msg) | |
| 151 { | |
| 152 LIST_LOOP_2 (data, Vdialog_data_list) | |
| 153 { | |
| 771 | 154 if (qxeIsDialogMessage (XMSWINDOWS_DIALOG_ID (data)->hwnd, msg)) |
| 442 | 155 return 1; |
| 156 } | |
| 157 | |
| 158 { | |
| 159 LIST_LOOP_2 (popup, Vpopup_frame_list) | |
| 160 { | |
| 161 HWND hwnd = FRAME_MSWINDOWS_HANDLE (XFRAME (popup)); | |
| 444 | 162 /* This is a windows feature that allows dialog type |
| 163 processing to be applied to standard windows containing | |
| 164 controls. */ | |
| 771 | 165 if (qxeIsDialogMessage (hwnd, msg)) |
| 442 | 166 return 1; |
| 167 } | |
| 168 } | |
| 169 return 0; | |
| 170 } | |
| 171 | |
| 1204 | 172 static const struct memory_description mswindows_dialog_id_description [] = { |
| 934 | 173 { XD_LISP_OBJECT, offsetof (struct mswindows_dialog_id, frame) }, |
| 174 { XD_LISP_OBJECT, offsetof (struct mswindows_dialog_id, callbacks) }, | |
| 175 { XD_END } | |
| 176 }; | |
| 177 | |
| 442 | 178 static Lisp_Object |
| 179 mark_mswindows_dialog_id (Lisp_Object obj) | |
| 180 { | |
| 181 struct mswindows_dialog_id *data = XMSWINDOWS_DIALOG_ID (obj); | |
| 182 mark_object (data->frame); | |
| 183 return data->callbacks; | |
| 184 } | |
| 185 | |
| 934 | 186 DEFINE_LRECORD_IMPLEMENTATION ("mswindows-dialog-id", mswindows_dialog_id, |
| 964 | 187 0, /* dump-able flag */ |
| 934 | 188 mark_mswindows_dialog_id, |
| 189 internal_object_printer, 0, 0, 0, | |
| 190 mswindows_dialog_id_description, | |
| 191 struct mswindows_dialog_id); | |
| 442 | 192 |
| 428 | 193 /* Dialog procedure */ |
| 194 static BOOL CALLBACK | |
| 195 dialog_proc (HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_param) | |
| 196 { | |
| 197 switch (msg) | |
| 198 { | |
| 199 case WM_INITDIALOG: | |
| 771 | 200 qxeSetWindowLong (hwnd, DWL_USER, l_param); |
| 428 | 201 break; |
| 202 | |
| 203 case WM_DESTROY: | |
| 204 { | |
| 205 Lisp_Object data; | |
| 826 | 206 data = VOID_TO_LISP ((void *) qxeGetWindowLong (hwnd, DWL_USER)); |
| 428 | 207 Vdialog_data_list = delq_no_quit (data, Vdialog_data_list); |
| 208 } | |
| 209 break; | |
| 210 | |
| 211 case WM_COMMAND: | |
| 212 { | |
| 213 Lisp_Object fn, arg, data; | |
| 442 | 214 struct mswindows_dialog_id *did; |
| 215 | |
| 826 | 216 data = VOID_TO_LISP ((void *) qxeGetWindowLong (hwnd, DWL_USER)); |
| 442 | 217 did = XMSWINDOWS_DIALOG_ID (data); |
| 218 if (w_param != IDCANCEL) /* user pressed escape */ | |
| 219 { | |
| 220 assert (w_param >= ID_ITEM_BIAS | |
| 647 | 221 && (EMACS_INT) w_param |
| 442 | 222 < XVECTOR_LENGTH (did->callbacks) + ID_ITEM_BIAS); |
| 223 | |
| 224 get_gui_callback (XVECTOR_DATA (did->callbacks) | |
| 225 [w_param - ID_ITEM_BIAS], | |
| 226 &fn, &arg); | |
| 227 mswindows_enqueue_misc_user_event (did->frame, fn, arg); | |
| 228 } | |
| 229 else | |
| 230 mswindows_enqueue_misc_user_event (did->frame, Qrun_hooks, | |
| 231 Qmenu_no_selection_hook); | |
| 853 | 232 va_run_hook_with_args_trapping_problems |
| 1333 | 233 (Qdialog, Qdelete_dialog_box_hook, 1, data, 0); |
| 428 | 234 |
| 235 DestroyWindow (hwnd); | |
| 236 } | |
| 237 break; | |
| 238 | |
| 239 default: | |
| 240 return FALSE; | |
| 241 } | |
| 242 return TRUE; | |
| 243 } | |
| 244 | |
| 245 /* Helper function which converts the supplied string STRING into Unicode and | |
| 246 pushes it at the end of DYNARR */ | |
| 247 static void | |
| 771 | 248 push_lisp_string_as_unicode (unsigned_char_dynarr *dynarr, Lisp_Object string) |
| 428 | 249 { |
| 771 | 250 int length; |
| 251 Extbyte *uni_string; | |
| 428 | 252 |
| 440 | 253 TO_EXTERNAL_FORMAT (LISP_STRING, string, |
| 771 | 254 ALLOCA, (uni_string, length), |
| 255 Qmswindows_unicode); | |
| 256 Dynarr_add_many (dynarr, uni_string, length); | |
| 257 Dynarr_add (dynarr, '\0'); | |
| 258 Dynarr_add (dynarr, '\0'); | |
| 442 | 259 } |
| 260 | |
| 428 | 261 /* Given button TEXT, return button width in DLU */ |
| 647 | 262 static int |
| 428 | 263 button_width (Lisp_Object text) |
| 264 { | |
| 771 | 265 /* !!#### do Japanese chars count as two? */ |
| 266 int width = | |
| 267 X_DLU_PER_CHAR * | |
| 867 | 268 ibyte_string_displayed_columns (XSTRING_DATA (text), |
| 771 | 269 XSTRING_LENGTH (text)); |
| 428 | 270 return max (X_MIN_BUTTON, width); |
| 271 } | |
| 272 | |
| 273 /* Unwind protection routine frees a dynarr opaqued into arg */ | |
| 274 static Lisp_Object | |
| 275 free_dynarr_opaque_ptr (Lisp_Object arg) | |
| 276 { | |
| 277 Dynarr_free (get_opaque_ptr (arg)); | |
| 278 return arg; | |
| 279 } | |
| 280 | |
| 707 | 281 /* Unwind protection decrements dialog count */ |
| 282 static Lisp_Object | |
| 2286 | 283 dialog_popped_down (Lisp_Object UNUSED (arg)) |
| 707 | 284 { |
| 285 popup_up_p--; | |
| 771 | 286 return Qnil; |
| 707 | 287 } |
| 288 | |
| 428 | 289 |
| 647 | 290 #define ALIGN_TEMPLATE \ |
| 291 { \ | |
| 292 int slippage = Dynarr_length (template_) & 3; \ | |
| 293 if (slippage) \ | |
| 294 Dynarr_add_many (template_, &zeroes, slippage); \ | |
| 428 | 295 } |
| 296 | |
| 442 | 297 static struct |
| 298 { | |
| 647 | 299 DWORD errmess; |
| 2367 | 300 Ascbyte *errname; |
| 442 | 301 } common_dialog_errors[] = |
| 302 { | |
| 303 { CDERR_DIALOGFAILURE, "CDERR_DIALOGFAILURE" }, | |
| 304 { CDERR_FINDRESFAILURE, "CDERR_FINDRESFAILURE" }, | |
| 305 { CDERR_INITIALIZATION, "CDERR_INITIALIZATION" }, | |
| 306 { CDERR_LOADRESFAILURE, "CDERR_LOADRESFAILURE" }, | |
| 307 { CDERR_LOADSTRFAILURE, "CDERR_LOADSTRFAILURE" }, | |
| 308 { CDERR_LOCKRESFAILURE, "CDERR_LOCKRESFAILURE" }, | |
| 309 { CDERR_MEMALLOCFAILURE, "CDERR_MEMALLOCFAILURE" }, | |
| 310 { CDERR_MEMLOCKFAILURE, "CDERR_MEMLOCKFAILURE" }, | |
| 311 { CDERR_NOHINSTANCE, "CDERR_NOHINSTANCE" }, | |
| 312 { CDERR_NOHOOK, "CDERR_NOHOOK" }, | |
| 313 { CDERR_NOTEMPLATE, "CDERR_NOTEMPLATE" }, | |
| 314 { CDERR_REGISTERMSGFAIL, "CDERR_REGISTERMSGFAIL" }, | |
| 315 { CDERR_STRUCTSIZE, "CDERR_STRUCTSIZE" }, | |
| 316 { PDERR_CREATEICFAILURE, "PDERR_CREATEICFAILURE" }, | |
| 317 { PDERR_DEFAULTDIFFERENT, "PDERR_DEFAULTDIFFERENT" }, | |
| 318 { PDERR_DNDMMISMATCH, "PDERR_DNDMMISMATCH" }, | |
| 319 { PDERR_GETDEVMODEFAIL, "PDERR_GETDEVMODEFAIL" }, | |
| 320 { PDERR_INITFAILURE, "PDERR_INITFAILURE" }, | |
| 321 { PDERR_LOADDRVFAILURE, "PDERR_LOADDRVFAILURE" }, | |
| 322 { PDERR_NODEFAULTPRN, "PDERR_NODEFAULTPRN" }, | |
| 323 { PDERR_NODEVICES, "PDERR_NODEVICES" }, | |
| 324 { PDERR_PARSEFAILURE, "PDERR_PARSEFAILURE" }, | |
| 325 { PDERR_PRINTERNOTFOUND, "PDERR_PRINTERNOTFOUND" }, | |
| 326 { PDERR_RETDEFFAILURE, "PDERR_RETDEFFAILURE" }, | |
| 327 { PDERR_SETUPFAILURE, "PDERR_SETUPFAILURE" }, | |
| 328 { CFERR_MAXLESSTHANMIN, "CFERR_MAXLESSTHANMIN" }, | |
| 329 { CFERR_NOFONTS, "CFERR_NOFONTS" }, | |
| 330 { FNERR_BUFFERTOOSMALL, "FNERR_BUFFERTOOSMALL" }, | |
| 331 { FNERR_INVALIDFILENAME, "FNERR_INVALIDFILENAME" }, | |
| 332 { FNERR_SUBCLASSFAILURE, "FNERR_SUBCLASSFAILURE" }, | |
| 333 { FRERR_BUFFERLENGTHZERO, "FRERR_BUFFERLENGTHZERO" }, | |
| 334 }; | |
| 335 | |
| 771 | 336 struct param_data |
| 337 { | |
| 338 Extbyte *fname; | |
| 339 Extbyte *unknown_fname; | |
| 673 | 340 int validate; |
| 341 }; | |
| 342 | |
| 343 static int | |
| 344 CALLBACK handle_directory_proc (HWND hwnd, UINT msg, | |
| 345 LPARAM lParam, LPARAM lpData) | |
| 346 { | |
| 2421 | 347 Extbyte szDir[PATH_MAX_EXTERNAL]; |
| 771 | 348 struct param_data *pd = (struct param_data *) lpData; |
| 673 | 349 |
| 771 | 350 switch (msg) |
| 351 { | |
| 352 case BFFM_INITIALIZED: | |
| 353 /* WParam is TRUE since you are passing a path. | |
| 354 It would be FALSE if you were passing a pidl. */ | |
| 355 qxeSendMessage (hwnd, BFFM_SETSELECTION, TRUE, (LPARAM) pd->fname); | |
| 356 break; | |
| 357 | |
| 358 case BFFM_SELCHANGED: | |
| 359 /* Set the status window to the currently selected path. */ | |
| 360 if (qxeSHGetPathFromIDList ((LPITEMIDLIST) lParam, szDir)) | |
| 361 qxeSendMessage (hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM) szDir); | |
| 362 break; | |
| 363 | |
| 364 case BFFM_VALIDATEFAILED: | |
| 365 if (pd->validate) | |
| 366 return TRUE; | |
| 367 else | |
| 2421 | 368 pd->unknown_fname = qxetcsdup ((Extbyte *) lParam); |
| 771 | 369 break; |
| 370 | |
| 371 default: | |
| 372 break; | |
| 673 | 373 } |
| 374 return 0; | |
| 375 } | |
| 376 | |
| 377 static Lisp_Object | |
| 378 handle_directory_dialog_box (struct frame *f, Lisp_Object keys) | |
| 379 { | |
| 380 Lisp_Object ret = Qnil; | |
| 771 | 381 BROWSEINFOW bi; |
| 673 | 382 LPITEMIDLIST pidl; |
| 383 LPMALLOC pMalloc; | |
| 384 struct param_data pd; | |
| 771 | 385 |
| 386 xzero (pd); | |
| 387 xzero (bi); | |
| 388 | |
| 389 bi.lParam = (LPARAM) &pd; | |
| 673 | 390 bi.hwndOwner = FRAME_MSWINDOWS_HANDLE (f); |
| 391 bi.pszDisplayName = 0; | |
| 392 bi.pidlRoot = 0; | |
| 771 | 393 bi.ulFlags = |
| 394 BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_EDITBOX | BIF_NEWDIALOGSTYLE; | |
| 673 | 395 bi.lpfn = handle_directory_proc; |
| 771 | 396 |
| 673 | 397 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil), |
| 771 | 398 pd.fname); |
| 399 | |
| 673 | 400 { |
| 401 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) | |
| 402 { | |
| 403 if (EQ (key, Q_title)) | |
| 404 { | |
| 405 CHECK_STRING (value); | |
| 406 LISP_STRING_TO_EXTERNAL (value, bi.lpszTitle, Qmswindows_tstr); | |
| 407 } | |
| 408 else if (EQ (key, Q_initial_directory)) | |
| 409 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil), | |
| 410 pd.fname); | |
| 411 else if (EQ (key, Q_initial_filename)) | |
| 412 ; /* do nothing */ | |
| 413 else if (EQ (key, Q_file_must_exist)) | |
| 414 { | |
| 771 | 415 if (!NILP (value)) |
| 416 { | |
| 417 pd.validate = TRUE; | |
| 418 bi.ulFlags |= BIF_VALIDATE; | |
| 419 } | |
| 673 | 420 else |
| 421 bi.ulFlags &= ~BIF_VALIDATE; | |
| 422 } | |
| 423 else | |
| 424 invalid_constant ("Unrecognized directory-dialog keyword", key); | |
| 425 } | |
| 426 } | |
| 771 | 427 |
| 428 if (SHGetMalloc (&pMalloc) == NOERROR) | |
| 673 | 429 { |
| 771 | 430 pidl = qxeSHBrowseForFolder (&bi); |
| 431 if (pidl) | |
| 432 { | |
| 2421 | 433 Extbyte *szDir = alloca_extbytes (PATH_MAX_EXTERNAL); |
| 771 | 434 |
| 435 if (qxeSHGetPathFromIDList (pidl, szDir)) | |
| 436 ret = tstr_to_local_file_format (szDir); | |
| 437 | |
| 438 XECOMCALL1 (pMalloc, Free, pidl); | |
| 439 XECOMCALL0 (pMalloc, Release); | |
| 440 return ret; | |
| 673 | 441 } |
| 771 | 442 else if (pd.unknown_fname != 0) |
| 443 { | |
| 444 ret = tstr_to_local_file_format (pd.unknown_fname); | |
| 1726 | 445 xfree (pd.unknown_fname, Extbyte *); |
| 771 | 446 } |
| 707 | 447 else while (1) |
| 448 signal_quit (); | |
| 673 | 449 } |
| 450 else | |
| 451 signal_error (Qdialog_box_error, | |
| 452 "Unable to create folder browser", | |
| 453 make_int (0)); | |
| 454 return ret; | |
| 455 } | |
| 456 | |
| 442 | 457 static Lisp_Object |
| 458 handle_file_dialog_box (struct frame *f, Lisp_Object keys) | |
| 459 { | |
| 771 | 460 OPENFILENAMEW ofn; |
| 461 Extbyte fnbuf[8000]; | |
| 673 | 462 |
| 442 | 463 xzero (ofn); |
| 464 ofn.lStructSize = sizeof (ofn); | |
| 673 | 465 ofn.Flags = OFN_EXPLORER; |
| 442 | 466 ofn.hwndOwner = FRAME_MSWINDOWS_HANDLE (f); |
| 771 | 467 ofn.lpstrFile = (XELPTSTR) fnbuf; |
| 442 | 468 ofn.nMaxFile = sizeof (fnbuf) / XETCHAR_SIZE; |
| 2421 | 469 qxetcscpy (fnbuf, XETEXT ("")); |
| 771 | 470 |
| 442 | 471 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil), |
| 472 ofn.lpstrInitialDir); | |
| 771 | 473 |
| 442 | 474 { |
| 475 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) | |
| 476 { | |
| 477 if (EQ (key, Q_initial_filename)) | |
| 478 { | |
| 479 Extbyte *fnout; | |
| 771 | 480 |
| 442 | 481 CHECK_STRING (value); |
| 482 LOCAL_FILE_FORMAT_TO_TSTR (value, fnout); | |
| 2421 | 483 qxetcscpy (fnbuf, fnout); |
| 442 | 484 } |
| 485 else if (EQ (key, Q_title)) | |
| 486 { | |
| 487 CHECK_STRING (value); | |
| 771 | 488 LISP_STRING_TO_TSTR (value, ofn.lpstrTitle); |
| 442 | 489 } |
| 490 else if (EQ (key, Q_initial_directory)) | |
| 491 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil), | |
| 492 ofn.lpstrInitialDir); | |
| 493 else if (EQ (key, Q_file_must_exist)) | |
| 494 { | |
| 495 if (!NILP (value)) | |
| 496 ofn.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; | |
| 497 else | |
| 498 ofn.Flags &= ~(OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST); | |
| 499 } | |
| 500 else | |
| 563 | 501 invalid_constant ("Unrecognized file-dialog keyword", key); |
| 442 | 502 } |
| 503 } | |
| 771 | 504 |
| 505 if (!qxeGetOpenFileName (&ofn)) | |
| 442 | 506 { |
| 507 DWORD err = CommDlgExtendedError (); | |
| 508 if (!err) | |
| 509 { | |
| 510 while (1) | |
| 511 signal_quit (); | |
| 512 } | |
| 513 else | |
| 514 { | |
| 515 int i; | |
| 771 | 516 |
| 442 | 517 for (i = 0; i < countof (common_dialog_errors); i++) |
| 518 { | |
| 519 if (common_dialog_errors[i].errmess == err) | |
| 563 | 520 signal_error (Qdialog_box_error, |
| 521 "Creating file-dialog-box", | |
| 771 | 522 build_msg_string |
| 563 | 523 (common_dialog_errors[i].errname)); |
| 442 | 524 } |
| 771 | 525 |
| 563 | 526 signal_error (Qdialog_box_error, |
| 527 "Unknown common dialog box error???", | |
| 528 make_int (err)); | |
| 442 | 529 } |
| 530 } | |
| 771 | 531 |
| 532 return tstr_to_local_file_format ((Extbyte *) ofn.lpstrFile); | |
| 442 | 533 } |
| 534 | |
| 535 static Lisp_Object | |
| 536 handle_question_dialog_box (struct frame *f, Lisp_Object keys) | |
| 428 | 537 { |
| 538 Lisp_Object_dynarr *dialog_items = Dynarr_new (Lisp_Object); | |
| 593 | 539 unsigned_char_dynarr *template_ = Dynarr_new (unsigned_char); |
| 647 | 540 int button_row_width = 0; |
| 541 int text_width, text_height; | |
| 442 | 542 Lisp_Object question = Qnil, title = Qnil; |
| 771 | 543 |
| 428 | 544 int unbind_count = specpdl_depth (); |
| 545 record_unwind_protect (free_dynarr_opaque_ptr, | |
| 546 make_opaque_ptr (dialog_items)); | |
| 547 record_unwind_protect (free_dynarr_opaque_ptr, | |
| 593 | 548 make_opaque_ptr (template_)); |
| 771 | 549 |
| 428 | 550 /* A big NO NEED to GCPRO gui_items stored in the array: they are just |
| 442 | 551 pointers into KEYS list, which is GC-protected by the caller */ |
| 771 | 552 |
| 428 | 553 { |
| 442 | 554 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) |
| 428 | 555 { |
| 442 | 556 if (EQ (key, Q_question)) |
| 557 { | |
| 558 CHECK_STRING (value); | |
| 559 question = value; | |
| 560 } | |
| 561 else if (EQ (key, Q_title)) | |
| 562 { | |
| 563 CHECK_STRING (value); | |
| 564 title = value; | |
| 565 } | |
| 566 else if (EQ (key, Q_buttons)) | |
| 428 | 567 { |
| 442 | 568 /* Parse each item in the dialog into gui_item structs, |
| 569 and stuff a dynarr of these. Calculate button row width | |
| 570 in this loop too */ | |
| 2367 | 571 EXTERNAL_LIST_LOOP_2 (item, value) |
| 442 | 572 { |
| 2367 | 573 if (!NILP (item)) |
| 442 | 574 { |
| 2367 | 575 Lisp_Object gitem = gui_parse_item_keywords (item); |
| 442 | 576 Dynarr_add (dialog_items, gitem); |
| 577 button_row_width += button_width (XGUI_ITEM (gitem)->name) | |
| 578 + X_BUTTON_MARGIN; | |
| 579 } | |
| 580 } | |
| 771 | 581 |
| 442 | 582 button_row_width -= X_BUTTON_MARGIN; |
| 428 | 583 } |
| 442 | 584 else |
| 563 | 585 invalid_constant ("Unrecognized question-dialog keyword", key); |
| 428 | 586 } |
| 587 } | |
| 771 | 588 |
| 442 | 589 if (Dynarr_length (dialog_items) == 0) |
| 563 | 590 sferror ("Dialog descriptor provides no buttons", keys); |
| 771 | 591 |
| 442 | 592 if (NILP (question)) |
| 563 | 593 sferror ("Dialog descriptor provides no question", keys); |
| 771 | 594 |
| 428 | 595 /* Determine the final width layout */ |
| 596 { | |
| 867 | 597 Ibyte *p = XSTRING_DATA (question); |
| 428 | 598 Charcount string_max = 0, this_length = 0; |
| 599 while (1) | |
| 600 { | |
| 867 | 601 Ichar ch = itext_ichar (p); |
| 602 INC_IBYTEPTR (p); | |
| 428 | 603 |
| 867 | 604 if (ch == (Ichar)'\n' || ch == (Ichar)'\0') |
| 428 | 605 { |
| 606 string_max = max (this_length, string_max); | |
| 607 this_length = 0; | |
| 608 } | |
| 609 else | |
| 610 ++this_length; | |
| 771 | 611 |
| 867 | 612 if (ch == (Ichar)'\0') |
| 428 | 613 break; |
| 614 } | |
| 771 | 615 |
| 428 | 616 if (string_max * X_DLU_PER_CHAR > max (X_MAX_TEXT, button_row_width)) |
| 617 text_width = X_AVE_TEXT; | |
| 618 else if (string_max * X_DLU_PER_CHAR < X_MIN_TEXT) | |
| 619 text_width = X_MIN_TEXT; | |
| 620 else | |
| 621 text_width = string_max * X_DLU_PER_CHAR; | |
| 622 text_width = max (text_width, button_row_width); | |
| 623 } | |
| 624 | |
| 625 /* Now calculate the height for the text control */ | |
| 626 { | |
| 867 | 627 Ibyte *p = XSTRING_DATA (question); |
| 428 | 628 Charcount break_at = text_width / X_DLU_PER_CHAR; |
| 629 Charcount char_pos = 0; | |
| 630 int num_lines = 1; | |
| 867 | 631 Ichar ch; |
| 428 | 632 |
| 867 | 633 while ((ch = itext_ichar (p)) != (Ichar) '\0') |
| 428 | 634 { |
| 867 | 635 INC_IBYTEPTR (p); |
| 636 char_pos += ch != (Ichar) '\n'; | |
| 637 if (ch == (Ichar) '\n' || char_pos == break_at) | |
| 428 | 638 { |
| 639 ++num_lines; | |
| 640 char_pos = 0; | |
| 641 } | |
| 642 } | |
| 643 text_height = Y_TEXT_MARGIN + Y_DLU_PER_CHAR * num_lines; | |
| 644 } | |
| 771 | 645 |
| 428 | 646 /* Ok, now we are ready to stuff the dialog template and lay out controls */ |
| 647 { | |
| 648 DLGTEMPLATE dlg_tem; | |
| 649 DLGITEMTEMPLATE item_tem; | |
| 650 int i; | |
| 651 const unsigned int zeroes = 0; | |
| 652 const unsigned int ones = 0xFFFFFFFF; | |
| 653 const WORD static_class_id = 0x0082; | |
| 654 const WORD button_class_id = 0x0080; | |
| 771 | 655 |
| 428 | 656 /* Create and stuff in DLGTEMPLATE header */ |
| 771 | 657 dlg_tem.style = (DS_CENTER | DS_MODALFRAME |
| 428 | 658 | WS_CAPTION | WS_POPUP | WS_VISIBLE); |
| 659 dlg_tem.dwExtendedStyle = 0; | |
| 660 dlg_tem.cdit = Dynarr_length (dialog_items) + 1; | |
| 661 dlg_tem.x = 0; | |
| 662 dlg_tem.y = 0; | |
| 663 dlg_tem.cx = text_width + 2 * X_TEXT_FROM_EDGE; | |
| 664 dlg_tem.cy = (Y_TEXT_FROM_EDGE + text_height + Y_TEXT_FROM_BUTTON | |
| 665 + Y_BUTTON + Y_BUTTON_FROM_EDGE); | |
| 593 | 666 Dynarr_add_many (template_, &dlg_tem, sizeof (dlg_tem)); |
| 771 | 667 |
| 428 | 668 /* We want no menu and standard class */ |
| 593 | 669 Dynarr_add_many (template_, &zeroes, 4); |
| 771 | 670 |
| 442 | 671 /* And the third is the dialog title. "XEmacs" unless one is supplied. |
| 672 Note that the string must be in Unicode. */ | |
| 673 if (NILP (title)) | |
| 593 | 674 Dynarr_add_many (template_, L"XEmacs", 14); |
| 442 | 675 else |
| 593 | 676 push_lisp_string_as_unicode (template_, title); |
| 771 | 677 |
| 428 | 678 /* Next add text control. */ |
| 679 item_tem.style = WS_CHILD | WS_VISIBLE | SS_LEFT | SS_NOPREFIX; | |
| 680 item_tem.dwExtendedStyle = 0; | |
| 681 item_tem.x = X_TEXT_FROM_EDGE; | |
| 682 item_tem.y = Y_TEXT_FROM_EDGE; | |
| 683 item_tem.cx = text_width; | |
| 684 item_tem.cy = text_height; | |
| 685 item_tem.id = 0xFFFF; | |
| 771 | 686 |
| 428 | 687 ALIGN_TEMPLATE; |
| 593 | 688 Dynarr_add_many (template_, &item_tem, sizeof (item_tem)); |
| 771 | 689 |
| 428 | 690 /* Right after class id follows */ |
| 593 | 691 Dynarr_add_many (template_, &ones, 2); |
| 692 Dynarr_add_many (template_, &static_class_id, sizeof (static_class_id)); | |
| 771 | 693 |
| 428 | 694 /* Next thing to add is control text, as Unicode string */ |
| 593 | 695 push_lisp_string_as_unicode (template_, question); |
| 771 | 696 |
| 428 | 697 /* Specify 0 length creation data */ |
| 593 | 698 Dynarr_add_many (template_, &zeroes, 2); |
| 771 | 699 |
| 428 | 700 /* Now it's the button time */ |
| 701 item_tem.y = Y_TEXT_FROM_EDGE + text_height + Y_TEXT_FROM_BUTTON; | |
| 702 item_tem.x = X_BUTTON_FROM_EDGE + (button_row_width < text_width | |
| 703 ? (text_width - button_row_width) / 2 | |
| 704 : 0); | |
| 705 item_tem.cy = Y_BUTTON; | |
| 706 item_tem.dwExtendedStyle = 0; | |
| 771 | 707 |
| 428 | 708 for (i = 0; i < Dynarr_length (dialog_items); ++i) |
| 709 { | |
| 771 | 710 Lisp_Object *gui_item = Dynarr_atp (dialog_items, i); |
| 440 | 711 Lisp_Gui_Item *pgui_item = XGUI_ITEM (*gui_item); |
| 771 | 712 |
| 428 | 713 item_tem.style = (WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON |
| 1913 | 714 | (gui_item_active_p (*gui_item) ? 0 : WS_DISABLED)); |
| 428 | 715 item_tem.cx = button_width (pgui_item->name); |
| 716 /* Item ids are indices into dialog_items plus offset, to avoid having | |
| 717 items by reserved ids (IDOK, IDCANCEL) */ | |
| 718 item_tem.id = i + ID_ITEM_BIAS; | |
| 771 | 719 |
| 428 | 720 ALIGN_TEMPLATE; |
| 593 | 721 Dynarr_add_many (template_, &item_tem, sizeof (item_tem)); |
| 771 | 722 |
| 428 | 723 /* Right after 0xFFFF and class id atom follows */ |
| 593 | 724 Dynarr_add_many (template_, &ones, 2); |
| 725 Dynarr_add_many (template_, &button_class_id, | |
| 726 sizeof (button_class_id)); | |
| 771 | 727 |
| 428 | 728 /* Next thing to add is control text, as Unicode string */ |
| 442 | 729 { |
| 867 | 730 Ichar accel_unused; |
| 771 | 731 |
| 732 push_lisp_string_as_unicode | |
| 733 (template_, | |
| 734 mswindows_translate_menu_or_dialog_item | |
| 735 (pgui_item->name, &accel_unused)); | |
| 442 | 736 } |
| 771 | 737 |
| 428 | 738 /* Specify 0 length creation data. */ |
| 593 | 739 Dynarr_add_many (template_, &zeroes, 2); |
| 771 | 740 |
| 428 | 741 item_tem.x += item_tem.cx + X_BUTTON_SPACING; |
| 742 } | |
| 743 } | |
| 771 | 744 |
| 428 | 745 /* Now the Windows dialog structure is ready. We need to prepare a |
| 746 data structure for the new dialog, which will contain callbacks | |
| 442 | 747 and the frame for these callbacks. This structure has to be |
| 748 GC-protected and thus it is put into a statically protected | |
| 749 list. */ | |
| 428 | 750 { |
| 442 | 751 Lisp_Object dialog_data; |
| 428 | 752 int i; |
| 442 | 753 struct mswindows_dialog_id *did = |
| 2720 | 754 #ifdef MC_ALLOC |
| 755 alloc_lrecord_type (struct mswindows_dialog_id, | |
| 756 &lrecord_mswindows_dialog_id); | |
| 757 #else /* not MC_ALLOC */ | |
| 442 | 758 alloc_lcrecord_type (struct mswindows_dialog_id, |
| 759 &lrecord_mswindows_dialog_id); | |
| 2720 | 760 #endif /* not MC_ALLOC */ |
| 771 | 761 |
| 793 | 762 dialog_data = wrap_mswindows_dialog_id (did); |
| 771 | 763 |
| 442 | 764 did->frame = wrap_frame (f); |
| 765 did->callbacks = make_vector (Dynarr_length (dialog_items), Qunbound); | |
| 766 for (i = 0; i < Dynarr_length (dialog_items); i++) | |
| 767 XVECTOR_DATA (did->callbacks) [i] = | |
| 768 XGUI_ITEM (*Dynarr_atp (dialog_items, i))->callback; | |
| 428 | 769 |
| 770 /* Woof! Everything is ready. Pop pop pop in now! */ | |
| 442 | 771 did->hwnd = |
| 771 | 772 qxeCreateDialogIndirectParam (NULL, |
| 773 (LPDLGTEMPLATE) Dynarr_atp (template_, 0), | |
| 774 FRAME_MSWINDOWS_HANDLE (f), dialog_proc, | |
| 775 (LPARAM) LISP_TO_VOID (dialog_data)); | |
| 442 | 776 if (!did->hwnd) |
| 428 | 777 /* Something went wrong creating the dialog */ |
| 563 | 778 signal_error (Qdialog_box_error, "Creating dialog", keys); |
| 771 | 779 |
| 428 | 780 Vdialog_data_list = Fcons (dialog_data, Vdialog_data_list); |
| 771 | 781 |
| 442 | 782 /* Cease protection and free dynarrays */ |
| 771 | 783 unbind_to (unbind_count); |
| 442 | 784 return dialog_data; |
| 428 | 785 } |
| 442 | 786 } |
| 428 | 787 |
| 442 | 788 static Lisp_Object |
| 789 mswindows_make_dialog_box_internal (struct frame* f, Lisp_Object type, | |
| 790 Lisp_Object keys) | |
| 791 { | |
| 707 | 792 int unbind_count = specpdl_depth (); |
| 793 record_unwind_protect (dialog_popped_down, Qnil); | |
| 794 popup_up_p++; | |
| 819 | 795 |
| 442 | 796 if (EQ (type, Qfile)) |
| 771 | 797 return unbind_to_1 (unbind_count, handle_file_dialog_box (f, keys)); |
| 673 | 798 else if (EQ (type, Qdirectory)) |
| 771 | 799 return unbind_to_1 (unbind_count, handle_directory_dialog_box (f, keys)); |
| 442 | 800 else if (EQ (type, Qquestion)) |
| 771 | 801 return unbind_to_1 (unbind_count, handle_question_dialog_box (f, keys)); |
| 442 | 802 else if (EQ (type, Qprint)) |
| 771 | 803 return unbind_to_1 (unbind_count, |
| 804 mswindows_handle_print_dialog_box (f, keys)); | |
| 442 | 805 else if (EQ (type, Qpage_setup)) |
| 771 | 806 return unbind_to_1 (unbind_count, |
| 807 mswindows_handle_page_setup_dialog_box (f, keys)); | |
| 442 | 808 else |
| 563 | 809 signal_error (Qunimplemented, "Dialog box type", type); |
| 442 | 810 return Qnil; |
| 428 | 811 } |
| 812 | |
| 813 void | |
| 814 console_type_create_dialog_mswindows (void) | |
| 815 { | |
| 442 | 816 CONSOLE_HAS_METHOD (mswindows, make_dialog_box_internal); |
| 817 } | |
| 818 | |
| 819 void | |
| 820 syms_of_dialog_mswindows (void) | |
| 821 { | |
| 822 INIT_LRECORD_IMPLEMENTATION (mswindows_dialog_id); | |
| 771 | 823 |
| 442 | 824 DEFKEYWORD (Q_initial_directory); |
| 825 DEFKEYWORD (Q_initial_filename); | |
| 826 DEFKEYWORD (Q_filter_list); | |
| 827 DEFKEYWORD (Q_title); | |
| 828 DEFKEYWORD (Q_allow_multi_select); | |
| 829 DEFKEYWORD (Q_create_prompt_on_nonexistent); | |
| 830 DEFKEYWORD (Q_overwrite_prompt); | |
| 831 DEFKEYWORD (Q_file_must_exist); | |
| 832 DEFKEYWORD (Q_no_network_button); | |
| 833 DEFKEYWORD (Q_no_read_only_return); | |
| 771 | 834 |
| 442 | 835 /* Errors */ |
| 563 | 836 DEFERROR_STANDARD (Qdialog_box_error, Qgui_error); |
| 428 | 837 } |
| 838 | |
| 839 void | |
| 840 vars_of_dialog_mswindows (void) | |
| 841 { | |
| 442 | 842 Vpopup_frame_list = Qnil; |
| 843 staticpro (&Vpopup_frame_list); | |
| 771 | 844 |
| 428 | 845 Vdialog_data_list = Qnil; |
| 846 staticpro (&Vdialog_data_list); | |
| 771 | 847 |
| 442 | 848 DEFVAR_LISP ("default-file-dialog-filter-alist", |
| 849 &Vdefault_file_dialog_filter_alist /* | |
| 771 | 850 */ ); |
| 442 | 851 Vdefault_file_dialog_filter_alist = |
| 771 | 852 list5 (Fcons (build_msg_string ("Text Files"), build_string ("*.txt")), |
| 853 Fcons (build_msg_string ("C Files"), build_string ("*.c;*.h")), | |
| 854 Fcons (build_msg_string ("Elisp Files"), build_string ("*.el")), | |
| 855 Fcons (build_msg_string ("HTML Files"), build_string ("*.html;*.html")), | |
| 856 Fcons (build_msg_string ("All Files"), build_string ("*.*"))); | |
| 428 | 857 } |