annotate lisp/msw-font-menu.el @ 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 491f8cf78a9c
children b4f4e0cc90f1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
1 ;; msw-font-menu.el --- Managing menus of mswindows fonts.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
2
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
3 ;; Copyright (C) 1999 Free Software Foundation, Inc.
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
4 ;; Copyright (C) 2002 Ben Wing.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
5
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
6 ;; Adapted from x-font-menu.el by Andy Piper <andy@xemacs.org>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
7
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
8 ;; This file is part of XEmacs.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
9
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify it
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
11 ;; under the terms of the GNU General Public License as published by
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
13 ;; any later version.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
14
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful, but
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
18 ;; General Public License for more details.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
19
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
22 ;; Free Software Foundation, 59 Temple Place - Suite 330,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
23 ;; Boston, MA 02111-1307, USA.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
24
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
25 ;;; Known Problems:
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
26 ;;; ===============
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
27 ;;; There is knowledge here about the regexp match numbers in
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
28 ;;; `mswindows-font-regexp' and `mswindows-font-regexp-foundry-and-family' defined in
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
29 ;;; mswindows-faces.el.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
30 ;;;
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
31
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
32 ;;; mswindows fonts look like:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
33 ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset]
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
34 ;;; ie:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
35 ;;; Lucida Console:Regular:10
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
36 ;;; minimal:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
37 ;;; Courier New
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
38 ;;; maximal:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
39 ;;; Courier New:Bold Italic:10:underline strikeout:western
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
40
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
41 ;;; Code:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
42
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
43 ;; #### - implement these...
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
44 ;;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
45 ;;; (defvar font-menu-ignore-proportional-fonts nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
46 ;;; "*If non-nil, then the font menu will only show fixed-width fonts.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
47
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
48 (require 'font-menu)
778
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents: 771
diff changeset
49 (globally-declare-boundp 'mswindows-font-regexp)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
50
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
51 (defvar mswindows-font-menu-junk-families
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 398
diff changeset
52 (mapconcat
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 398
diff changeset
53 #'identity
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 398
diff changeset
54 '("Symbol"
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 398
diff changeset
55 )
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 398
diff changeset
56 "\\|")
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
57 "A regexp matching font families which are uninteresting (e.g. cursor fonts).")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
58
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
59 (defvar mswindows-font-regexp-ascii nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
60 "This is used to filter out font families that can't display ASCII text.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
61 It must be set at run-time.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
62
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
63 ;;;###autoload
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
64 (defun mswindows-reset-device-font-menus (device &optional debug)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
65 "Generates the `Font', `Size', and `Weight' submenus for the Options menu.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
66 This is run the first time that a font-menu is needed for each device.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
67 If you don't like the lazy invocation of this function, you can add it to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
68 `create-device-hook' and that will make the font menus respond more quickly
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
69 when they are selected for the first time. If you add fonts to your system,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
70 or if you change your font path, you can call this to re-initialize the menus."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
71 (unless mswindows-font-regexp-ascii
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 502
diff changeset
72 (setq mswindows-font-regexp-ascii "Western"))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
73 (let ((case-fold-search t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
74 family size weight entry
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
75 dev-cache cache families sizes weights)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
76 (dolist (name (cond ((null debug) ; debugging kludge
2527
491f8cf78a9c [xemacs-hg @ 2005-01-28 02:58:38 by ben]
ben
parents: 872
diff changeset
77 (font-list "::::" device))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
78 ((stringp debug) (split-string debug "\n"))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
79 (t debug)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
80 (when (and (string-match mswindows-font-regexp-ascii name)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
81 (string-match mswindows-font-regexp name))
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
82 (setq weight (capitalize (car (mswindows-parse-font-style
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
83 (match-string 2 name))))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
84 size (string-to-int (match-string 3 name))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
85 family (match-string 1 name))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
86 (unless (string-match mswindows-font-menu-junk-families family)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
87 (setq entry (or (vassoc name cache)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
88 (car (setq cache
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
89 (cons (vector family nil nil t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
90 cache)))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
91 (or (member family families) (push family families))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
92 (or (member weight weights) (push weight weights))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
93 (or (member size sizes) (push size sizes))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
94 (or (member weight (aref entry 1)) (push weight (aref entry 1)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
95 (or (member size (aref entry 2)) (push size (aref entry 2))))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
96 ;;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
97 ;; Hack scalable fonts.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
98 ;; Some fonts come only in scalable versions (the only size is 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
99 ;; and some fonts come in both scalable and non-scalable versions
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
100 ;; (one size is 0). If there are any scalable fonts at all, make
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
101 ;; sure that the union of all point sizes contains at least some
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
102 ;; common sizes - it's possible that some sensible sizes might end
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
103 ;; up not getting mentioned explicitly.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
104 ;;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
105 (if (member 0 sizes)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
106 (let ((common '(6 8 10 12 14 16 18 24)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
107 (while common
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
108 (or;;(member (car common) sizes) ; not enough slack
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
109 (let ((rest sizes)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
110 (done nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
111 (while (and (not done) rest)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
112 (if (and (> (car common) (- (car rest) 1))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
113 (< (car common) (+ (car rest) 1)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
114 (setq done t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
115 (setq rest (cdr rest)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
116 done)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
117 (setq sizes (cons (car common) sizes)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
118 (setq common (cdr common)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
119 (setq sizes (delq 0 sizes))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
120
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
121 (setq families (sort families 'string-lessp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
122 weights (sort weights 'string-lessp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
123 sizes (sort sizes '<))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
124
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
125 (dolist (entry cache)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
126 (aset entry 1 (sort (aref entry 1) 'string-lessp))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
127 (aset entry 2 (sort (aref entry 2) '<)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
128
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
129 (setq dev-cache (assq device device-fonts-cache))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
130 (or dev-cache
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
131 (setq dev-cache (car (push (list device) device-fonts-cache))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
132 (setcdr
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
133 dev-cache
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
134 (vector
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
135 cache
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
136 (mapcar (lambda (x)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
137 (vector x
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
138 (list 'font-menu-set-font x nil nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
139 ':style 'radio ':active nil ':selected nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
140 families)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
141 (mapcar (lambda (x)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
142 (vector (int-to-string x)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
143 (list 'font-menu-set-font nil nil x)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
144 ':style 'radio ':active nil ':selected nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
145 sizes)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
146 (mapcar (lambda (x)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
147 (vector x
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
148 (list 'font-menu-set-font nil x nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
149 ':style 'radio ':active nil ':selected nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
150 weights)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
151 (cdr dev-cache)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
152
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
153 ;; Extract font information from a face. We examine both the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
154 ;; user-specified font name and the canonical (`true') font name.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
155 ;; These can appear to have totally different properties.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
156
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
157 ;; We use the user-specified one if possible, else use the truename.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
158 ;; If the user didn't specify one get the truename and use the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
159 ;; possibly suboptimal data from that.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
160 ;;;###autoload
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
161 (defun* mswindows-font-menu-font-data (face dcache)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
162 (let* ((case-fold-search t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
163 (domain (if font-menu-this-frame-only-p
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
164 (selected-frame)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
165 (selected-device)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
166 (name (font-instance-name (face-font-instance face domain)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
167 (truename (font-instance-truename
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
168 (face-font-instance face domain
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
169 (if (featurep 'mule) 'ascii))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
170 family size weight entry slant)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
171 (when (string-match mswindows-font-regexp name)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
172 (setq family (match-string 1 name))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
173 (setq entry (vassoc family (aref dcache 0))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
174 (when (and (null entry)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
175 (string-match mswindows-font-regexp truename))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
176 (setq family (match-string 1 truename))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
177 (setq entry (vassoc family (aref dcache 0))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
178 (when (null entry)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
179 (return-from mswindows-font-menu-font-data (make-vector 5 nil)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
180
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
181 (when (string-match mswindows-font-regexp name)
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
182 (setq weight (car (mswindows-parse-font-style (match-string 2 name))))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
183 (setq size (string-to-int (match-string 3 name))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
184
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
185 (when (string-match mswindows-font-regexp truename)
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
186 (destructuring-bind (newweight . slant)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
187 (mswindows-parse-font-style (match-string 2 truename))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
188 (when (not (member weight (aref entry 1)))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
189 (setq weight newweight))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
190 (when (not (member size (aref entry 2)))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
191 (setq size (string-to-int (match-string 3 truename))))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
192
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
193 (vector entry family size weight slant)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
194
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
195 (defun mswindows-font-menu-load-font (family weight size slant resolution)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
196 "Try to load a font with the requested properties.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
197 The weight, slant and resolution are only hints."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
198 (when (integerp size) (setq size (int-to-string size)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
199 (let (font)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
200 (catch 'got-font
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
201 (dolist (weight (list weight ""))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
202 (dolist (slant
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
203 ;; oblique is not currently implemented
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
204 (cond ((string-equal slant "Oblique") '("Italic" ""))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
205 ((string-equal slant "Italic") '("Italic" ""))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
206 (t (list slant ""))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
207 (when (setq font
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
208 (make-font-instance
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
209 (concat
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
210 family ":"
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
211 (mswindows-construct-font-style weight slant) ":"
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 793
diff changeset
212 size "::")
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
213 nil t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
214 (throw 'got-font font)))))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
215
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
216 (provide 'mswindows-font-menu)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
217
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
218 ;;; msw-font-menu.el ends here