Mercurial > hg > xemacs-beta
annotate lisp/mule/mule-composite.el @ 1204:e22b0213b713
[xemacs-hg @ 2003-01-12 11:07:58 by michaels]
modules/ChangeLog:
2002-12-16 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
remove ifdef USE_KKCC.
src/ChangeLog:
2003-01-08 Mike Sperber <mike@xemacs.org>
* console.h (CDFW_CONSOLE): Don't lead to a crash if we're dealing
with a dead window/frame/device/console.
2002-12-20 Mike Sperber <mike@xemacs.org>
* ui-gtk.c: Fix typo from Ben's patch: emacs_ffi_data is a
typedef, not a struct. emacs_gtk_object_data is a typedef, not a
struct.
* gtk-glue.c (gdk_event_to_emacs_event): Fix typos from Ben's
patch: le -> emacs_event + rearrange the code.
* event-gtk.c (gtk_event_to_emacs_event): Fix typos from Ben's
patch: ..._UNDERLYING_GDK_EVENT -> ..._GDK_EVENT, ev -> key_event.
* device-gtk.c: Fix typo from Ben's patch: x_keysym_map_hash_table
-> x_keysym_map_hashtable.
2002-12-19 Mike Sperber <mike@xemacs.org>
* menubar-x.c (set_frame_menubar): Initialize protect_me field of
popup_data.
2002-12-16 Ben Wing <ben@xemacs.org>
Major cleanup of KKCC, etc.
KKCC, pdump-related:
-- descriptions are written for all objects. this required some
changes in the format of some objects, e.g. extents, popup-data,
coding system, lstream, lcrecord-list.
-- KKCC now handles weakness in markers, hash tables, elsewhere
correctly (formerly, you'd eventually get a stack overflow due
to endlessly expanding markers).
-- textual changes: lrecord_description -> memory_description,
struct_description -> sized_memory_description.
-- extensive comment describing descriptions and pdump.
-- redo XD_UNION so it works inline and change its format to provide
sufficient info for pdump. implement XD_UNION in pdump. also add
XD_UNION_DYNAMIC_SIZE, which works like XD_UNION except for when
auto-computing structure sizes.
-- add support for XD_INDIRECT in description offsets (used by
extents).
-- add support for "description maps", allowing for indirect
descriptions that are retrieved from an object at run-time. this
generalizes XD_CODING_SYSTEM_END, XD_SPECIFIER_END, etc., which
have now been eliminated.
-- add a fifth field "flags" to memory_description, to support flags
that can be specified for this particular line. Currently defined
flags are XD_FLAG_NO_KKCC (KKCC should ignore this entry; useful
for the weakness above in markers, etc.), XD_FLAG_NO_PDUMP (pdump
should ignore this entry), XD_FLAG_UNION_DEFAULT_ENTRY (in
union maps, this specifies a "default" entry for all remaining
values), and XD_FLAG_FREE_LISP_OBJECT (for use with lcrecord-lists).
-- clean up the kkcc-itis in events, so that the differences
between event data as separate objects and as a union are now
minimized to a small number of places. with the new XD_UNION, we
no longer need event data as separate objects, so this code is no
longer ifdef USE_KKCC, but instead ifdef EVENT_DATA_AS_OBJECTS,
not used by default. make sure that we explicitly free the
separate event data objects when no longer in use, to maintain the
invariant the event processing causes no consing.
-- also remove other USE_KKCC ifdefs when not necessary.
-- allow for KKCC compilation under MS Windows.
-- fix README.kkcc.
-- dump_add_root_object -> dump_add_root_lisp_object.
-- implement dump_add_root_block and use this to handle
dump_add_opaque.
-- factor out some code duplicated in kkcc and pdump.
Other allocation/object-related:
-- change various *slots.h so MARKED_SLOT() call no longer
includes semicolon.
-- free_marker() takes a Lisp_Object not a direct pointer.
-- make bit vectors lcrecords, like vectors, and eliminate code
that essentially duplicated the lcrecord handling.
-- additional asserts in FREE_FIXED_TYPE, formerly duplicated in
the various callers of this.
-- all lcrecord allocation functions now zero out the returned
lcrecords. unnecessary calls to zero_lcrecord removed. add long
comment describing these functions.
-- extract out process and coding system slots, like for buffers,
frames, etc.
-- lcrecords now set the type of items sitting on the free list to
lcrecord_type_free.
-- changes to the way that gap arrays are allocated, for kkcc's
benefit -- now, one single memory block with a stretchy array on
the end, instead of a separate block holding the array.
Error-checking-related:
-- now can compile with C++ under MS Windows. clean up compile errors
discovered that way. (a few were real problems)
-- add C++ error-checking code to verify problems with mismatched
GCPRO/UNGCPRO. (there were a few in the kkcc code.) add long
comment about how to catch insufficient GCPRO (yes, it's possible
using C++).
-- add debug_p4(), a simple object printer, when debug_print()
doesn't work.
-- add dp() and db() as short synonyms of debug_print(),
debug_backtrace().
-- `print' tries EXTREMELY hard to avoid core dumping when printing
when crashing or from debug_print(), and tries as hard as it
reasonably can in other situations.
-- Correct the message output upon crashing to be more up-to-date.
Event-related:
-- document event-matches-key-specifier-p better.
-- generalize the dispatch queues formerly duplicated in the
various event implementations. add event methods to drain pending
events. generalize and clean up QUIT handling, removing
event-specific quit processing. allow arbitrary keystrokes, not
just ASCII, to be the QUIT char. among other things, this should
fix some longstanding bugs in X quit handling. long comment
describing the various event queues.
-- implement delaying of XFlush() if there are pending expose events.
SOMEONE PLEASE TRY THIS OUT.
-- Fix `xemacs -batch -l dunnet' under Cygwin. Try to fix under
MS Windows but not quite there yet.
Other:
-- class -> class_ and no more C++ games with this item.
new -> new_ in the lwlib code, so far not elsewhere.
-- use `struct htentry' not `struct hentry' in elhash.c to avoid
debugger confusion with hash.c.
-- new macros ALIST_LOOP_3, ALIST_LOOP_4.
* README.kkcc:
* alloc.c:
* alloc.c (deadbeef_memory):
* alloc.c (allocate_lisp_storage):
* alloc.c (copy_lisp_object):
* alloc.c (ALLOCATE_FIXED_TYPE_1):
* alloc.c (FREE_FIXED_TYPE):
* alloc.c (make_vector_internal):
* alloc.c (make_bit_vector_internal):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (struct string_chars_block):
* alloc.c (mark_lcrecord_list):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (alloc_automanaged_lcrecord):
* alloc.c (staticpro_1):
* alloc.c (staticpro):
* alloc.c (lispdesc_indirect_count_1):
* alloc.c (lispdesc_indirect_description_1):
* alloc.c (lispdesc_one_description_line_size):
* alloc.c (lispdesc_structure_size):
* alloc.c (mark_object_maybe_checking_free):
* alloc.c (mark_with_description):
* alloc.c (mark_struct_contents):
* alloc.c (mark_object):
* alloc.c (tick_lcrecord_stats):
* alloc.c (free_cons):
* alloc.c (free_key_data):
* alloc.c (free_button_data):
* alloc.c (free_motion_data):
* alloc.c (free_process_data):
* alloc.c (free_timeout_data):
* alloc.c (free_magic_data):
* alloc.c (free_magic_eval_data):
* alloc.c (free_eval_data):
* alloc.c (free_misc_user_data):
* alloc.c (free_marker):
* alloc.c (compact_string_chars):
* alloc.c (gc_sweep):
* alloc.c (garbage_collect_1):
* alloc.c (Fgarbage_collect):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c:
* buffer.c (mark_buffer):
* buffer.c (MARKED_SLOT):
* buffer.c (cleanup_buffer_undo_lists):
* buffer.c (Fget_file_buffer):
* buffer.h (MARKED_SLOT):
* bufslots.h:
* bytecode.c:
* callint.c:
* casetab.c:
* chartab.c:
* chartab.c (symbol_to_char_table_type):
* cmdloop.c:
* cmdloop.c (Fcommand_loop_1):
* config.h.in (new):
* conslots.h:
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h:
* console-impl.h (struct console):
* console-impl.h (MARKED_SLOT):
* console-impl.h (CONSOLE_QUIT_EVENT):
* console-msw-impl.h (XM_BUMPQUEUE):
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.h:
* console-stream-impl.h:
* console-stream-impl.h (struct stream_console):
* console-stream.c:
* console-stream.c (stream_init_console):
* console-stream.h:
* console-tty.c:
* console-tty.h:
* console-x.h:
* console.c:
* console.c (mark_console):
* console.c (MARKED_SLOT):
* console.c (allocate_console):
* console.c (get_console_variant):
* console.c (create_console):
* console.c (delete_console_internal):
* console.c (Fset_input_mode):
* console.c (Fcurrent_input_mode):
* console.c (common_init_complex_vars_of_console):
* console.h:
* console.h (console_variant):
* console.h (device_metrics):
* data.c:
* data.c (Faref):
* data.c (Faset):
* data.c (decode_weak_list_type):
* database.c:
* debug.c (xemacs_debug_loop):
* debug.c (FROB):
* debug.c (Fadd_debug_class_to_check):
* debug.c (Fdelete_debug_class_to_check):
* debug.c (Fset_debug_classes_to_check):
* debug.c (Fset_debug_class_types_to_check):
* debug.c (Fdebug_types_being_checked):
* debug.h (DASSERT):
* device-gtk.c:
* device-impl.h (struct device):
* device-impl.h (MARKED_SLOT):
* device-msw.c:
* device-x.c:
* device-x.c (x_init_device_class):
* device-x.c (x_comp_visual_info):
* device-x.c (x_try_best_visual_class):
* device-x.c (x_init_device):
* device-x.c (construct_name_list):
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_display_visual_class):
* device.c:
* device.c (MARKED_SLOT):
* device.c (allocate_device):
* device.c (Fmake_device):
* device.c (delete_device_internal):
* device.c (Fset_device_class):
* device.h:
* devslots.h:
* devslots.h (MARKED_SLOT):
* dialog-msw.c:
* dired-msw.c (mswindows_ls_sort_fcn):
* dired-msw.c (mswindows_get_files):
* dired-msw.c (mswindows_format_file):
* doprnt.c (parse_doprnt_spec):
* dumper.c:
* dumper.c (struct):
* dumper.c (dump_add_root_block):
* dumper.c (dump_add_root_struct_ptr):
* dumper.c (dump_add_root_lisp_object):
* dumper.c (pdump_struct_list_elt):
* dumper.c (pdump_get_entry_list):
* dumper.c (pdump_backtrace):
* dumper.c (pdump_bump_depth):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_register_object):
* dumper.c (pdump_register_struct_contents):
* dumper.c (pdump_register_struct):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_dump_data):
* dumper.c (pdump_reloc_one):
* dumper.c (pdump_allocate_offset):
* dumper.c (pdump_scan_by_alignment):
* dumper.c (pdump_dump_root_blocks):
* dumper.c (pdump_dump_rtables):
* dumper.c (pdump_dump_root_lisp_objects):
* dumper.c (pdump):
* dumper.c (pdump_load_finish):
* dumper.c (pdump_file_get):
* dumper.c (pdump_resource_get):
* dumper.c (pdump_load):
* editfns.c (save_excursion_restore):
* editfns.c (user_login_name):
* editfns.c (save_restriction_restore):
* elhash.c:
* elhash.c (htentry):
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (HTENTRY_CLEAR_P):
* elhash.c (LINEAR_PROBING_LOOP):
* elhash.c (check_hash_table_invariants):
* elhash.c (mark_hash_table):
* elhash.c (hash_table_equal):
* elhash.c (print_hash_table_data):
* elhash.c (free_hentries):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (decode_hash_table_weakness):
* elhash.c (decode_hash_table_test):
* elhash.c (Fcopy_hash_table):
* elhash.c (resize_hash_table):
* elhash.c (pdump_reorganize_hash_table):
* elhash.c (find_htentry):
* elhash.c (Fgethash):
* elhash.c (Fputhash):
* elhash.c (remhash_1):
* elhash.c (Fremhash):
* elhash.c (Fclrhash):
* elhash.c (copy_compress_hentries):
* elhash.c (elisp_maphash_unsafe):
* elhash.c (finish_marking_weak_hash_tables):
* elhash.c (prune_weak_hash_tables):
* elhash.h:
* emacs.c:
* emacs.c (main_1):
* emacs.c (main):
* emacs.c (shut_down_emacs):
* emodules.h (dump_add_root_lisp_object):
* eval.c:
* eval.c (unwind_to_catch):
* eval.c (maybe_signal_error_1):
* eval.c (maybe_signal_continuable_error_1):
* eval.c (maybe_signal_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (maybe_signal_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (maybe_signal_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (maybe_syntax_error):
* eval.c (maybe_sferror):
* eval.c (maybe_invalid_argument):
* eval.c (maybe_invalid_constant):
* eval.c (maybe_invalid_operation):
* eval.c (maybe_invalid_change):
* eval.c (maybe_invalid_state):
* eval.c (Feval):
* eval.c (call_trapping_problems):
* eval.c (call_with_suspended_errors):
* eval.c (warn_when_safe_lispobj):
* eval.c (warn_when_safe):
* eval.c (vars_of_eval):
* event-Xt.c:
* event-Xt.c (maybe_define_x_key_as_self_inserting_character):
* event-Xt.c (x_to_emacs_keysym):
* event-Xt.c (x_event_to_emacs_event):
* event-Xt.c (emacs_Xt_enqueue_focus_event):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (emacs_Xt_compare_magic_event):
* event-Xt.c (emacs_Xt_hash_magic_event):
* event-Xt.c (emacs_Xt_handle_magic_event):
* event-Xt.c (Xt_timeout_to_emacs_event):
* event-Xt.c (Xt_process_to_emacs_event):
* event-Xt.c (signal_special_Xt_user_event):
* event-Xt.c (emacs_Xt_next_event):
* event-Xt.c (emacs_Xt_event_handler):
* event-Xt.c (emacs_Xt_drain_queue):
* event-Xt.c (emacs_Xt_event_pending_p):
* event-Xt.c (check_if_pending_expose_event):
* event-Xt.c (reinit_vars_of_event_Xt):
* event-Xt.c (vars_of_event_Xt):
* event-gtk.c:
* event-gtk.c (IS_MODIFIER_KEY):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (emacs_gtk_compare_magic_event):
* event-gtk.c (emacs_gtk_hash_magic_event):
* event-gtk.c (emacs_gtk_handle_magic_event):
* event-gtk.c (gtk_to_emacs_keysym):
* event-gtk.c (gtk_timeout_to_emacs_event):
* event-gtk.c (gtk_process_to_emacs_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (signal_special_gtk_user_event):
* event-gtk.c (emacs_gtk_next_event):
* event-gtk.c (gtk_event_to_emacs_event):
* event-gtk.c (generic_event_handler):
* event-gtk.c (emacs_shell_event_handler):
* event-gtk.c (emacs_gtk_drain_queue):
* event-gtk.c (emacs_gtk_event_pending_p):
* event-gtk.c (reinit_vars_of_event_gtk):
* event-gtk.c (vars_of_event_gtk):
* event-msw.c:
* event-msw.c (struct winsock_stream):
* event-msw.c (winsock_reader):
* event-msw.c (winsock_writer):
* event-msw.c (mswindows_enqueue_dispatch_event):
* event-msw.c (mswindows_enqueue_misc_user_event):
* event-msw.c (mswindows_enqueue_magic_event):
* event-msw.c (mswindows_enqueue_process_event):
* event-msw.c (mswindows_enqueue_mouse_button_event):
* event-msw.c (mswindows_enqueue_keypress_event):
* event-msw.c (mswindows_dequeue_dispatch_event):
* event-msw.c (emacs_mswindows_drain_queue):
* event-msw.c (mswindows_need_event_in_modal_loop):
* event-msw.c (mswindows_need_event):
* event-msw.c (mswindows_wm_timer_callback):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (remove_timeout_mapper):
* event-msw.c (emacs_mswindows_remove_timeout):
* event-msw.c (emacs_mswindows_event_pending_p):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-msw.c (emacs_mswindows_compare_magic_event):
* event-msw.c (emacs_mswindows_hash_magic_event):
* event-msw.c (emacs_mswindows_handle_magic_event):
* event-msw.c (emacs_mswindows_select_console):
* event-msw.c (emacs_mswindows_unselect_console):
* event-msw.c (reinit_vars_of_event_mswindows):
* event-msw.c (vars_of_event_mswindows):
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (reset_command_builder_event_chain):
* event-stream.c (allocate_command_builder):
* event-stream.c (copy_command_builder):
* event-stream.c (command_builder_append_event):
* event-stream.c (event_stream_event_pending_p):
* event-stream.c (event_stream_force_event_pending):
* event-stream.c (maybe_read_quit_event):
* event-stream.c (event_stream_drain_queue):
* event-stream.c (remove_quit_p_event):
* event-stream.c (event_stream_quit_p):
* event-stream.c (echo_key_event):
* event-stream.c (maybe_kbd_translate):
* event-stream.c (execute_help_form):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (enqueue_dispatch_event):
* event-stream.c (enqueue_magic_eval_event):
* event-stream.c (Fenqueue_eval_event):
* event-stream.c (enqueue_misc_user_event):
* event-stream.c (enqueue_misc_user_event_pos):
* event-stream.c (next_event_internal):
* event-stream.c (Fnext_event):
* event-stream.c (Faccept_process_output):
* event-stream.c (execute_internal_event):
* event-stream.c (munge_keymap_translate):
* event-stream.c (command_builder_find_leaf_no_mule_processing):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* event-stream.c (is_scrollbar_event):
* event-stream.c (execute_command_event):
* event-stream.c (Fdispatch_event):
* event-stream.c (Fread_key_sequence):
* event-stream.c (dribble_out_event):
* event-stream.c (vars_of_event_stream):
* event-tty.c (tty_timeout_to_emacs_event):
* event-tty.c (emacs_tty_next_event):
* event-tty.c (emacs_tty_drain_queue):
* event-tty.c (reinit_vars_of_event_tty):
* event-unixoid.c:
* event-unixoid.c (find_tty_or_stream_console_from_fd):
* event-unixoid.c (read_event_from_tty_or_stream_desc):
* event-unixoid.c (drain_tty_devices):
* event-unixoid.c (poll_fds_for_input):
* events.c:
* events.c (deinitialize_event):
* events.c (zero_event):
* events.c (mark_event):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* events.c (event_hash):
* events.c (Fmake_event):
* events.c (Fdeallocate_event):
* events.c (Fcopy_event):
* events.c (map_event_chain_remove):
* events.c (character_to_event):
* events.c (event_to_character):
* events.c (Fevent_to_character):
* events.c (format_event_object):
* events.c (upshift_event):
* events.c (downshift_event):
* events.c (event_upshifted_p):
* events.c (Fevent_live_p):
* events.c (Fevent_type):
* events.c (Fevent_timestamp):
* events.c (CHECK_EVENT_TYPE):
* events.c (CHECK_EVENT_TYPE2):
* events.c (CHECK_EVENT_TYPE3):
* events.c (Fevent_key):
* events.c (Fevent_button):
* events.c (Fevent_modifier_bits):
* events.c (event_x_y_pixel_internal):
* events.c (event_pixel_translation):
* events.c (Fevent_process):
* events.c (Fevent_function):
* events.c (Fevent_object):
* events.c (Fevent_properties):
* events.c (syms_of_events):
* events.c (vars_of_events):
* events.h:
* events.h (struct event_stream):
* events.h (struct Lisp_Key_Data):
* events.h (KEY_DATA_KEYSYM):
* events.h (EVENT_KEY_KEYSYM):
* events.h (struct Lisp_Button_Data):
* events.h (EVENT_BUTTON_BUTTON):
* events.h (struct Lisp_Motion_Data):
* events.h (EVENT_MOTION_X):
* events.h (struct Lisp_Process_Data):
* events.h (EVENT_PROCESS_PROCESS):
* events.h (struct Lisp_Timeout_Data):
* events.h (EVENT_TIMEOUT_INTERVAL_ID):
* events.h (struct Lisp_Eval_Data):
* events.h (EVENT_EVAL_FUNCTION):
* events.h (struct Lisp_Misc_User_Data):
* events.h (EVENT_MISC_USER_FUNCTION):
* events.h (struct Lisp_Magic_Eval_Data):
* events.h (EVENT_MAGIC_EVAL_INTERNAL_FUNCTION):
* events.h (struct Lisp_Magic_Data):
* events.h (EVENT_MAGIC_UNDERLYING):
* events.h (EVENT_MAGIC_GDK_EVENT):
* events.h (struct Lisp_Event):
* events.h (XEVENT_CHANNEL):
* events.h (SET_EVENT_TIMESTAMP_ZERO):
* events.h (SET_EVENT_CHANNEL):
* events.h (SET_EVENT_NEXT):
* events.h (XSET_EVENT_TYPE):
* events.h (struct command_builder):
* extents.c:
* extents.c (gap_array_adjust_markers):
* extents.c (gap_array_recompute_derived_values):
* extents.c (gap_array_move_gap):
* extents.c (gap_array_make_gap):
* extents.c (gap_array_insert_els):
* extents.c (gap_array_delete_els):
* extents.c (gap_array_make_marker):
* extents.c (gap_array_delete_marker):
* extents.c (gap_array_move_marker):
* extents.c (make_gap_array):
* extents.c (free_gap_array):
* extents.c (extent_list_num_els):
* extents.c (extent_list_insert):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (decode_extent_at_flag):
* extents.c (verify_extent_mapper):
* extents.c (symbol_to_glyph_layout):
* extents.c (syms_of_extents):
* faces.c:
* file-coding.c:
* file-coding.c (struct_detector_category_description =):
* file-coding.c (detector_category_dynarr_description_1):
* file-coding.c (struct_detector_description =):
* file-coding.c (detector_dynarr_description_1):
* file-coding.c (MARKED_SLOT):
* file-coding.c (mark_coding_system):
* file-coding.c (coding_system_extra_description_map):
* file-coding.c (coding_system_description):
* file-coding.c (allocate_coding_system):
* file-coding.c (symbol_to_eol_type):
* file-coding.c (Fcoding_system_aliasee):
* file-coding.c (set_coding_stream_coding_system):
* file-coding.c (struct convert_eol_coding_system):
* file-coding.c (struct undecided_coding_system):
* file-coding.c (undecided_mark_coding_stream):
* file-coding.c (coding_category_symbol_to_id):
* file-coding.c (struct gzip_coding_system):
* file-coding.c (coding_system_type_create):
* file-coding.h:
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (CODING_SYSTEM_SLOT_DECLARATION):
* file-coding.h (coding_system_variant):
* file-coding.h (struct coding_system_methods):
* file-coding.h (DEFINE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (struct coding_stream):
* fileio.c (Fsubstitute_in_file_name):
* floatfns.c:
* fns.c:
* fns.c (base64_encode_1):
* frame-gtk.c:
* frame-gtk.c (Fgtk_start_drag_internal):
* frame-impl.h (struct frame):
* frame-impl.h (MARKED_SLOT):
* frame-msw.c:
* frame-x.c:
* frame-x.c (Fcde_start_drag_internal):
* frame-x.c (Foffix_start_drag_internal):
* frame.c:
* frame.c (MARKED_SLOT):
* frame.c (allocate_frame_core):
* frame.c (delete_frame_internal):
* frame.c (Fmouse_position_as_motion_event):
* frameslots.h:
* frameslots.h (MARKED_SLOT_ARRAY):
* free-hook.c:
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-x.c:
* glyphs-x.c (convert_EImage_to_XImage):
* glyphs.c:
* glyphs.c (process_image_string_instantiator):
* glyphs.c (mark_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (unmap_subwindow):
* glyphs.c (map_subwindow):
* glyphs.c (syms_of_glyphs):
* glyphs.c (specifier_type_create_image):
* glyphs.h:
* glyphs.h (struct text_image_instance):
* glyphs.h (struct Lisp_Image_Instance):
* gmalloc.c:
* gmalloc.c ("C"):
* gpmevent.c (Freceive_gpm_event):
* gpmevent.c (gpm_next_event_cb):
* gpmevent.c (vars_of_gpmevent):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.c (gtk_xemacs_class_init):
* gui-msw.c:
* gui-msw.c (mswindows_handle_gui_wm_command):
* gui-msw.c (mswindows_translate_menu_or_dialog_item):
* gui-x.c:
* gui-x.c (mark_popup_data):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (gcpro_popup_callbacks):
* gui-x.c (ungcpro_popup_callbacks):
* gui-x.c (free_popup_widget_value_tree):
* gui-x.c (popup_selection_callback):
* gui-x.h:
* gui-x.h (struct popup_data):
* gui.c:
* gui.c (allocate_gui_item):
* gutter.c (decode_gutter_position):
* hash.c (NULL_ENTRY):
* indent.c (vmotion_1):
* indent.c (vmotion_pixels):
* input-method-motif.c (res):
* input-method-xlib.c (IMInstantiateCallback):
* input-method-xlib.c (XIM_init_device):
* input-method-xlib.c (res):
* intl-encap-win32.c:
* intl-encap-win32.c (qxeSHGetDataFromIDList):
* intl-win32.c:
* intl-win32.c (mswindows_multibyte_cp_type):
* intl-win32.c (struct mswindows_multibyte_coding_system):
* keymap.c:
* keymap.c (make_key_description):
* keymap.c (keymap_store):
* keymap.c (get_keyelt):
* keymap.c (keymap_lookup_1):
* keymap.c (define_key_parser):
* keymap.c (key_desc_list_to_event):
* keymap.c (event_matches_key_specifier_p):
* keymap.c (meta_prefix_char_p):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fdefine_key):
* keymap.c (struct raw_lookup_key_mapper_closure):
* keymap.c (raw_lookup_key):
* keymap.c (raw_lookup_key_mapper):
* keymap.c (lookup_keys):
* keymap.c (lookup_events):
* keymap.c (Flookup_key):
* keymap.c (struct map_keymap_unsorted_closure):
* keymap.c (map_keymap_unsorted_mapper):
* keymap.c (map_keymap_sorted):
* keymap.c (map_keymap_mapper):
* keymap.c (map_keymap):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (Faccessible_keymaps):
* keymap.c (Fsingle_key_description):
* keymap.c (raw_keys_to_keys):
* keymap.c (format_raw_keys):
* keymap.c (where_is_recursive_mapper):
* keymap.c (where_is_internal):
* keymap.c (describe_map_mapper_shadow_search):
* keymap.c (keymap_lookup_inherited_mapper):
* keymap.c (describe_map_mapper):
* keymap.h (event_matches_key_specifier_p):
* lisp.h:
* lisp.h (this):
* lisp.h (RETURN_NOT_REACHED):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (UNGCPRO_1):
* lisp.h (NUNGCPRO):
* lisp.h (NNUNGCPRO):
* lisp.h (DECLARE_INLINE_HEADER):
* lrecord.h:
* lrecord.h (struct lrecord_header):
* lrecord.h (struct lcrecord_header):
* lrecord.h (lrecord_type):
* lrecord.h (struct lrecord_implementation):
* lrecord.h (RECORD_DUMPABLE):
* lrecord.h (memory_description_type):
* lrecord.h (data_description_entry_flags):
* lrecord.h (struct memory_description):
* lrecord.h (struct sized_memory_description):
* lrecord.h (XD_INDIRECT):
* lrecord.h (XD_IS_INDIRECT):
* lrecord.h (XD_DYNARR_DESC):
* lrecord.h (DEFINE_BASIC_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION):
* lrecord.h (alloc_lcrecord_type):
* lstream.c:
* lstream.c (Lstream_new):
* lstream.c (lisp_buffer_marker):
* lstream.h:
* lstream.h (lstream_implementation):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION_WITH_DATA):
* marker.c:
* marker.c (copy_marker_1):
* mem-limits.h:
* menubar-gtk.c:
* menubar-gtk.c (gtk_popup_menu):
* menubar-msw.c:
* menubar-msw.c (mswindows_popup_menu):
* menubar-x.c (make_dummy_xbutton_event):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (menu_accelerator_safe_compare):
* menubar-x.c (menu_accelerator_safe_mod_compare):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (Fcharset_property):
* mule-coding.c:
* mule-coding.c (ccs_description_1):
* mule-coding.c (ccs_description =):
* mule-coding.c (ccsd_description_1):
* mule-coding.c (ccsd_description =):
* nt.c (getpwnam):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_is_executable):
* nt.c (read_unc_volume):
* nt.c (mswindows_access):
* nt.c (mswindows_link):
* nt.c (mswindows_fstat):
* nt.c (mswindows_stat):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty.c:
* objects-x.c (allocate_nearest_color):
* objects.c:
* objects.c (Fmake_color_instance):
* objects.c (Fmake_font_instance):
* objects.c (font_instantiate):
* opaque.c:
* opaque.c (make_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early):
* print.c:
* print.c (printing_badness):
* print.c (printing_major_badness):
* print.c (print_internal):
* print.c (debug_p4):
* print.c (dp):
* print.c (debug_backtrace):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-unix.c:
* process-unix.c (struct unix_process_data):
* process-unix.c (get_internet_address):
* process-unix.c (unix_alloc_process_data):
* process-unix.c (unix_create_process):
* process-unix.c (try_to_initialize_subtty):
* process-unix.c (unix_kill_child_process):
* process-unix.c (process_type_create_unix):
* process.c:
* process.c (mark_process):
* process.c (MARKED_SLOT):
* process.c (make_process_internal):
* process.c (Fprocess_tty_name):
* process.c (decode_signal):
* process.h:
* procimpl.h:
* procimpl.h (struct process_methods):
* procimpl.h (struct Lisp_Process):
* rangetab.c:
* realpath.c (readlink_and_correct_case):
* redisplay-x.c (x_window_output_end):
* redisplay-x.c (x_redraw_exposed_area):
* redisplay-x.c (x_clear_frame):
* redisplay.c:
* redisplay.h:
* redisplay.h (struct rune_dglyph):
* redisplay.h (struct rune):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* specifier.c:
* specifier.c (specifier_empty_extra_description_1):
* specifier.c (make_specifier_internal):
* specifier.c (decode_locale_type):
* specifier.c (decode_how_to_add_specification):
* specifier.h:
* specifier.h (struct specifier_methods):
* specifier.h (DEFINE_SPECIFIER_TYPE_WITH_DATA):
* specifier.h (INITIALIZE_SPECIFIER_TYPE_WITH_DATA):
* symbols.c:
* symbols.c (Fsetplist):
* symbols.c (default_value):
* symbols.c (decode_magic_handler_type):
* symbols.c (handler_type_from_function_symbol):
* symbols.c (Fdefvaralias):
* symbols.c (init_symbols_once_early):
* symbols.c (reinit_symbols_early):
* symsinit.h:
* sysdep.c (sys_subshell):
* sysdep.c (tty_init_sys_modes_on_device):
* syswindows.h:
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* text.c (reinit_eistring_early):
* text.c (init_eistring_once_early):
* text.c (reinit_vars_of_text):
* text.h:
* text.h (INC_IBYTEPTR_FMT):
* text.h (DEC_IBYTEPTR_FMT):
* toolbar.c:
* toolbar.c (decode_toolbar_position):
* tooltalk.c:
* ui-gtk.c:
* unexnt.c:
* unexnt.c (_start):
* unexnt.c (unexec):
* unexnt.c (get_section_info):
* unicode.c:
* unicode.c (vars_of_unicode):
* window.c:
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (update_mirror_internal):
* winslots.h:
| author | michaels |
|---|---|
| date | Sun, 12 Jan 2003 11:08:22 +0000 |
| parents | 2923009caf47 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 778 | 1 ;;; mule-composite.el --- support character composition |
| 2 | |
| 3 ;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. | |
| 4 ;; Licensed to the Free Software Foundation. | |
| 5 | |
| 6 ;; Keywords: mule, multilingual, character composition | |
| 7 | |
| 8 ;; This file is part of GNU Emacs. | |
| 9 | |
| 10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 11 ;; it under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 ;; GNU General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
| 22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 ;; Boston, MA 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: Emacs 21.1 (lisp/composite.el). | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;;; Code: | |
| 30 | |
| 31 ;;;###autoload | |
| 32 (defconst reference-point-alist | |
| 33 '((tl . 0) (tc . 1) (tr . 2) | |
| 34 (Bl . 3) (Bc . 4) (Br . 5) | |
| 35 (bl . 6) (bc . 7) (br . 8) | |
| 36 (cl . 9) (cc . 10) (cr . 11) | |
| 37 (top-left . 0) (top-center . 1) (top-right . 2) | |
| 38 (base-left . 3) (base-center . 4) (base-right . 5) | |
| 39 (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) | |
| 40 (center-left . 9) (center-center . 10) (center-right . 11) | |
| 41 ;; For backward compatibility... | |
| 42 (ml . 3) (mc . 10) (mr . 5) | |
| 43 (mid-left . 3) (mid-center . 10) (mid-right . 5)) | |
| 44 "UNIMPLEMENTED. | |
| 45 Alist of symbols vs integer codes of glyph reference points. | |
| 46 A glyph reference point symbol is to be used to specify a composition | |
| 47 rule in COMPONENTS argument to such functions as `compose-region' and | |
| 48 `make-composition'. | |
| 49 | |
| 50 Meanings of glyph reference point codes are as follows: | |
| 51 | |
| 52 0----1----2 <---- ascent 0:tl or top-left | |
| 53 | | 1:tc or top-center | |
| 54 | | 2:tr or top-right | |
| 55 | | 3:Bl or base-left 9:cl or center-left | |
| 56 9 10 11 <---- center 4:Bc or base-center 10:cc or center-center | |
| 57 | | 5:Br or base-right 11:cr or center-right | |
| 58 --3----4----5-- <-- baseline 6:bl or bottom-left | |
| 59 | | 7:bc or bottom-center | |
| 60 6----7----8 <---- descent 8:br or bottom-right | |
| 61 | |
| 62 Glyph reference point symbols are to be used to specify composition | |
| 63 rule of the form \(GLOBAL-REF-POINT . NEW-REF-POINT), where | |
| 64 GLOBAL-REF-POINT is a reference point in the overall glyphs already | |
| 65 composed, and NEW-REF-POINT is a reference point in the new glyph to | |
| 66 be added. | |
| 67 | |
| 68 For instance, if GLOBAL-REF-POINT is `br' (bottom-right) and | |
| 69 NEW-REF-POINT is `tc' (top-center), the overall glyph is updated as | |
| 70 follows (the point `*' corresponds to both reference points): | |
| 71 | |
| 72 +-------+--+ <--- new ascent | |
| 73 | | | | |
| 74 | global| | | |
| 75 | glyph | | | |
| 76 -- | | |-- <--- baseline \(doesn't change) | |
| 77 +----+--*--+ | |
| 78 | | new | | |
| 79 | |glyph| | |
| 80 +----+-----+ <--- new descent | |
| 81 ") | |
| 82 | |
| 83 ;; Encode composition rule RULE into an integer value. RULE is a cons | |
| 84 ;; of global and new reference point symbols. | |
| 85 ;; This must be compatible with C macro COMPOSITION_ENCODE_RULE | |
| 86 ;; defined in mule-composite.h. | |
| 87 | |
| 88 (defun encode-composition-rule (rule) | |
| 89 (if (and (integerp rule) (< rule 144)) | |
| 90 ;; Already encoded. | |
| 91 rule | |
| 92 (or (consp rule) | |
| 93 (error "Invalid composition rule: %S" rule)) | |
| 94 (let ((gref (car rule)) | |
| 95 (nref (cdr rule))) | |
| 96 (or (integerp gref) | |
| 97 (setq gref (cdr (assq gref reference-point-alist)))) | |
| 98 (or (integerp nref) | |
| 99 (setq nref (cdr (assq nref reference-point-alist)))) | |
| 100 (or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12)) | |
| 101 (error "Invalid composition rule: %S" rule)) | |
| 102 (+ (* gref 12) nref)))) | |
| 103 | |
| 104 ;; Decode encoded composition rule RULE-CODE. The value is a cons of | |
| 105 ;; global and new reference point symbols. | |
| 106 ;; This must be compatible with C macro COMPOSITION_DECODE_RULE | |
| 107 ;; defined in mule-composite.h. | |
| 108 | |
| 109 (defun decode-composition-rule (rule-code) | |
| 110 (or (and (natnump rule-code) (< rule-code 144)) | |
| 111 (error "Invalid encoded composition rule: %S" rule-code)) | |
| 112 (let ((gref (car (rassq (/ rule-code 12) reference-point-alist))) | |
| 113 (nref (car (rassq (% rule-code 12) reference-point-alist)))) | |
| 114 (or (and gref (symbolp gref) nref (symbolp nref)) | |
| 115 (error "Invalid composition rule code: %S" rule-code)) | |
| 116 (cons gref nref))) | |
| 117 | |
| 118 ;; Encode composition rules in composition components COMPONENTS. The | |
| 119 ;; value is a copy of COMPONENTS, where composition rules (cons of | |
| 120 ;; global and new glyph reference point symbols) are replaced with | |
| 121 ;; encoded composition rules. Optional 2nd argument NOCOPY non-nil | |
| 122 ;; means don't make a copy but modify COMPONENTS directly. | |
| 123 | |
| 124 (defun encode-composition-components (components &optional nocopy) | |
| 125 (or nocopy | |
| 126 (setq components (copy-sequence components))) | |
| 127 (if (vectorp components) | |
| 128 (let ((len (length components)) | |
| 129 (i 1)) | |
| 130 (while (< i len) | |
| 131 (aset components i | |
| 132 (encode-composition-rule (aref components i))) | |
| 133 (setq i (+ i 2)))) | |
| 134 (let ((tail (cdr components))) | |
| 135 (while tail | |
| 136 (setcar tail | |
| 137 (encode-composition-rule (car tail))) | |
| 138 (setq tail (nthcdr 2 tail))))) | |
| 139 components) | |
| 140 | |
| 141 ;; Decode composition rule codes in composition components COMPONENTS. | |
| 142 ;; The value is a copy of COMPONENTS, where composition rule codes are | |
| 143 ;; replaced with composition rules (cons of global and new glyph | |
| 144 ;; reference point symbols). Optional 2nd argument NOCOPY non-nil | |
| 145 ;; means don't make a copy but modify COMPONENTS directly. | |
| 146 ;; It is assumed that COMPONENTS is a vector and is for rule-base | |
| 147 ;; composition, thus (2N+1)th elements are rule codes. | |
| 148 | |
| 149 (defun decode-composition-components (components &optional nocopy) | |
| 150 (or nocopy | |
| 151 (setq components (copy-sequence components))) | |
| 152 (let ((len (length components)) | |
| 153 (i 1)) | |
| 154 (while (< i len) | |
| 155 (aset components i | |
| 156 (decode-composition-rule (aref components i))) | |
| 157 (setq i (+ i 2)))) | |
| 158 components) | |
| 159 | |
| 160 ;;;###autoload | |
| 161 (defun compose-region (start end &optional components modification-func) | |
| 162 "UNIMPLEMENTED. | |
| 163 Compose characters in the current region. | |
| 164 | |
| 165 When called from a program, expects these four arguments. | |
| 166 | |
| 167 First two arguments START and END are positions (integers or markers) | |
| 168 specifying the region. | |
| 169 | |
| 170 Optional 3rd argument COMPONENTS, if non-nil, is a character or a | |
| 171 sequence (vector, list, or string) of integers. | |
| 172 | |
| 173 If it is a character, it is an alternate character to display instead | |
| 174 of the text in the region. | |
| 175 | |
| 176 If it is a string, the elements are alternate characters. | |
| 177 | |
| 178 If it is a vector or list, it is a sequence of alternate characters and | |
| 179 composition rules, where (2N)th elements are characters and (2N+1)th | |
| 180 elements are composition rules to specify how to compose (2N+2)th | |
| 181 elements with previously composed N glyphs. | |
| 182 | |
| 183 A composition rule is a cons of global and new glyph reference point | |
| 184 symbols. See the documentation of `reference-point-alist' for more | |
| 185 detail. | |
| 186 | |
| 187 Optional 4th argument MODIFICATION-FUNC is a function to call to | |
| 188 adjust the composition when it gets invalid because of a change of | |
| 189 text in the composition." | |
| 190 (interactive "r") | |
| 191 (let ((modified-p (buffer-modified-p)) | |
| 192 (buffer-read-only nil)) | |
| 193 (if (or (vectorp components) (listp components)) | |
| 194 (setq components (encode-composition-components components))) | |
| 195 (compose-region-internal start end components modification-func) | |
| 196 (set-buffer-modified-p modified-p))) | |
| 197 | |
| 198 ;;;###autoload | |
| 199 (defun decompose-region (start end) | |
| 200 "UNIMPLEMENTED. | |
| 201 Decompose text in the current region. | |
| 202 | |
| 203 When called from a program, expects two arguments, | |
| 204 positions (integers or markers) specifying the region." | |
| 205 (interactive "r") | |
| 206 (let ((modified-p (buffer-modified-p)) | |
| 207 (buffer-read-only nil)) | |
| 208 (remove-text-properties start end '(composition nil)) | |
| 209 (set-buffer-modified-p modified-p))) | |
| 210 | |
| 211 ;;;###autoload | |
| 212 (defun compose-string (string &optional start end components modification-func) | |
| 213 "UNIMPLEMENTED. | |
| 214 Compose characters in string STRING. | |
| 215 | |
| 216 The return value is STRING where `composition' property is put on all | |
| 217 the characters in it. | |
| 218 | |
| 219 Optional 2nd and 3rd arguments START and END specify the range of | |
| 220 STRING to be composed. They defaults to the beginning and the end of | |
| 221 STRING respectively. | |
| 222 | |
| 223 Optional 4th argument COMPONENTS, if non-nil, is a character or a | |
| 224 sequence (vector, list, or string) of integers. See the function | |
| 225 `compose-region' for more detail. | |
| 226 | |
| 227 Optional 5th argument MODIFICATION-FUNC is a function to call to | |
| 228 adjust the composition when it gets invalid because of a change of | |
| 229 text in the composition." | |
| 230 (if (or (vectorp components) (listp components)) | |
| 231 (setq components (encode-composition-components components))) | |
| 232 (or start (setq start 0)) | |
| 233 (or end (setq end (length string))) | |
| 234 (compose-string-internal string start end components modification-func) | |
| 235 string) | |
| 236 | |
| 237 ;;;###autoload | |
| 238 (defun decompose-string (string) | |
| 239 "UNIMPLEMENTED. | |
| 240 Return STRING where `composition' property is removed." | |
| 241 (remove-text-properties 0 (length string) '(composition nil) string) | |
| 242 string) | |
| 243 | |
| 244 ;;;###autoload | |
| 245 (defun compose-chars (&rest args) | |
| 246 "UNIMPLEMENTED. | |
| 247 Return a string from arguments in which all characters are composed. | |
| 248 For relative composition, arguments are characters. | |
| 249 For rule-based composition, Mth \(where M is odd) arguments are | |
| 250 characters, and Nth \(where N is even) arguments are composition rules. | |
| 251 A composition rule is a cons of glyph reference points of the form | |
| 252 \(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of | |
| 253 `reference-point-alist' for more detail." | |
| 254 (let (str components) | |
| 255 (if (consp (car (cdr args))) | |
| 256 ;; Rule-base composition. | |
| 257 (let (;(len (length args)) | |
| 258 (tail (encode-composition-components args 'nocopy))) | |
| 259 | |
| 260 (while tail | |
| 261 (setq str (cons (car tail) str)) | |
| 262 (setq tail (nthcdr 2 tail))) | |
| 263 (setq str (concat (nreverse str)) | |
| 264 components args)) | |
| 265 ;; Relative composition. | |
| 266 (setq str (concat args))) | |
| 267 (compose-string-internal str 0 (length str) components))) | |
| 268 | |
| 269 ;;;###autoload | |
| 270 (defun find-composition (pos &optional limit string detail-p) | |
| 271 "UNIMPLEMENTED. | |
| 272 Return information about a composition at or nearest to buffer position POS. | |
| 273 | |
| 274 If the character at POS has `composition' property, the value is a list | |
| 275 of FROM, TO, and VALID-P. | |
| 276 | |
| 277 FROM and TO specify the range of text that has the same `composition' | |
| 278 property, VALID-P is non-nil if and only if this composition is valid. | |
| 279 | |
| 280 If there's no composition at POS, and the optional 2nd argument LIMIT | |
| 281 is non-nil, search for a composition toward LIMIT. | |
| 282 | |
| 283 If no composition is found, return nil. | |
| 284 | |
| 285 Optional 3rd argument STRING, if non-nil, is a string to look for a | |
| 286 composition in; nil means the current buffer. | |
| 287 | |
| 288 If a valid composition is found and the optional 4th argument DETAIL-P | |
| 289 is non-nil, the return value is a list of FROM, TO, COMPONENTS, | |
| 290 RELATIVE-P, MOD-FUNC, and WIDTH. | |
| 291 | |
| 292 COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. | |
| 293 | |
| 294 RELATIVE-P is t if the composition method is relative, else nil. | |
| 295 | |
| 296 If RELATIVE-P is t, COMPONENTS is a vector of characters to be | |
| 297 composed. If RELATIVE-P is nil, COMPONENTS is a vector of characters | |
| 298 and composition rules as described in `compose-region'. | |
| 299 | |
| 300 MOD-FUNC is a modification function of the composition. | |
| 301 | |
| 302 WIDTH is a number of columns the composition occupies on the screen." | |
| 303 (let ((result (find-composition-internal pos limit string detail-p))) | |
| 304 (if (and detail-p result (nth 2 result) (not (nth 3 result))) | |
| 305 ;; This is a valid rule-base composition. | |
| 306 (decode-composition-components (nth 2 result) 'nocopy)) | |
| 307 result)) | |
| 308 | |
| 309 | |
| 310 ;;;###autoload | |
| 311 (defun compose-chars-after (pos &optional limit object) | |
| 312 "UNIMPLEMENTED. | |
| 313 Compose characters in current buffer after position POS. | |
| 314 | |
| 315 It looks up the char-table `composition-function-table' (which see) by | |
| 316 a character after POS. If non-nil value is found, the format of the | |
| 317 value should be an alist of PATTERNs vs FUNCs, where PATTERNs are | |
| 318 regular expressions and FUNCs are functions. If the text after POS | |
| 319 matches one of PATTERNs, call the corresponding FUNC with three | |
| 320 arguments POS, TO, and PATTERN, where TO is the end position of text | |
| 321 matching PATTERN, and return what FUNC returns. Otherwise, return | |
| 322 nil. | |
| 323 | |
| 324 FUNC is responsible for composing the text properly. The return value | |
| 325 is: | |
| 326 nil -- if no characters were composed. | |
| 327 CHARS (integer) -- if CHARS characters were composed. | |
| 328 | |
| 329 Optional 2nd arg LIMIT, if non-nil, limits the matching of text. | |
| 330 | |
| 331 Optional 3rd arg OBJECT, if non-nil, is a string that contains the | |
| 332 text to compose. In that case, POS and LIMIT index to the string. | |
| 333 | |
| 334 This function is the default value of `compose-chars-after-function'." | |
| 335 (let ((tail (get-char-table (char-after pos) composition-function-table)) | |
| 336 pattern func result) | |
| 337 (when tail | |
| 338 (save-match-data | |
| 339 (save-excursion | |
| 340 (while (and tail (not func)) | |
| 341 (setq pattern (car (car tail)) | |
| 342 func (cdr (car tail))) | |
| 343 (goto-char pos) | |
| 344 (if (if limit | |
| 345 (and (re-search-forward pattern limit t) | |
| 346 (= (match-beginning 0) pos)) | |
| 347 (looking-at pattern)) | |
| 348 (setq result (funcall func pos (match-end 0) pattern nil)) | |
| 349 (setq func nil tail (cdr tail))))))) | |
| 350 result)) | |
| 351 | |
| 352 ;;;###autoload | |
| 353 (defun compose-last-chars (args) | |
| 354 "UNIMPLEMENTED. | |
| 355 Compose last characters. | |
| 356 The argument is a parameterized event of the form | |
| 357 \(compose-last-chars N COMPONENTS), | |
| 358 where N is the number of characters before point to compose, | |
| 359 COMPONENTS, if non-nil, is the same as the argument to `compose-region' | |
| 360 \(which see). If it is nil, `compose-chars-after' is called, | |
| 361 and that function find a proper rule to compose the target characters. | |
| 362 This function is intended to be used from input methods. | |
| 363 The global keymap binds special event `compose-last-chars' to this | |
| 364 function. Input method may generate an event (compose-last-chars N COMPONENTS) | |
| 365 after a sequence character events." | |
| 366 (interactive "e") | |
| 367 (let ((chars (nth 1 args))) | |
| 368 (if (and (numberp chars) | |
| 369 (>= (- (point) (point-min)) chars)) | |
| 370 (if (nth 2 args) | |
| 371 (compose-region (- (point) chars) (point) (nth 2 args)) | |
| 372 (compose-chars-after (- (point) chars) (point)))))) | |
| 373 | |
| 374 ;;;###autoload(global-set-key [compose-last-chars] 'compose-last-chars) | |
| 375 | |
| 376 | |
| 377 ;;; The following codes are only for backward compatibility with Emacs | |
| 378 ;;; 20.4 and the earlier. | |
| 379 | |
| 380 ;;;###autoload | |
| 381 (defun decompose-composite-char (char &optional type with-composition-rule) | |
| 382 "UNIMPLEMENTED. | |
| 383 Convert CHAR to string. | |
| 384 This is only for backward compatibility with Emacs 20.4 and the earlier. | |
| 385 | |
| 386 If optional 2nd arg TYPE is non-nil, it is `string', `list', or | |
| 387 `vector'. In this case, CHAR is converted string, list of CHAR, or | |
| 388 vector of CHAR respectively." | |
| 389 (cond ((or (null type) (eq type 'string)) (char-to-string char)) | |
| 390 ((eq type 'list) (list char)) | |
| 391 (t (vector char)))) | |
| 392 | |
| 393 (make-obsolete 'decompose-composite-char 'char-to-string | |
| 394 ;;"21.1" | |
| 395 ) | |
| 396 | |
| 397 | |
| 398 ;;; mule-composite.el ends here |