Mercurial > hg > xemacs-beta
view src/input-method-xlib.c @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 3d8143fc88e1 |
| children | 6c7605dfcf07 |
line wrap: on
line source
/* Various functions for X11R5+ input methods, using the Xlib interface. Copyright (C) 1996 Sun Microsystems. Copyright (C) 2002 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. */ /* Written by Martin Buchholz. */ /* This file implements an interface to X input methods, available with X11R5 and above. See O'Reilly, Xlib programmer's guide, and X11 R6 release guide chapters on internationalized input, for further details */ /* Policy: The XIM is of the device, by the device, for the device. The XIC is of each frame, by each frame, for each frame. The exceptions are: 1. Activate XICs on poor frames when the XIM is back. 2. Deactivate all the XICs when the XIM goes down. Implementation: - Register a callback for an XIM when the X device is being initialized. XIM_init_device (d) { XRegisterIMInstantiateCallback (); } The "XRegisterIMInstantiateCallback" is called when an XIM become available on the X display. - Catch the XIC when the frame is being initialized if XIM was available. XIM_init_frame (f) { ... XCreateIC (); ... } - Release the XIC when the frame is being closed. XIM_delete_frame (f) { ... FRAME_X_XIC (f) = NULL; ... } "XIM_delete_frame" is a "DestroyCallback" function declared in XIM_init_frame (); - Release all the XICs when the XIM was down accidentally. In IMDestroyCallback: DEVICE_FRAME_LOOP (...) { FRAME_X_XIC (f) = NULL; } - Re-enable XIC for all the frames which don't have XIC when the XIM is back. In IMInstantiateCallback: DEVICE_FRAME_LOOP (...) { XIM_init_frame (f); } Note: - Currently, we don't use XDestroyIC because of _XimProtoCloseIM (internally registered as im->methods->close) does "Xfree (ic)". */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "device-impl.h" #include "events.h" #include "frame-impl.h" #include "window-impl.h" #include "console-x-impl.h" #include "EmacsFrame.h" #include <X11/Xlocale.h> /* More portable than <locale.h> ? */ #include <X11/Xlib.h> #if !defined (XIM_XLIB) && !defined (USE_XFONTSET) #error neither XIM_XLIB nor USE_XFONTSET is defined?? #endif #ifdef XIM_XLIB /* XIM_XLIB specific */ /* Get/Set IC values for just one attribute */ #ifdef DEBUG_XEMACS #define XIC_Value(Get_Set, xic, name, attr, value) \ do { \ char *bad_arg; \ XVaNestedList list = XVaCreateNestedList (0, attr, value, NULL); \ if ((bad_arg = X##Get_Set##ICValues (xic, name, list, NULL)) != NULL) \ stderr_out ("X" #Get_Set "ICValues " "bad Arg: %s\n", bad_arg); \ XFree (list); \ } while (0) #else /* ! DEBUG_XEMACS */ #define XIC_Value(Get_Set, xic, name, attr, value) \ do { \ XVaNestedList list = XVaCreateNestedList (0, attr, value, NULL); \ X##Get_Set##ICValues (xic, name, list, NULL); \ XFree (list); \ } while (0) #endif /* DEBUG_XEMACS */ static char DefaultXIMStyles[] = "XIMPreeditPosition|XIMStatusArea\n" "XIMPreeditPosition|XIMStatusNone\n" "XIMPreeditPosition|XIMStatusNothing\n" "XIMPreeditNothing|XIMStatusArea\n" "XIMPreeditNothing|XIMStatusNothing\n" "XIMPreeditNothing|XIMStatusNone\n" "XIMPreeditNone|XIMStatusArea\n" "XIMPreeditNone|XIMStatusNothing\n" "XIMPreeditNone|XIMStatusNone"; static XIMStyle best_style (XIMStyles *user, XIMStyles *xim); #endif /* XIM_XLIB only */ /* This function is documented, but no prototype in the header files */ EXTERN_C char * XSetIMValues(XIM, ...); #ifdef XIM_XLIB /* starting XIM specific codes */ /* Callbacks for IM are supported from X11R6 or later. */ #ifdef HAVE_XREGISTERIMINSTANTIATECALLBACK static Boolean xim_initted = False; /* Called from when XIM is destroying. Clear all the XIC when the XIM was destroying... */ static void IMDestroyCallback (XIM UNUSED (im), XPointer client_data, XPointer UNUSED (call_data)) { struct device *d = (struct device *)client_data; Lisp_Object tail; DEVICE_FRAME_LOOP (tail, d) { struct frame *target_frame = XFRAME (XCAR (tail)); if (FRAME_X_P (target_frame) && FRAME_X_XIC (target_frame)) { /* XDestroyIC (FRAME_X_XIC (target_frame)); */ FRAME_X_XIC (target_frame) = NULL; } } DEVICE_X_XIM (d) = NULL; xim_initted = False; return; } /* This is registered in XIM_init_device (when DEVICE is initializing). This activates XIM when XIM becomes available. */ static void IMInstantiateCallback (Display *dpy, XPointer client_data, XPointer UNUSED (call_data)) { struct device *d = (struct device *)client_data; XIM xim; char *name, *class_; XIMCallback ximcallback; Lisp_Object tail; /* if no xim is presented, initialize xim ... */ if ( xim_initted == False ) { xim_initted = True; XtGetApplicationNameAndClass (dpy, &name, &class_); DEVICE_X_XIM (d) = xim = XOpenIM (dpy, XtDatabase (dpy), name, class_); /* destroy callback for im */ ximcallback.callback = (XIMProc) IMDestroyCallback; ximcallback.client_data = (XPointer) d; XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); } /* activate XIC on all the X frames... */ DEVICE_FRAME_LOOP (tail, d) { struct frame *target_frame = XFRAME (XCAR (tail)); if (FRAME_X_P (target_frame) && !FRAME_X_XIC (target_frame)) { XIM_init_frame (target_frame); } } return; } #endif /* HAVE_XREGISTERIMINSTANTIATECALLBACK */ /* Initialize XIM for X device. Register the use of XIM using XRegisterIMInstantiateCallback. */ void XIM_init_device (struct device *d) { #ifdef HAVE_XREGISTERIMINSTANTIATECALLBACK /* X11R6+ */ DEVICE_X_XIM (d) = NULL; XRegisterIMInstantiateCallback (DEVICE_X_DISPLAY (d), NULL, NULL, NULL, #ifdef XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE /* The sixth parameter is of type XPointer in XFree86 but (XPointer *) on most other X11's. */ (XIDProc) IMInstantiateCallback, (XPointer) d #else /* X Consortium prototype */ (XIMProc) IMInstantiateCallback, (XPointer *) d #endif /* XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE */ ); return; #else /* pre-X11R6 */ Display *dpy = DEVICE_X_DISPLAY (d); char *name, *class_; XIM xim; XtGetApplicationNameAndClass (dpy, &name, &class_); DEVICE_X_XIM (d) = xim = XOpenIM (dpy, XtDatabase (dpy), name, class_); if (xim == NULL) { warn_when_safe (Qxintl, Qerror, "Can't initialize XIM: XOpenIM() failed, no input server available"); return; } else { XGetIMValues (xim, XNQueryInputStyle, &DEVICE_X_XIM_STYLES (d), NULL); return; } #endif /* HAVE_XREGISTERIMINSTANTIATECALLBACK */ } /* * For the frames */ /* Callback for the deleting frame. */ static void XIM_delete_frame (Widget UNUSED (w), XtPointer client_data, XtPointer UNUSED (call_data)) { struct frame *f = (struct frame *) client_data; struct device *d = XDEVICE (FRAME_DEVICE (f)); if (DEVICE_X_XIM (d)) { if (FRAME_X_XIC (f)) { XDestroyIC (FRAME_X_XIC (f)); FRAME_X_XIC (f) = NULL; } } return; } /* Initialize XIC for new frame. Create an X input context (XIC) for this frame. */ void XIM_init_frame (struct frame *f) { struct device *d = XDEVICE (FRAME_DEVICE (f)); XIM xim; Widget w = FRAME_X_TEXT_WIDGET (f); Window win = XtWindow (w); XRectangle p_area = {0,0,1,1}, s_area = {0,0,1,1}; XPoint spot = {0,0}; XIMStyle style; XVaNestedList p_list, s_list; typedef struct { XIMStyles styles; XFontSet fontset; Pixel fg; Pixel bg; char *inputmethod; } xic_vars_t; xic_vars_t xic_vars; XIC xic; #define res(name, class_, representation, field, default_value) \ { name, class_, representation, sizeof(xic_vars.field), \ XtOffsetOf(xic_vars_t, field), XtRString, default_value } static XtResource resources[] = { /* name class represent'n field default value */ res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, (XtPointer) DefaultXIMStyles), res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, (XtPointer) XtDefaultFontSet), res(XtNximForeground, XtCForeground, XtRPixel, fg, (XtPointer) XtDefaultForeground), res(XtNximBackground, XtCBackground, XtRPixel, bg, (XtPointer) XtDefaultBackground) }; xim = DEVICE_X_XIM (d); if (!xim) { return; } w = FRAME_X_TEXT_WIDGET (f); /* * initialize XIC */ if (FRAME_X_XIC (f)) return; XtGetApplicationResources (w, &xic_vars, resources, XtNumber (resources), NULL, 0); if (!xic_vars.fontset) { warn_when_safe (Qxintl, Qerror, "Can't initialize XIM: Can't get fontset resource for Input Method"); FRAME_X_XIC (f) = NULL; return; } /* construct xic */ XGetIMValues (xim, XNQueryInputStyle, &DEVICE_X_XIM_STYLES(d), NULL); FRAME_X_XIC_STYLE (f) = style = best_style (&xic_vars.styles, (XIMStyles *)DEVICE_X_XIM_STYLES(d)); p_list = XVaCreateNestedList (0, XNArea, &p_area, XNSpotLocation, &spot, XNForeground, xic_vars.fg, XNBackground, xic_vars.bg, XNFontSet, xic_vars.fontset, NULL); s_list = XVaCreateNestedList (0, XNArea, &s_area, XNForeground, xic_vars.fg, XNBackground, xic_vars.bg, XNFontSet, xic_vars.fontset, NULL); FRAME_X_XIC (f) = xic = XCreateIC (xim, XNInputStyle, style, XNClientWindow, win, XNFocusWindow, win, XNPreeditAttributes, p_list, XNStatusAttributes, s_list, NULL); XFree (p_list); XFree (s_list); if (!xic) { warn_when_safe (Qxintl, Qerror, "Can't initialize XIM: XCreateIC failed"); return; } if (style & XIMPreeditPosition) { XPoint *frame_spot = &(FRAME_X_XIC_SPOT(f)); frame_spot->x = frame_spot->y = -1; } XIM_SetGeometry (f); XSetICFocus (xic); #ifdef HAVE_XREGISTERIMINSTANTIATECALLBACK /* when frame is going to be destroyed (closed) */ XtAddCallback (FRAME_X_TEXT_WIDGET (f), XNDestroyCallback, XIM_delete_frame, (XtPointer)f ); #endif } void XIM_SetGeometry (struct frame *f) { XIC xic = FRAME_X_XIC (f); XIMStyle style = FRAME_X_XIC_STYLE (f); XRectangle area; if (!xic || !f) return; if (style & XIMStatusArea) { /* Place Status Area in bottom right corner */ /* Negotiate geometry of status area */ /* See O'Reilly Xlib XIM chapter (but beware, it's buggy) */ XRectangle *needed; /* If input method has existing status area, use its current size */ /* The following at least works for Sun's htt */ area.x = area.y = area.width = area.height = 0; XIC_Value (Set, xic, XNStatusAttributes, XNAreaNeeded, &area); XIC_Value (Get, xic, XNStatusAttributes, XNAreaNeeded, &needed); if (needed->width == 0) /* Use XNArea instead of XNAreaNeeded */ XIC_Value (Get, xic, XNStatusAttributes, XNArea, &needed); area.width = needed->width; area.height = needed->height; area.x = FRAME_RIGHT_BORDER_START (f) - area.width; area.y = FRAME_BOTTOM_BORDER_START (f) - area.height; #ifdef DEBUG_XIM stderr_out ("Putting StatusArea in x=%d y=%d w=%d h=%d\n", area.x, area.y, area.width, area.height); #endif /* DEBUG_XIM */ XIC_Value (Set, xic, XNStatusAttributes, XNArea, &area); } if (style & XIMPreeditPosition) { /* Set Preedit Area to whole frame size (sans border) */ /* We include the border because Preedit window might be larger than display line at edge. #### FIX: we should adjust to make sure that there is always room for the spot sub-window */ area.x = FRAME_LEFT_BORDER_START (f); area.y = FRAME_TOP_BORDER_START (f); area.width = FRAME_RIGHT_BORDER_END (f) - area.x; area.height = FRAME_BOTTOM_BORDER_END (f) - area.y; XIC_Value(Set, xic, XNPreeditAttributes, XNArea, &area); } #ifdef DEBUG_XIM describe_XIC (xic); #endif } void XIM_SetSpotLocation (struct frame *f, int x, int y) { XIC xic = FRAME_X_XIC (f); XPoint *spot = &(FRAME_X_XIC_SPOT (f)); /* Only care if we have a valid XIC using Over the Spot in * a different location */ if (!xic || !(FRAME_X_XIC_STYLE (f) & XIMPreeditPosition) || (spot->x == (short) x && spot->y == (short) y)) return; spot->x = (short) x; spot->y = (short) y; /* #### FIX: Must make sure spot fits within Preedit Area */ XIC_Value (Set, xic, XNPreeditAttributes, XNSpotLocation, spot); #ifdef DEBUG_XIM stderr_out ("Spot: %d %d\n", spot->x, spot->y); #endif } void XIM_focus_event (struct frame *f, int in_p) { if (FRAME_X_XIC (f) /* && FRAME_X_XIM_REGISTERED(f) */) (in_p ? XSetICFocus : XUnsetICFocus) (FRAME_X_XIC (f)); } #if 0 #define XIM_Composed_Text_BUFSIZE 64 typedef struct XIM_Composed_Text { int size; wchar_t data [XIM_Composed_Text_BUFSIZE]; } XIM_Composed_Text; static XIM_Composed_Text composed_input_buf = {XIM_Composed_Text_BUFSIZE, {0}}; Window main_window; /* get_XIM_input -- Process results of input method composition. This function copies the results of the input method composition to composed_input_buf. Then for each character, a custom event of type wc_atom is sent with the character as its data. It is probably more efficient to copy the composition results to some allocated memory and send a single event pointing to that memory. That would cut down on the event processing as well as allow quick insertion into the buffer of the whole string. It might require some care, though, to avoid fragmenting memory through the allocation and freeing of many small chunks. Maybe the existing system for (single-byte) string allocation can be used, multiplying the length by sizeof (wchar_t) to get the right size. */ void get_XIM_input (XKeyPressedEvent *x_key_event, XIC ic, Display *dpy) { KeySym keysym; Status status; int len; int i; XClientMessageEvent new_event; retry: len = XwcLookupString (ic, x_key_event, composed_input_buf.data, composed_input_buf.size, &keysym, &status); switch (status) { case XBufferOverflow: /* GROW_WC_STRING (&composed_input_buf, 32); mrb */ goto retry; case XLookupChars: break; default: ABORT (); } new_event.type = ClientMessage; new_event.display = x_key_event->display; new_event.window = x_key_event->window; new_event.message_type = wc_atom; new_event.format = 32; /* 32-bit wide data */ new_event.data.l[2] = new_event.data.l[3] = new_event.data.l[4] = 0L; new_event.data.l[0] = x_key_event->time; for (i = 0; i < len; i++) { new_event.data.l[1] = ((wchar_t *) composed_input_buf.data)[i]; XSendEvent (display, main_window, False, 0L, (XEvent *) &new_event); } } #endif /* 0 */ /* ============================================================== */ /* X input method style determination */ /* ============================================================== */ #if 0 #define done(type, value) \ if (toVal->addr != NULL) { \ if (toVal->size < sizeof(type)) { \ toVal->size = sizeof(type); \ return False; \ } \ *(type*)toVal->addr = (value); \ } else { \ static type static_val; \ static_val = (value); \ toVal->addr = (XPointer)&static_val; \ } \ toVal->size = sizeof(type); \ return True /* Caller supplies `;' */ #endif /* 0 */ /* * This is a standard Xt type converter, except that the caller MUST * supply a proper non-NULL toVal XIMStyles structure that we will * fill in. * * fromVal points to a string like * "XIMPreeditPosition|XIMStatusArea, XIMPreeditPosition|XIMStatusNothing XIMPreeditNothing|XIMStatusNothing" * * This is converted in the obvious way to a XIMStyles structure. * * mrb: #### Fix this to handle Motif-style specifications for * XIMStyles as well: overTheSpot, rootWindow, none */ /* XtTypeConverter */ Boolean EmacsXtCvtStringToXIMStyles ( Display *dpy, XrmValuePtr args, Cardinal *num_args, XrmValuePtr fromVal, XrmValuePtr toVal, XtPointer *converter_data) { #define STYLE_INFO(style) { style, #style, sizeof(#style) } static struct XIMStyleInfo { const XIMStyle style; const char * const name; const int namelen; } emacs_XIMStyleInfo[] = { STYLE_INFO (XIMPreeditPosition|XIMStatusArea), STYLE_INFO (XIMPreeditPosition|XIMStatusNothing), STYLE_INFO (XIMPreeditPosition|XIMStatusNone), STYLE_INFO (XIMPreeditNothing|XIMStatusArea), STYLE_INFO (XIMPreeditNothing|XIMStatusNothing), STYLE_INFO (XIMPreeditNothing|XIMStatusNone), STYLE_INFO (XIMPreeditNone|XIMStatusArea), STYLE_INFO (XIMPreeditNone|XIMStatusNothing), STYLE_INFO (XIMPreeditNone|XIMStatusNone) }; #undef STYLE_INFO char *s = (char *) fromVal->addr; char *end = s + fromVal->size; XIMStyles * const p = (XIMStyles *) toVal->addr; const char * const delimiter = " \t\n\r:;," ; const int max_styles = XtNumber(emacs_XIMStyleInfo); int i; char *c; #ifdef DEBUG_XIM stderr_out ("EmacsCvtStringToXIMStyles called with size=%d, string=\"%s\"\n", fromVal->size, (char *) fromVal->addr); #endif /* DEBUG_XIM */ if (*num_args != 0) { XtAppContext the_app_con = XtDisplayToApplicationContext (dpy); XtAppWarningMsg(the_app_con, "wrongParameters", "cvtStringToXIMStyle", "XtToolkitError", "String to XIMStyle conversion requires exactly 0 parameters", (String *)NULL, (Cardinal *)NULL); return False; } #ifdef DEBUG_XEMACS /* Make sure caller is giving us good data */ assert (fromVal->addr != NULL); assert (fromVal->size == strlen(fromVal->addr)+1); assert (toVal->addr != NULL); assert (toVal->size == sizeof(XIMStyles)); #endif /* DEBUG_XEMACS */ p->count_styles = 0; p->supported_styles = xnew_array (XIMStyle, max_styles); /* * The following routine assumes that the style name resource is * identical with the programmatic name of style. For example, * "XIMPreeditPosition|XIMStatusArea" means the * XIMPreeditPosition|XIMStatusArea value is specified. If the * style name is changed, such as "OverTheSpot|imDisplaysInClient", * the parsing logic below should be modified as well. */ if ((c = strtok(s, delimiter)) == NULL) c = end; while (c < end) { for(i=0 ; i<max_styles ; i++) { struct XIMStyleInfo *rec = emacs_XIMStyleInfo + i; if(!strncmp(c, rec->name, rec->namelen - 1)) { p->supported_styles[p->count_styles] = rec->style; p->count_styles++; break; } } if((c = strtok(NULL, delimiter)) == NULL) { break ; } } if (p->count_styles == 0) { /* No valid styles? */ /* !!#### */ char *buf = (char *) ALLOCA (strlen (fromVal->addr) + strlen (DefaultXIMStyles) + 100); XrmValue new_from; XtAppContext the_app_con = XtDisplayToApplicationContext (dpy); sprintf(buf, "Cannot convert string \"%s\" to type XIMStyles.\n" "Using default string \"%s\" instead.\n", fromVal->addr, DefaultXIMStyles); XtAppWarningMsg(the_app_con, "wrongParameters", "cvtStringToXIMStyle", "XtToolkitError", buf, (String *)NULL, (Cardinal *)NULL); new_from.addr = DefaultXIMStyles; new_from.size = sizeof(DefaultXIMStyles); return EmacsXtCvtStringToXIMStyles (dpy, args, num_args, &new_from, toVal, converter_data); } XREALLOC_ARRAY (p->supported_styles, XIMStyle, p->count_styles); *converter_data = (char *) True; return True; } /* XtDestructor */ void EmacsFreeXIMStyles ( XtAppContext app, XrmValuePtr toVal, XtPointer converter_data, XrmValuePtr UNUSED (args), Cardinal *num_args) { #ifdef DEBUG_XIM stderr_out ("Converter data: %x\n", converter_data); stderr_out ("EmacsFreeXIMStyles called\n"); #endif /* DEBUG_XIM */ if (*num_args != 0) { XtAppWarningMsg(app, "wrongParameters","freeXIMStyles","XtToolkitError", "Freeing an XIMStyles requires that zero arguments be passwd", (String *)NULL, (Cardinal *)NULL); return; } if (converter_data) { Boolean free_p = (Boolean) (int) converter_data; XIMStyles *styles = (XIMStyles *) toVal->addr; if (free_p) XFree ( styles->supported_styles ); } } #if 0 /* O'Reilly XLib Programming Manual, pg. 371 */ /* Much nicer implementation than O'Reilly */ /* Choose the more `complicated', hence nicer, XIM input style */ static XIMStyle BetterStyle (XIMStyle s, XIMStyle t) { #define CHECK_XIMStyle_BIT(bit) \ if ((s ^ t) & bit) { return (s & bit) ? s : t; } CHECK_XIMStyle_BIT (XIMPreeditCallbacks); CHECK_XIMStyle_BIT (XIMPreeditPosition); CHECK_XIMStyle_BIT (XIMPreeditArea); CHECK_XIMStyle_BIT (XIMPreeditNothing); CHECK_XIMStyle_BIT (XIMStatusCallbacks); CHECK_XIMStyle_BIT (XIMStatusArea); CHECK_XIMStyle_BIT (XIMStatusNothing); #undef CHECK_XIMStyle_BIT return s ? s : t ; } #endif /* 0 */ /* Choose the best style, given: * - user preferences (already checked to be supported by XEmacs) * - styles supported by the input method */ #define DEFAULTStyle (XIMPreeditNothing|XIMStatusNothing) static XIMStyle best_style (XIMStyles *user, XIMStyles *xim) { REGISTER int i, j; for (i=0 ; i<user->count_styles ; i++) { for (j=0 ; j<xim->count_styles ; j++) { if (user->supported_styles[i] == xim->supported_styles[j]) return user->supported_styles[i]; } } return DEFAULTStyle; /* Default Style */ } /* These lisp-callable functions will be sealed until xim-leim is needed. Oct 22 1999 - kazz */ #if 0 /* * External callable function for XIM */ DEFUN ("x-open-xim", Fx_open_xim, 1, 1, 0, /* Open the XIC on the frame if XIM is available. Commonly, use this as \(x-open-xim \(selected-frame)). If the frame is not on X device, return signal. If XIC is created successfully return t. If not return nil. */ (frame)) { struct frame *f; CHECK_LIVE_FRAME (frame); f = XFRAME (frame); if (!FRAME_X_P (f)) invalid_argument ("This frame is not on X device", frame); XIM_init_frame (f); return FRAME_X_XIC (f) ? Qt : Qnil; } DEFUN ("x-close-xim", Fx_close_xim, 1, 1, 0, /* Close the XIC on the frame if it exists. Commonly, use this as \(x-close-xim \(selected-frame)). If the frame is not on X device, return signal. Otherwise, it destroys the XIC if it exists, then returns t anyway. */ (frame)) { struct frame *f; struct device *d; CHECK_LIVE_FRAME (frame); f = XFRAME (frame); if (!FRAME_X_P (f)) invalid_argument ("This frame is not on X device", frame); d = XDEVICE (FRAME_DEVICE (f)); if (DEVICE_X_XIM (d)) { /* XDestroyIC (FRAME_X_XIC (XFRAME (f))); */ FRAME_X_XIC (XFRAME (f)) = NULL; } return Qt; } #endif /* if 0 */ void syms_of_input_method_xlib (void) { #if 0 /* see above */ DEFSUBR (Fx_open_xim); DEFSUBR (Fx_close_xim); #endif } void vars_of_input_method_xlib (void) { Fprovide (intern ("xim")); } /* ====================================================================== */ /* Internal Debugging Routines */ /* ====================================================================== */ #ifdef DEBUG_XEMACS void describe_XIM (XIM xim) { XIMStyles *styles; /* Print locale of XIM */ stderr_out ("\nXIM Locale of IM: %s\n", XLocaleOfIM(xim)); /* List supported input method styles */ XGetIMValues(xim, XNQueryInputStyle, &styles, NULL); stderr_out ("\n%d input style(s) supported by input method.\n", styles->count_styles); #ifdef DEBUG_XIM { int i; for (i=0; i < styles->count_styles; i++) describe_XIMStyle (styles->supported_styles[i]); } #endif /* DEBUG_XIM */ XFree(styles); } void describe_XFontSet (XFontSet fontset) { XFontStruct **font_struct_list; char **font_name_list; int count, i; if (fontset == NULL) { stderr_out ("NULL\n"); return; } count = XFontsOfFontSet (fontset, &font_struct_list, &font_name_list); stderr_out ( "%d font(s) available:\n", count); for (i=0 ; i < count ; i++) stderr_out ("Font: %s\n", *(font_name_list+i)); } void describe_Status (Status status) { #define DESCRIBE_STATUS(value) \ if (status == value) stderr_out ("Status: " #value "\n") DESCRIBE_STATUS (XBufferOverflow); DESCRIBE_STATUS (XLookupNone); DESCRIBE_STATUS (XLookupKeySym); DESCRIBE_STATUS (XLookupBoth); DESCRIBE_STATUS (XLookupChars); #undef DESCRIBE_STATUS } void describe_Window (Window win) { char xwincmd[128]; sprintf (xwincmd, "xwininfo -id 0x%x >&2; xwininfo -events -id 0x%x >&2", (int) win, (int) win); system (xwincmd); } void describe_XIC (XIC xic) { XIMStyle style; Window client_win=0, focus_win=0; char *resourceName = NULL; char *resourceClass = NULL; char *bad_arg = NULL; unsigned long filter_mask = NoEventMask; XVaNestedList p_list, s_list; XFontSet p_fontset = NULL, s_fontset = NULL; Pixel p_fg=0, p_bg = 0, s_fg=0, s_bg = 0; XRectangle *p_area = NULL, *s_area = NULL; XRectangle *p_needed = NULL, *s_needed = NULL; XPoint *p_spot = NULL; /* Check for valid input context and method */ if (!xic) stderr_out ("Input method is NULL\n"); if (!XIMOfIC(xic)) stderr_out ("XIMOfIC() returns NULL\n"); /* Print out Input Context Attributes */ p_list = XVaCreateNestedList (0, XNFontSet, &p_fontset, XNArea, &p_area, XNAreaNeeded, &p_needed, XNSpotLocation, &p_spot, XNForeground, &p_fg, XNBackground, &p_bg, NULL); s_list = XVaCreateNestedList (0, XNFontSet, &s_fontset, XNArea, &s_area, XNAreaNeeded, &s_needed, XNForeground, &s_fg, XNBackground, &s_bg, NULL); bad_arg = XGetICValues(xic, XNInputStyle, &style, XNFilterEvents, &filter_mask, XNClientWindow, &client_win, XNFocusWindow, &focus_win, XNResourceName, &resourceName, XNResourceClass, &resourceClass, XNPreeditAttributes, p_list, XNStatusAttributes, s_list, NULL); XFree(p_list); XFree(s_list); if (bad_arg != NULL) stderr_out ("Couldn't get IC value: %s\n", bad_arg); stderr_out ("\nInput method context attributes:\n"); stderr_out ("Style: "); describe_XIMStyle (style); stderr_out ("Client window: %lx\n", (unsigned long int)client_win); stderr_out ("Focus window: %lx\n", (unsigned long int)focus_win); stderr_out ("Preedit:\n"); describe_XRectangle (" Area", p_area); describe_XRectangle (" Area needed", p_needed); stderr_out (" foreground: %lx\n", (unsigned long int)p_fg); stderr_out (" background: %lx\n", (unsigned long int)p_bg); stderr_out (" fontset: "); describe_XFontSet (p_fontset); stderr_out ("Status:\n"); describe_XRectangle (" Area", s_area); describe_XRectangle (" Area needed", s_needed); stderr_out (" foreground: %lx\n", (unsigned long int)s_fg); stderr_out (" background: %lx\n", (unsigned long int)s_bg); stderr_out (" fontset: \n"); describe_XFontSet (s_fontset); stderr_out ("XNResourceName: %s\n", resourceName ? resourceName : "NULL"); stderr_out ("XNResourceClass: %s\n", resourceClass ? resourceClass : "NULL"); stderr_out ("XNFilterEvents: "); describe_event_mask (filter_mask); } void describe_XRectangle (char *name, XRectangle *r) { if (r == NULL) stderr_out ("%s: NULL\n", name); else stderr_out ("%s: x=%d y=%d w=%d h=%d\n", name, r->x, r->y, r->width, r->height); } /* Print out elements of Event mask */ /* Defines from X11/X.h */ void describe_event_mask (unsigned long mask) { #define DESCRIBE_EVENT_MASK(bit) if ((bit) & mask) stderr_out (#bit " ") DESCRIBE_EVENT_MASK (NoEventMask); DESCRIBE_EVENT_MASK (KeyPressMask); DESCRIBE_EVENT_MASK (KeyReleaseMask); DESCRIBE_EVENT_MASK (ButtonPressMask); DESCRIBE_EVENT_MASK (ButtonReleaseMask); DESCRIBE_EVENT_MASK (EnterWindowMask); DESCRIBE_EVENT_MASK (LeaveWindowMask); DESCRIBE_EVENT_MASK (PointerMotionMask); DESCRIBE_EVENT_MASK (PointerMotionHintMask); DESCRIBE_EVENT_MASK (Button1MotionMask); DESCRIBE_EVENT_MASK (Button2MotionMask); DESCRIBE_EVENT_MASK (Button3MotionMask); DESCRIBE_EVENT_MASK (Button4MotionMask); DESCRIBE_EVENT_MASK (Button5MotionMask); DESCRIBE_EVENT_MASK (ButtonMotionMask); DESCRIBE_EVENT_MASK (KeymapStateMask); DESCRIBE_EVENT_MASK (ExposureMask); DESCRIBE_EVENT_MASK (VisibilityChangeMask); DESCRIBE_EVENT_MASK (StructureNotifyMask); DESCRIBE_EVENT_MASK (ResizeRedirectMask); DESCRIBE_EVENT_MASK (SubstructureNotifyMask); DESCRIBE_EVENT_MASK (SubstructureRedirectMask); DESCRIBE_EVENT_MASK (FocusChangeMask); DESCRIBE_EVENT_MASK (PropertyChangeMask); DESCRIBE_EVENT_MASK (ColormapChangeMask); DESCRIBE_EVENT_MASK (OwnerGrabButtonMask); #undef DESCRIBE_EVENT_MASK stderr_out("\n"); } void describe_XIMStyle (XIMStyle style) { #define DESCRIBE_STYLE(bit) \ if (bit & style) \ stderr_out (#bit " "); DESCRIBE_STYLE (XIMPreeditArea); DESCRIBE_STYLE (XIMPreeditCallbacks); DESCRIBE_STYLE (XIMPreeditPosition); DESCRIBE_STYLE (XIMPreeditNothing); DESCRIBE_STYLE (XIMPreeditNone); DESCRIBE_STYLE (XIMStatusArea); DESCRIBE_STYLE (XIMStatusCallbacks); DESCRIBE_STYLE (XIMStatusNothing); DESCRIBE_STYLE (XIMStatusNone); #undef DESCRIBE_STYLE stderr_out("\n"); } void describe_XIMStyles (XIMStyles *p) { int i; stderr_out ("%d Style(s):\n", p->count_styles); for (i=0; i<p->count_styles ; i++) { describe_XIMStyle (p->supported_styles[i]); } } #endif /* DEBUG_XEMACS */ /* Random cruft follows */ #if 0 static void Unit_Test (struct frame *f, char * s) /* mrb unit testing */ { XrmValue fromVal, toVal; fromVal.addr = s; fromVal.size = strlen (s); toVal.addr = (XtPointer) &user_preferred_XIMStyles; toVal.size = sizeof (XIMStyles); if (XtConvertAndStore (FRAME_X_TEXT_WIDGET (f), XtRString, &fromVal, XtRXimStyles, &toVal) != False) { stderr_out ("Unit_Test: fromVal.addr=0x%x\n",fromVal.addr); stderr_out ("Unit_Test: fromVal.size=%d\n", fromVal.size); stderr_out ("Unit_Test: toVal.addr=0x%x\n", toVal.addr); stderr_out ("Unit_Test: toVal.size=%d\n", toVal.size); describe_XIMStyles ((XIMStyles *) toVal.addr); } } #endif #endif /* XIM_XLIB only */ #if 0 /* Get a fontset for IM to use */ void x_init_fontset (struct device *d) { Display *dpy = DEVICE_X_DISPLAY (d); XFontSet fontset; char ** missing_charsets; int num_missing_charsets; char * default_string; /* char * font_set_string = "-dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*";*/ char * font_set_string = "-dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*, -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0,-misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0, -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0" ; DEVICE_X_FONTSET (d) = fontset = XCreateFontSet (dpy, font_set_string, &missing_charsets, &num_missing_charsets, &default_string); if (fontset == NULL) { stderr_out ("Unable to create fontset from string:\n%s\n", font_set_string); return; } if (num_missing_charsets > 0) { int i; stderr_out ("\nMissing charsets for fontset %s:\n", font_set_string); for (i=0; i < num_missing_charsets; i++) { stderr_out ("%s\n", missing_charsets[i]); } XFreeStringList (missing_charsets); stderr_out ("Default string: %s\n", default_string); } #ifdef DEBUG_XIM describe_XFontSet (fontset); #endif } #endif /* 0 */
