Mercurial > hg > xemacs-beta
view 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 |
line wrap: on
line source
/* Implements elisp-programmable dialog boxes -- MS Windows interface. Copyright (C) 1998 Kirill M. Katsnelson <kkm@kis.ru> Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file essentially Mule-ized (except perhaps some Unicode splitting). 5-2000. */ /* Author: Initially written by kkm, May 1998 */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "frame-impl.h" #include "gui.h" #include "opaque.h" #include "console-msw-impl.h" #include "sysfile.h" Lisp_Object Qdialog_box_error; static Lisp_Object Q_initial_directory; static Lisp_Object Q_initial_filename; static Lisp_Object Q_filter_list; static Lisp_Object Q_allow_multi_select; static Lisp_Object Q_create_prompt_on_nonexistent; static Lisp_Object Q_overwrite_prompt; static Lisp_Object Q_file_must_exist; static Lisp_Object Q_no_network_button; static Lisp_Object Q_no_read_only_return; /* List containing all dialog data structures of currently popped up dialogs. */ static Lisp_Object Vdialog_data_list; /* List of popup frames wanting keyboard traversal handled */ static Lisp_Object Vpopup_frame_list; Lisp_Object Vdefault_file_dialog_filter_alist; /* DLUs per character metrics */ #define X_DLU_PER_CHAR 4 #define Y_DLU_PER_CHAR 8 /* Button metrics -------------- All buttons have height of 15 DLU. The minimum width for a button is 32 DLU, but it can be expanded to accommodate its text, so the width is calculated as 8 DLU per button plus 4 DLU per character. max (32, 6 * text_length). The factor of six is rather empirical, but it works better than 8 which comes from the definition of a DLU. Buttons are spaced with 6 DLU gap. Minimum distance from the button to the left or right dialog edges is 6 DLU, and the distance between the dialog bottom edge and buttons is 7 DLU. */ #define X_MIN_BUTTON 32 #define X_BUTTON_MARGIN 8 #define Y_BUTTON 15 #define X_BUTTON_SPACING 6 #define X_BUTTON_FROM_EDGE 6 #define Y_BUTTON_FROM_EDGE 7 /* Text field metrics ------------------ Text distance from left and right edges is the same as for buttons, and the top margin is 11 DLU. The static control has height of 2 DLU per control plus 8 DLU per each line of text. Distance between the bottom edge of the control and the button row is 15 DLU. Minimum width of the static control is 100 DLU, thus giving minimum dialog weight of 112 DLU. Maximum width is 300 DLU, and, if the text is wider than that, the text is wrapped on the next line. Each character in the text is considered 4 DLU wide. */ #define X_MIN_TEXT 100 #define X_AVE_TEXT 200 #define X_MAX_TEXT 300 #define X_TEXT_FROM_EDGE X_BUTTON_FROM_EDGE #define Y_TEXT_FROM_EDGE 11 #define Y_TEXT_MARGIN 2 #define Y_TEXT_FROM_BUTTON 15 #define X_MIN_TEXT_CHAR (X_MIN_TEXT / X_DLU_PER_CHAR) #define X_AVE_TEXT_CHAR (X_AVE_TEXT / X_DLU_PER_CHAR) #define X_MAX_TEXT_CHAR (X_MAX_TEXT / X_DLU_PER_CHAR) /* Layout algorithm ---------------- First we calculate the minimum width of the button row, excluding "from edge" distances. Note that the static control text can be narrower than X_AVE_TEXT only if both text and button row are narrower than that (so, even if text *can* be wrapped into 2 rows narrower than ave width, it is not done). Let WBR denote the width of the button row. Next, the width of the static field is determined. First, if all lines of text fit into max (WBR, X_MAX_TEXT), the width of the control is the same as the width of the longest line. Second, if all lines of text are narrower than X_MIN_TEXT, then width of the control is set to X_MIN_TEXT. Otherwise, width is set to max(WBR, X_AVE_TEXT). In this case, line wrapping will happen. If width of the text control is larger than that of the button row, then the latter is centered across the dialog, by giving it extra edge margins. Otherwise, minimal margins are given to the button row. */ #define ID_ITEM_BIAS 32 void mswindows_register_popup_frame (Lisp_Object frame) { Vpopup_frame_list = Fcons (frame, Vpopup_frame_list); } void mswindows_unregister_popup_frame (Lisp_Object frame) { Vpopup_frame_list = delq_no_quit (frame, Vpopup_frame_list); } /* Dispatch message to any dialog boxes. Return non-zero if dispatched. */ int mswindows_is_dialog_msg (MSG *msg) { LIST_LOOP_2 (data, Vdialog_data_list) { if (qxeIsDialogMessage (XMSWINDOWS_DIALOG_ID (data)->hwnd, msg)) return 1; } { LIST_LOOP_2 (popup, Vpopup_frame_list) { HWND hwnd = FRAME_MSWINDOWS_HANDLE (XFRAME (popup)); /* This is a windows feature that allows dialog type processing to be applied to standard windows containing controls. */ if (qxeIsDialogMessage (hwnd, msg)) return 1; } } return 0; } static const struct memory_description mswindows_dialog_id_description [] = { { XD_LISP_OBJECT, offsetof (struct mswindows_dialog_id, frame) }, { XD_LISP_OBJECT, offsetof (struct mswindows_dialog_id, callbacks) }, { XD_END } }; static Lisp_Object mark_mswindows_dialog_id (Lisp_Object obj) { struct mswindows_dialog_id *data = XMSWINDOWS_DIALOG_ID (obj); mark_object (data->frame); return data->callbacks; } DEFINE_LRECORD_IMPLEMENTATION ("mswindows-dialog-id", mswindows_dialog_id, 0, /* dump-able flag */ mark_mswindows_dialog_id, internal_object_printer, 0, 0, 0, mswindows_dialog_id_description, struct mswindows_dialog_id); /* Dialog procedure */ static BOOL CALLBACK dialog_proc (HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { switch (msg) { case WM_INITDIALOG: qxeSetWindowLong (hwnd, DWL_USER, l_param); break; case WM_DESTROY: { Lisp_Object data; data = VOID_TO_LISP ((void *) qxeGetWindowLong (hwnd, DWL_USER)); Vdialog_data_list = delq_no_quit (data, Vdialog_data_list); } break; case WM_COMMAND: { Lisp_Object fn, arg, data; struct mswindows_dialog_id *did; data = VOID_TO_LISP ((void *) qxeGetWindowLong (hwnd, DWL_USER)); did = XMSWINDOWS_DIALOG_ID (data); if (w_param != IDCANCEL) /* user pressed escape */ { assert (w_param >= ID_ITEM_BIAS && (EMACS_INT) w_param < XVECTOR_LENGTH (did->callbacks) + ID_ITEM_BIAS); get_gui_callback (XVECTOR_DATA (did->callbacks) [w_param - ID_ITEM_BIAS], &fn, &arg); mswindows_enqueue_misc_user_event (did->frame, fn, arg); } else mswindows_enqueue_misc_user_event (did->frame, Qrun_hooks, Qmenu_no_selection_hook); va_run_hook_with_args_trapping_problems (Qdialog, Qdelete_dialog_box_hook, 1, data, 0); DestroyWindow (hwnd); } break; default: return FALSE; } return TRUE; } /* Helper function which converts the supplied string STRING into Unicode and pushes it at the end of DYNARR */ static void push_lisp_string_as_unicode (unsigned_char_dynarr *dynarr, Lisp_Object string) { int length; Extbyte *uni_string; TO_EXTERNAL_FORMAT (LISP_STRING, string, ALLOCA, (uni_string, length), Qmswindows_unicode); Dynarr_add_many (dynarr, uni_string, length); Dynarr_add (dynarr, '\0'); Dynarr_add (dynarr, '\0'); } /* Given button TEXT, return button width in DLU */ static int button_width (Lisp_Object text) { /* !!#### do Japanese chars count as two? */ int width = X_DLU_PER_CHAR * ibyte_string_displayed_columns (XSTRING_DATA (text), XSTRING_LENGTH (text)); return max (X_MIN_BUTTON, width); } /* Unwind protection routine frees a dynarr opaqued into arg */ static Lisp_Object free_dynarr_opaque_ptr (Lisp_Object arg) { Dynarr_free (get_opaque_ptr (arg)); return arg; } /* Unwind protection decrements dialog count */ static Lisp_Object dialog_popped_down (Lisp_Object UNUSED (arg)) { popup_up_p--; return Qnil; } #define ALIGN_TEMPLATE \ { \ int slippage = Dynarr_length (template_) & 3; \ if (slippage) \ Dynarr_add_many (template_, &zeroes, slippage); \ } static struct { DWORD errmess; Ascbyte *errname; } common_dialog_errors[] = { { CDERR_DIALOGFAILURE, "CDERR_DIALOGFAILURE" }, { CDERR_FINDRESFAILURE, "CDERR_FINDRESFAILURE" }, { CDERR_INITIALIZATION, "CDERR_INITIALIZATION" }, { CDERR_LOADRESFAILURE, "CDERR_LOADRESFAILURE" }, { CDERR_LOADSTRFAILURE, "CDERR_LOADSTRFAILURE" }, { CDERR_LOCKRESFAILURE, "CDERR_LOCKRESFAILURE" }, { CDERR_MEMALLOCFAILURE, "CDERR_MEMALLOCFAILURE" }, { CDERR_MEMLOCKFAILURE, "CDERR_MEMLOCKFAILURE" }, { CDERR_NOHINSTANCE, "CDERR_NOHINSTANCE" }, { CDERR_NOHOOK, "CDERR_NOHOOK" }, { CDERR_NOTEMPLATE, "CDERR_NOTEMPLATE" }, { CDERR_REGISTERMSGFAIL, "CDERR_REGISTERMSGFAIL" }, { CDERR_STRUCTSIZE, "CDERR_STRUCTSIZE" }, { PDERR_CREATEICFAILURE, "PDERR_CREATEICFAILURE" }, { PDERR_DEFAULTDIFFERENT, "PDERR_DEFAULTDIFFERENT" }, { PDERR_DNDMMISMATCH, "PDERR_DNDMMISMATCH" }, { PDERR_GETDEVMODEFAIL, "PDERR_GETDEVMODEFAIL" }, { PDERR_INITFAILURE, "PDERR_INITFAILURE" }, { PDERR_LOADDRVFAILURE, "PDERR_LOADDRVFAILURE" }, { PDERR_NODEFAULTPRN, "PDERR_NODEFAULTPRN" }, { PDERR_NODEVICES, "PDERR_NODEVICES" }, { PDERR_PARSEFAILURE, "PDERR_PARSEFAILURE" }, { PDERR_PRINTERNOTFOUND, "PDERR_PRINTERNOTFOUND" }, { PDERR_RETDEFFAILURE, "PDERR_RETDEFFAILURE" }, { PDERR_SETUPFAILURE, "PDERR_SETUPFAILURE" }, { CFERR_MAXLESSTHANMIN, "CFERR_MAXLESSTHANMIN" }, { CFERR_NOFONTS, "CFERR_NOFONTS" }, { FNERR_BUFFERTOOSMALL, "FNERR_BUFFERTOOSMALL" }, { FNERR_INVALIDFILENAME, "FNERR_INVALIDFILENAME" }, { FNERR_SUBCLASSFAILURE, "FNERR_SUBCLASSFAILURE" }, { FRERR_BUFFERLENGTHZERO, "FRERR_BUFFERLENGTHZERO" }, }; struct param_data { Extbyte *fname; Extbyte *unknown_fname; int validate; }; static int CALLBACK handle_directory_proc (HWND hwnd, UINT msg, LPARAM lParam, LPARAM lpData) { Extbyte szDir[PATH_MAX_EXTERNAL]; struct param_data *pd = (struct param_data *) lpData; switch (msg) { case BFFM_INITIALIZED: /* WParam is TRUE since you are passing a path. It would be FALSE if you were passing a pidl. */ qxeSendMessage (hwnd, BFFM_SETSELECTION, TRUE, (LPARAM) pd->fname); break; case BFFM_SELCHANGED: /* Set the status window to the currently selected path. */ if (qxeSHGetPathFromIDList ((LPITEMIDLIST) lParam, szDir)) qxeSendMessage (hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM) szDir); break; case BFFM_VALIDATEFAILED: if (pd->validate) return TRUE; else pd->unknown_fname = qxetcsdup ((Extbyte *) lParam); break; default: break; } return 0; } static Lisp_Object handle_directory_dialog_box (struct frame *f, Lisp_Object keys) { Lisp_Object ret = Qnil; BROWSEINFOW bi; LPITEMIDLIST pidl; LPMALLOC pMalloc; struct param_data pd; xzero (pd); xzero (bi); bi.lParam = (LPARAM) &pd; bi.hwndOwner = FRAME_MSWINDOWS_HANDLE (f); bi.pszDisplayName = 0; bi.pidlRoot = 0; bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_EDITBOX | BIF_NEWDIALOGSTYLE; bi.lpfn = handle_directory_proc; LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil), pd.fname); { EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) { if (EQ (key, Q_title)) { CHECK_STRING (value); LISP_STRING_TO_EXTERNAL (value, bi.lpszTitle, Qmswindows_tstr); } else if (EQ (key, Q_initial_directory)) LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil), pd.fname); else if (EQ (key, Q_initial_filename)) ; /* do nothing */ else if (EQ (key, Q_file_must_exist)) { if (!NILP (value)) { pd.validate = TRUE; bi.ulFlags |= BIF_VALIDATE; } else bi.ulFlags &= ~BIF_VALIDATE; } else invalid_constant ("Unrecognized directory-dialog keyword", key); } } if (SHGetMalloc (&pMalloc) == NOERROR) { pidl = qxeSHBrowseForFolder (&bi); if (pidl) { Extbyte *szDir = alloca_extbytes (PATH_MAX_EXTERNAL); if (qxeSHGetPathFromIDList (pidl, szDir)) ret = tstr_to_local_file_format (szDir); XECOMCALL1 (pMalloc, Free, pidl); XECOMCALL0 (pMalloc, Release); return ret; } else if (pd.unknown_fname != 0) { ret = tstr_to_local_file_format (pd.unknown_fname); xfree (pd.unknown_fname, Extbyte *); } else while (1) signal_quit (); } else signal_error (Qdialog_box_error, "Unable to create folder browser", make_int (0)); return ret; } static Lisp_Object handle_file_dialog_box (struct frame *f, Lisp_Object keys) { OPENFILENAMEW ofn; Extbyte fnbuf[8000]; xzero (ofn); ofn.lStructSize = sizeof (ofn); ofn.Flags = OFN_EXPLORER; ofn.hwndOwner = FRAME_MSWINDOWS_HANDLE (f); ofn.lpstrFile = (XELPTSTR) fnbuf; ofn.nMaxFile = sizeof (fnbuf) / XETCHAR_SIZE; qxetcscpy (fnbuf, XETEXT ("")); LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil), ofn.lpstrInitialDir); { EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) { if (EQ (key, Q_initial_filename)) { Extbyte *fnout; CHECK_STRING (value); LOCAL_FILE_FORMAT_TO_TSTR (value, fnout); qxetcscpy (fnbuf, fnout); } else if (EQ (key, Q_title)) { CHECK_STRING (value); LISP_STRING_TO_TSTR (value, ofn.lpstrTitle); } else if (EQ (key, Q_initial_directory)) LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil), ofn.lpstrInitialDir); else if (EQ (key, Q_file_must_exist)) { if (!NILP (value)) ofn.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; else ofn.Flags &= ~(OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST); } else invalid_constant ("Unrecognized file-dialog keyword", key); } } if (!qxeGetOpenFileName (&ofn)) { DWORD err = CommDlgExtendedError (); if (!err) { while (1) signal_quit (); } else { int i; for (i = 0; i < countof (common_dialog_errors); i++) { if (common_dialog_errors[i].errmess == err) signal_error (Qdialog_box_error, "Creating file-dialog-box", build_msg_string (common_dialog_errors[i].errname)); } signal_error (Qdialog_box_error, "Unknown common dialog box error???", make_int (err)); } } return tstr_to_local_file_format ((Extbyte *) ofn.lpstrFile); } static Lisp_Object handle_question_dialog_box (struct frame *f, Lisp_Object keys) { Lisp_Object_dynarr *dialog_items = Dynarr_new (Lisp_Object); unsigned_char_dynarr *template_ = Dynarr_new (unsigned_char); int button_row_width = 0; int text_width, text_height; Lisp_Object question = Qnil, title = Qnil; int unbind_count = specpdl_depth (); record_unwind_protect (free_dynarr_opaque_ptr, make_opaque_ptr (dialog_items)); record_unwind_protect (free_dynarr_opaque_ptr, make_opaque_ptr (template_)); /* A big NO NEED to GCPRO gui_items stored in the array: they are just pointers into KEYS list, which is GC-protected by the caller */ { EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) { if (EQ (key, Q_question)) { CHECK_STRING (value); question = value; } else if (EQ (key, Q_title)) { CHECK_STRING (value); title = value; } else if (EQ (key, Q_buttons)) { /* Parse each item in the dialog into gui_item structs, and stuff a dynarr of these. Calculate button row width in this loop too */ EXTERNAL_LIST_LOOP_2 (item, value) { if (!NILP (item)) { Lisp_Object gitem = gui_parse_item_keywords (item); Dynarr_add (dialog_items, gitem); button_row_width += button_width (XGUI_ITEM (gitem)->name) + X_BUTTON_MARGIN; } } button_row_width -= X_BUTTON_MARGIN; } else invalid_constant ("Unrecognized question-dialog keyword", key); } } if (Dynarr_length (dialog_items) == 0) sferror ("Dialog descriptor provides no buttons", keys); if (NILP (question)) sferror ("Dialog descriptor provides no question", keys); /* Determine the final width layout */ { Ibyte *p = XSTRING_DATA (question); Charcount string_max = 0, this_length = 0; while (1) { Ichar ch = itext_ichar (p); INC_IBYTEPTR (p); if (ch == (Ichar)'\n' || ch == (Ichar)'\0') { string_max = max (this_length, string_max); this_length = 0; } else ++this_length; if (ch == (Ichar)'\0') break; } if (string_max * X_DLU_PER_CHAR > max (X_MAX_TEXT, button_row_width)) text_width = X_AVE_TEXT; else if (string_max * X_DLU_PER_CHAR < X_MIN_TEXT) text_width = X_MIN_TEXT; else text_width = string_max * X_DLU_PER_CHAR; text_width = max (text_width, button_row_width); } /* Now calculate the height for the text control */ { Ibyte *p = XSTRING_DATA (question); Charcount break_at = text_width / X_DLU_PER_CHAR; Charcount char_pos = 0; int num_lines = 1; Ichar ch; while ((ch = itext_ichar (p)) != (Ichar) '\0') { INC_IBYTEPTR (p); char_pos += ch != (Ichar) '\n'; if (ch == (Ichar) '\n' || char_pos == break_at) { ++num_lines; char_pos = 0; } } text_height = Y_TEXT_MARGIN + Y_DLU_PER_CHAR * num_lines; } /* Ok, now we are ready to stuff the dialog template and lay out controls */ { DLGTEMPLATE dlg_tem; DLGITEMTEMPLATE item_tem; int i; const unsigned int zeroes = 0; const unsigned int ones = 0xFFFFFFFF; const WORD static_class_id = 0x0082; const WORD button_class_id = 0x0080; /* Create and stuff in DLGTEMPLATE header */ dlg_tem.style = (DS_CENTER | DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_VISIBLE); dlg_tem.dwExtendedStyle = 0; dlg_tem.cdit = Dynarr_length (dialog_items) + 1; dlg_tem.x = 0; dlg_tem.y = 0; dlg_tem.cx = text_width + 2 * X_TEXT_FROM_EDGE; dlg_tem.cy = (Y_TEXT_FROM_EDGE + text_height + Y_TEXT_FROM_BUTTON + Y_BUTTON + Y_BUTTON_FROM_EDGE); Dynarr_add_many (template_, &dlg_tem, sizeof (dlg_tem)); /* We want no menu and standard class */ Dynarr_add_many (template_, &zeroes, 4); /* And the third is the dialog title. "XEmacs" unless one is supplied. Note that the string must be in Unicode. */ if (NILP (title)) Dynarr_add_many (template_, L"XEmacs", 14); else push_lisp_string_as_unicode (template_, title); /* Next add text control. */ item_tem.style = WS_CHILD | WS_VISIBLE | SS_LEFT | SS_NOPREFIX; item_tem.dwExtendedStyle = 0; item_tem.x = X_TEXT_FROM_EDGE; item_tem.y = Y_TEXT_FROM_EDGE; item_tem.cx = text_width; item_tem.cy = text_height; item_tem.id = 0xFFFF; ALIGN_TEMPLATE; Dynarr_add_many (template_, &item_tem, sizeof (item_tem)); /* Right after class id follows */ Dynarr_add_many (template_, &ones, 2); Dynarr_add_many (template_, &static_class_id, sizeof (static_class_id)); /* Next thing to add is control text, as Unicode string */ push_lisp_string_as_unicode (template_, question); /* Specify 0 length creation data */ Dynarr_add_many (template_, &zeroes, 2); /* Now it's the button time */ item_tem.y = Y_TEXT_FROM_EDGE + text_height + Y_TEXT_FROM_BUTTON; item_tem.x = X_BUTTON_FROM_EDGE + (button_row_width < text_width ? (text_width - button_row_width) / 2 : 0); item_tem.cy = Y_BUTTON; item_tem.dwExtendedStyle = 0; for (i = 0; i < Dynarr_length (dialog_items); ++i) { Lisp_Object *gui_item = Dynarr_atp (dialog_items, i); Lisp_Gui_Item *pgui_item = XGUI_ITEM (*gui_item); item_tem.style = (WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | (gui_item_active_p (*gui_item) ? 0 : WS_DISABLED)); item_tem.cx = button_width (pgui_item->name); /* Item ids are indices into dialog_items plus offset, to avoid having items by reserved ids (IDOK, IDCANCEL) */ item_tem.id = i + ID_ITEM_BIAS; ALIGN_TEMPLATE; Dynarr_add_many (template_, &item_tem, sizeof (item_tem)); /* Right after 0xFFFF and class id atom follows */ Dynarr_add_many (template_, &ones, 2); Dynarr_add_many (template_, &button_class_id, sizeof (button_class_id)); /* Next thing to add is control text, as Unicode string */ { Ichar accel_unused; push_lisp_string_as_unicode (template_, mswindows_translate_menu_or_dialog_item (pgui_item->name, &accel_unused)); } /* Specify 0 length creation data. */ Dynarr_add_many (template_, &zeroes, 2); item_tem.x += item_tem.cx + X_BUTTON_SPACING; } } /* Now the Windows dialog structure is ready. We need to prepare a data structure for the new dialog, which will contain callbacks and the frame for these callbacks. This structure has to be GC-protected and thus it is put into a statically protected list. */ { Lisp_Object dialog_data; int i; struct mswindows_dialog_id *did = #ifdef MC_ALLOC alloc_lrecord_type (struct mswindows_dialog_id, &lrecord_mswindows_dialog_id); #else /* not MC_ALLOC */ alloc_lcrecord_type (struct mswindows_dialog_id, &lrecord_mswindows_dialog_id); #endif /* not MC_ALLOC */ dialog_data = wrap_mswindows_dialog_id (did); did->frame = wrap_frame (f); did->callbacks = make_vector (Dynarr_length (dialog_items), Qunbound); for (i = 0; i < Dynarr_length (dialog_items); i++) XVECTOR_DATA (did->callbacks) [i] = XGUI_ITEM (*Dynarr_atp (dialog_items, i))->callback; /* Woof! Everything is ready. Pop pop pop in now! */ did->hwnd = qxeCreateDialogIndirectParam (NULL, (LPDLGTEMPLATE) Dynarr_atp (template_, 0), FRAME_MSWINDOWS_HANDLE (f), dialog_proc, (LPARAM) LISP_TO_VOID (dialog_data)); if (!did->hwnd) /* Something went wrong creating the dialog */ signal_error (Qdialog_box_error, "Creating dialog", keys); Vdialog_data_list = Fcons (dialog_data, Vdialog_data_list); /* Cease protection and free dynarrays */ unbind_to (unbind_count); return dialog_data; } } static Lisp_Object mswindows_make_dialog_box_internal (struct frame* f, Lisp_Object type, Lisp_Object keys) { int unbind_count = specpdl_depth (); record_unwind_protect (dialog_popped_down, Qnil); popup_up_p++; if (EQ (type, Qfile)) return unbind_to_1 (unbind_count, handle_file_dialog_box (f, keys)); else if (EQ (type, Qdirectory)) return unbind_to_1 (unbind_count, handle_directory_dialog_box (f, keys)); else if (EQ (type, Qquestion)) return unbind_to_1 (unbind_count, handle_question_dialog_box (f, keys)); else if (EQ (type, Qprint)) return unbind_to_1 (unbind_count, mswindows_handle_print_dialog_box (f, keys)); else if (EQ (type, Qpage_setup)) return unbind_to_1 (unbind_count, mswindows_handle_page_setup_dialog_box (f, keys)); else signal_error (Qunimplemented, "Dialog box type", type); return Qnil; } void console_type_create_dialog_mswindows (void) { CONSOLE_HAS_METHOD (mswindows, make_dialog_box_internal); } void syms_of_dialog_mswindows (void) { INIT_LRECORD_IMPLEMENTATION (mswindows_dialog_id); DEFKEYWORD (Q_initial_directory); DEFKEYWORD (Q_initial_filename); DEFKEYWORD (Q_filter_list); DEFKEYWORD (Q_title); DEFKEYWORD (Q_allow_multi_select); DEFKEYWORD (Q_create_prompt_on_nonexistent); DEFKEYWORD (Q_overwrite_prompt); DEFKEYWORD (Q_file_must_exist); DEFKEYWORD (Q_no_network_button); DEFKEYWORD (Q_no_read_only_return); /* Errors */ DEFERROR_STANDARD (Qdialog_box_error, Qgui_error); } void vars_of_dialog_mswindows (void) { Vpopup_frame_list = Qnil; staticpro (&Vpopup_frame_list); Vdialog_data_list = Qnil; staticpro (&Vdialog_data_list); DEFVAR_LISP ("default-file-dialog-filter-alist", &Vdefault_file_dialog_filter_alist /* */ ); Vdefault_file_dialog_filter_alist = list5 (Fcons (build_msg_string ("Text Files"), build_string ("*.txt")), Fcons (build_msg_string ("C Files"), build_string ("*.c;*.h")), Fcons (build_msg_string ("Elisp Files"), build_string ("*.el")), Fcons (build_msg_string ("HTML Files"), build_string ("*.html;*.html")), Fcons (build_msg_string ("All Files"), build_string ("*.*"))); }