Mercurial > hg > xemacs-beta
diff src/keymap.c @ 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 | 0dc7756a58c4 |
| children | a8d8f419b459 |
line wrap: on
line diff
--- a/src/keymap.c Sun Jan 12 11:04:30 2003 +0000 +++ b/src/keymap.c Sun Jan 12 11:08:22 2003 +0000 @@ -269,7 +269,7 @@ (long) XINT (Fkeymap_fullness (obj)), keymap->header.uid); } -static const struct lrecord_description keymap_description[] = { +static const struct memory_description keymap_description[] = { { XD_LISP_OBJECT, offsetof (Lisp_Keymap, parents) }, { XD_LISP_OBJECT, offsetof (Lisp_Keymap, prompt) }, { XD_LISP_OBJECT, offsetof (Lisp_Keymap, table) }, @@ -281,18 +281,11 @@ }; /* No need for keymap_equal #### Why not? */ -#ifdef USE_KKCC DEFINE_LRECORD_IMPLEMENTATION ("keymap", keymap, 1, /*dumpable-flag*/ mark_keymap, print_keymap, 0, 0, 0, keymap_description, Lisp_Keymap); -#else /* not USE_KKCC */ -DEFINE_LRECORD_IMPLEMENTATION ("keymap", keymap, - mark_keymap, print_keymap, 0, 0, 0, - keymap_description, - Lisp_Keymap); -#endif /* not USE_KKCC */ /************************************************************************/ /* Traversing keymaps and their parents */ @@ -436,17 +429,10 @@ } static Lisp_Object -#ifdef USE_KKCC make_key_description (const Lisp_Key_Data *key, int prettify) { - Lisp_Object keysym = KEY_DATA_KEYSYM(key); + Lisp_Object keysym = KEY_DATA_KEYSYM (key); int modifiers = KEY_DATA_MODIFIERS (key); -#else /* not USE_KKCC */ -make_key_description (const struct key_data *key, int prettify) -{ - Lisp_Object keysym = key->keysym; - int modifiers = key->modifiers; -#endif /* not USE_KKCC */ if (prettify && CHARP (keysym)) { /* This is a little slow, but (control a) is prettier than (control 65). @@ -470,11 +456,7 @@ static Lisp_Object raw_lookup_key (Lisp_Object keymap, -#ifdef USE_KKCC const Lisp_Key_Data *raw_keys, int raw_keys_count, -#else /* not USE_KKCC */ - const struct key_data *raw_keys, int raw_keys_count, -#endif /* not USE_KKCC */ int keys_so_far, int accept_default); /* Relies on caller to gc-protect args */ @@ -658,20 +640,11 @@ /* Relies on caller to gc-protect keymap, keysym, value */ static void -#ifdef USE_KKCC keymap_store (Lisp_Object keymap, const Lisp_Key_Data *key, -#else /* not USE_KKCC */ -keymap_store (Lisp_Object keymap, const struct key_data *key, -#endif /* not USE_KKCC */ Lisp_Object value) { -#ifdef USE_KKCC Lisp_Object keysym = KEY_DATA_KEYSYM (key); int modifiers = KEY_DATA_MODIFIERS (key); -#else /* not USE_KKCC */ - Lisp_Object keysym = key->keysym; - int modifiers = key->modifiers; -#endif /* not USE_KKCC */ Lisp_Keymap *k = XKEYMAP (keymap); modifiers &= ~(XEMACS_MOD_BUTTON1 | XEMACS_MOD_BUTTON2 | XEMACS_MOD_BUTTON3 @@ -1079,28 +1052,17 @@ if (!NILP (map)) { Lisp_Object idx = Fcdr (object); -#ifdef USE_KKCC Lisp_Key_Data indirection; -#else /* not USE_KKCC */ - struct key_data indirection; -#endif /* not USE_KKCC */ if (CHARP (idx)) { -#ifdef USE_KKCC Lisp_Object event = Fmake_event (Qnil, Qnil); struct gcpro gcpro1; GCPRO1 (event); - XSET_EVENT_TYPE (event, empty_event); character_to_event (XCHAR (idx), XEVENT (event), XCONSOLE (Vselected_console), 0, 0); - indirection = *XKEY_DATA (XEVENT_DATA (event)); -#else /* not USE_KKCC */ - Lisp_Event event; - event.event_type = empty_event; - character_to_event (XCHAR (idx), &event, - XCONSOLE (Vselected_console), 0, 0); - indirection = event.event.key; -#endif /* not USE_KKCC */ + indirection.keysym = XEVENT_KEY_KEYSYM (event); + indirection.modifiers = XEVENT_KEY_MODIFIERS (event); + UNGCPRO; } else if (CONSP (idx)) { @@ -1112,11 +1074,7 @@ else if (SYMBOLP (idx)) { indirection.keysym = idx; -#ifdef USE_KKCC SET_KEY_DATA_MODIFIERS (&indirection, XINT (XCDR (idx))); -#else /* not USE_KKCC */ - indirection.modifiers = 0; -#endif /* not USE_KKCC */ } else { @@ -1142,24 +1100,14 @@ } static Lisp_Object -#ifdef USE_KKCC keymap_lookup_1 (Lisp_Object keymap, const Lisp_Key_Data *key, -#else /* not USE_KKCC */ -keymap_lookup_1 (Lisp_Object keymap, const struct key_data *key, -#endif /* not USE_KKCC */ int accept_default) { /* This function can GC */ -#ifdef USE_KKCC return get_keyelt (keymap_lookup_directly (keymap, KEY_DATA_KEYSYM (key), KEY_DATA_MODIFIERS (key)), accept_default); -#else /* not USE_KKCC */ - return get_keyelt (keymap_lookup_directly (keymap, - key->keysym, key->modifiers), - accept_default); -#endif /* not USE_KKCC */ } @@ -1452,58 +1400,35 @@ */ static void -#ifdef USE_KKCC define_key_parser (Lisp_Object spec, Lisp_Key_Data *returned_value) -#else /* not USE_KKCC */ -define_key_parser (Lisp_Object spec, struct key_data *returned_value) -#endif /* not USE_KKCC */ { if (CHAR_OR_CHAR_INTP (spec)) { -#ifdef USE_KKCC Lisp_Object event = Fmake_event (Qnil, Qnil); struct gcpro gcpro1; GCPRO1 (event); - XSET_EVENT_TYPE (event, empty_event); character_to_event (XCHAR_OR_CHAR_INT (spec), XEVENT (event), XCONSOLE (Vselected_console), 0, 0); - SET_KEY_DATA_KEYSYM (returned_value, XKEY_DATA_KEYSYM (XEVENT_DATA (event))); + SET_KEY_DATA_KEYSYM (returned_value, XEVENT_KEY_KEYSYM (event)); SET_KEY_DATA_MODIFIERS (returned_value, - XKEY_DATA_MODIFIERS (XEVENT_DATA (event))); -#else /* not USE_KKCC */ - Lisp_Event event; - event.event_type = empty_event; - character_to_event (XCHAR_OR_CHAR_INT (spec), &event, - XCONSOLE (Vselected_console), 0, 0); - returned_value->keysym = event.event.key.keysym; - returned_value->modifiers = event.event.key.modifiers; -#endif /* not USE_KKCC */ + XEVENT_KEY_MODIFIERS (event)); + UNGCPRO; } else if (EVENTP (spec)) { -#ifdef USE_KKCC switch (XEVENT_TYPE (spec)) -#else /* not USE_KKCC */ - switch (XEVENT (spec)->event_type) -#endif /* not USE_KKCC */ { case key_press_event: { -#ifdef USE_KKCC - SET_KEY_DATA_KEYSYM (returned_value, XKEY_DATA_KEYSYM (XEVENT_DATA (spec))); - SET_KEY_DATA_MODIFIERS (returned_value, XKEY_DATA_MODIFIERS (XEVENT_DATA (spec))); -#else /* not USE_KKCC */ - returned_value->keysym = XEVENT (spec)->event.key.keysym; - returned_value->modifiers = XEVENT (spec)->event.key.modifiers; -#endif /* not USE_KKCC */ + SET_KEY_DATA_KEYSYM (returned_value, XEVENT_KEY_KEYSYM (spec)); + SET_KEY_DATA_MODIFIERS (returned_value, XEVENT_KEY_MODIFIERS (spec)); break; } case button_press_event: case button_release_event: { -#ifdef USE_KKCC int down = (XEVENT_TYPE (spec) == button_press_event); - switch (XBUTTON_DATA_BUTTON (XEVENT_DATA (spec))) + switch (XEVENT_BUTTON_BUTTON (spec)) { case 1: SET_KEY_DATA_KEYSYM (returned_value, (down ? Qbutton1 : Qbutton1up)); @@ -1530,30 +1455,7 @@ SET_KEY_DATA_KEYSYM (returned_value, (down ? Qbutton0 : Qbutton0up)); break; } - SET_KEY_DATA_MODIFIERS (returned_value, XBUTTON_DATA_MODIFIERS (XEVENT_DATA (spec))); -#else /* not USE_KKCC */ - int down = (XEVENT (spec)->event_type == button_press_event); - switch (XEVENT (spec)->event.button.button) - { - case 1: - returned_value->keysym = (down ? Qbutton1 : Qbutton1up); break; - case 2: - returned_value->keysym = (down ? Qbutton2 : Qbutton2up); break; - case 3: - returned_value->keysym = (down ? Qbutton3 : Qbutton3up); break; - case 4: - returned_value->keysym = (down ? Qbutton4 : Qbutton4up); break; - case 5: - returned_value->keysym = (down ? Qbutton5 : Qbutton5up); break; - case 6: - returned_value->keysym = (down ? Qbutton6 : Qbutton6up); break; - case 7: - returned_value->keysym = (down ? Qbutton7 : Qbutton7up); break; - default: - returned_value->keysym = (down ? Qbutton0 : Qbutton0up); break; - } - returned_value->modifiers = XEVENT (spec)->event.button.modifiers; -#endif /* not USE_KKCC */ + SET_KEY_DATA_MODIFIERS (returned_value, XEVENT_BUTTON_MODIFIERS (spec)); break; } default: @@ -1566,13 +1468,8 @@ if (bucky_sym_to_bucky_bit (spec) != 0) invalid_argument ("Key is a modifier name", spec); define_key_check_and_coerce_keysym (spec, &spec, 0); -#ifdef USE_KKCC SET_KEY_DATA_KEYSYM (returned_value, spec); SET_KEY_DATA_MODIFIERS (returned_value, 0); -#else /* not USE_KKCC */ - returned_value->keysym = spec; - returned_value->modifiers = 0; -#endif /* not USE_KKCC */ } else if (CONSP (spec)) { @@ -1607,13 +1504,8 @@ "List must be nil-terminated", spec); define_key_check_and_coerce_keysym (spec, &keysym, modifiers); -#ifdef USE_KKCC SET_KEY_DATA_KEYSYM(returned_value, keysym); SET_KEY_DATA_MODIFIERS (returned_value, modifiers); -#else /* not USE_KKCC */ - returned_value->keysym = keysym; - returned_value->modifiers = modifiers; -#endif /* not USE_KKCC */ } else { @@ -1627,11 +1519,7 @@ key_desc_list_to_event (Lisp_Object list, Lisp_Object event, int allow_menu_events) { -#ifdef USE_KKCC Lisp_Key_Data raw_key; -#else /* not USE_KKCC */ - struct key_data raw_key; -#endif /* not USE_KKCC */ if (allow_menu_events && CONSP (list) && @@ -1646,17 +1534,10 @@ fn = Qcall_interactively; else fn = Qeval; -#ifdef USE_KKCC XSET_EVENT_TYPE (event, misc_user_event); - XSET_EVENT_CHANNEL (event, wrap_frame (selected_frame)); - XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), fn); - XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event), arg); -#else /* not USE_KKCC */ - XEVENT (event)->channel = wrap_frame (selected_frame ()); - XEVENT (event)->event_type = misc_user_event; - XEVENT (event)->event.eval.function = fn; - XEVENT (event)->event.eval.object = arg; -#endif /* not USE_KKCC */ + XSET_EVENT_CHANNEL (event, wrap_frame (selected_frame ())); + XSET_EVENT_MISC_USER_FUNCTION (event, fn); + XSET_EVENT_MISC_USER_OBJECT (event, arg); return; } @@ -1673,28 +1554,21 @@ invalid_operation ("Mouse-clicks can't appear in saved keyboard macros", Qunbound); -#ifdef USE_KKCC XSET_EVENT_CHANNEL (event, Vselected_console); XSET_EVENT_TYPE (event, key_press_event); - XSET_KEY_DATA_KEYSYM (XEVENT_DATA (event), raw_key.keysym); - XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (event), KEY_DATA_MODIFIERS (&raw_key)); -#else /* not USE_KKCC */ - XEVENT (event)->channel = Vselected_console; - XEVENT (event)->event_type = key_press_event; - XEVENT (event)->event.key.keysym = raw_key.keysym; - XEVENT (event)->event.key.modifiers = raw_key.modifiers; -#endif /* not USE_KKCC */ + XSET_EVENT_KEY_KEYSYM (event, raw_key.keysym); + XSET_EVENT_KEY_MODIFIERS (event, KEY_DATA_MODIFIERS (&raw_key)); } int -event_matches_key_specifier_p (Lisp_Event *event, Lisp_Object key_specifier) +event_matches_key_specifier_p (Lisp_Object event, Lisp_Object key_specifier) { Lisp_Object event2 = Qnil; int retval; struct gcpro gcpro1; - if (event->event_type != key_press_event || NILP (key_specifier) || + if (XEVENT_TYPE (event) != key_press_event || NILP (key_specifier) || (INTP (key_specifier) && !CHAR_INTP (key_specifier))) return 0; @@ -1716,25 +1590,22 @@ to compare the ASCII values. */ GCPRO1 (event2); - event2 = Fmake_event (Qnil, Qnil); - Fcharacter_to_event (key_specifier, event2, Qnil, Qnil); + if (EVENTP (key_specifier)) + event2 = Fcopy_event (key_specifier, Qnil); + else + event2 = Fcharacter_to_event (key_specifier, Qnil, Qnil, Qnil); if (XEVENT (event2)->event_type != key_press_event) retval = 0; - else if (CONSOLE_TTY_P (XCONSOLE (EVENT_CHANNEL (event)))) + else if (CONSOLE_TTY_P (XCONSOLE (XEVENT_CHANNEL (event)))) { int ch1, ch2; ch1 = event_to_character (event, 0, 0, 0); - ch2 = event_to_character (XEVENT (event2), 0, 0, 0); + ch2 = event_to_character (event2, 0, 0, 0); retval = (ch1 >= 0 && ch2 >= 0 && ch1 == ch2); } -#ifdef USE_KKCC - else if (EQ (XKEY_DATA_KEYSYM (EVENT_DATA (event)), XKEY_DATA_KEYSYM (XEVENT_DATA (event2))) && - XKEY_DATA_MODIFIERS (EVENT_DATA (event)) == XKEY_DATA_MODIFIERS (XEVENT_DATA (event2))) -#else /* not USE_KKCC */ - else if (EQ (event->event.key.keysym, XEVENT (event2)->event.key.keysym) && - event->event.key.modifiers == XEVENT (event2)->event.key.modifiers) -#endif /* not USE_KKCC */ + else if (EQ (XEVENT_KEY_KEYSYM (event), XEVENT_KEY_KEYSYM (event2)) && + XEVENT_KEY_MODIFIERS (event) == XEVENT_KEY_MODIFIERS (event2)) retval = 1; else retval = 0; @@ -1744,87 +1615,75 @@ } static int -#ifdef USE_KKCC meta_prefix_char_p (const Lisp_Key_Data *key) -#else /* not USE_KKCC */ -meta_prefix_char_p (const struct key_data *key) -#endif /* not USE_KKCC */ { -#ifdef USE_KKCC Lisp_Object event = Fmake_event (Qnil, Qnil); struct gcpro gcpro1; + int retval; + GCPRO1 (event); XSET_EVENT_TYPE (event, key_press_event); XSET_EVENT_CHANNEL (event, Vselected_console); - XSET_KEY_DATA_KEYSYM (XEVENT_DATA (event), KEY_DATA_KEYSYM (key)); - XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (event), KEY_DATA_MODIFIERS (key)); - return event_matches_key_specifier_p (XEVENT(event), Vmeta_prefix_char); -#else /* not USE_KKCC */ - Lisp_Event event; - - event.event_type = key_press_event; - event.channel = Vselected_console; - event.event.key.keysym = key->keysym; - event.event.key.modifiers = key->modifiers; - return event_matches_key_specifier_p (&event, Vmeta_prefix_char); -#endif /* not USE_KKCC */ + XSET_EVENT_KEY_KEYSYM (event, KEY_DATA_KEYSYM (key)); + XSET_EVENT_KEY_MODIFIERS (event, KEY_DATA_MODIFIERS (key)); + retval = event_matches_key_specifier_p (event, Vmeta_prefix_char); + UNGCPRO; + return retval; } DEFUN ("event-matches-key-specifier-p", Fevent_matches_key_specifier_p, 2, 2, 0, /* Return non-nil if EVENT matches KEY-SPECIFIER. This can be useful, e.g., to determine if the user pressed `help-char' or `quit-char'. + +KEY-SPECIFIER can be a character, integer, a symbol, a list of modifiers +and symbols, or an event. + +What this actually happens is this: + +\(1) Return no, if EVENT is not a key press event or if KEY-SPECIFIER is nil + or an integer that cannot be converted to a character. + +\(2) If KEY-SPECIFIER is a character or integer, + (event-to-character EVENT nil nil nil) is called, and the characters are + compared to get the result. The reason for special-casing this and doing + it this way is to ensure that, e.g., a KEY-SPECIFIER of 27 matches both + a key-press `escape' and a key-press `control ['. #### Think about META + argument to event-to-character. + +\(3) If KEY-SPECIFIER is an event, fine; else, convert to an event using + \(character-to-event KEY-SPECIFIER nil nil nil). If EVENT is not on a TTY, + we just compare keysyms and modifiers and return yes if both are equal. + For TTY, we do character-level comparison by converting both to a character + with (event-to-character ... nil nil nil) and comparing the characters. + */ (event, key_specifier)) { CHECK_LIVE_EVENT (event); - return (event_matches_key_specifier_p (XEVENT (event), key_specifier) - ? Qt : Qnil); + return (event_matches_key_specifier_p (event, key_specifier) ? Qt : Qnil); } -#ifdef USE_KKCC -#define MACROLET(k,m) do { \ - SET_KEY_DATA_KEYSYM(returned_value, k); \ - SET_KEY_DATA_MODIFIERS(returned_value, m); \ - RETURN_SANS_WARNINGS; \ +#define MACROLET(k, m) do { \ + SET_KEY_DATA_KEYSYM (returned_value, k); \ + SET_KEY_DATA_MODIFIERS (returned_value, m); \ + RETURN_SANS_WARNINGS; \ } while (0) -#else /* not USE_KKCC */ -#define MACROLET(k,m) do { \ - returned_value->keysym = (k); \ - returned_value->modifiers = (m); \ - RETURN_SANS_WARNINGS; \ -} while (0) -#endif /* not USE_KKCC */ /* ASCII grunge. Given a keysym, return another keysym/modifier pair which could be considered the same key in an ASCII world. Backspace returns ^H, for example. */ static void -#ifdef USE_KKCC define_key_alternate_name (Lisp_Key_Data *key, Lisp_Key_Data *returned_value) -#else /* not USE_KKCC */ -define_key_alternate_name (struct key_data *key, - struct key_data *returned_value) -#endif /* not USE_KKCC */ { -#ifdef USE_KKCC Lisp_Object keysym = KEY_DATA_KEYSYM (key); int modifiers = KEY_DATA_MODIFIERS (key); -#else /* not USE_KKCC */ - Lisp_Object keysym = key->keysym; - int modifiers = key->modifiers; -#endif /* not USE_KKCC */ int modifiers_sans_control = (modifiers & (~XEMACS_MOD_CONTROL)); int modifiers_sans_meta = (modifiers & (~XEMACS_MOD_META)); -#ifdef USE_KKCC SET_KEY_DATA_KEYSYM (returned_value, Qnil); /* By default, no "alternate" key */ SET_KEY_DATA_MODIFIERS (returned_value, 0); -#else /* not USE_KKCC */ - returned_value->keysym = Qnil; /* By default, no "alternate" key */ - returned_value->modifiers = 0; -#endif /* not USE_KKCC */ if (modifiers_sans_meta == XEMACS_MOD_CONTROL) { if (EQ (keysym, QKspace)) @@ -1866,7 +1725,6 @@ #undef MACROLET } - static void ensure_meta_prefix_char_keymapp (Lisp_Object keys, int indx, Lisp_Object keymap) @@ -1875,11 +1733,7 @@ Lisp_Object new_keys; int i; Lisp_Object mpc_binding; -#ifdef USE_KKCC Lisp_Key_Data meta_key; -#else /* not USE_KKCC */ - struct key_data meta_key; -#endif /* not USE_KKCC */ if (NILP (Vmeta_prefix_char) || (INTP (Vmeta_prefix_char) && !CHAR_INTP (Vmeta_prefix_char))) return; @@ -2080,13 +1934,8 @@ while (1) { Lisp_Object c; -#ifdef USE_KKCC Lisp_Key_Data raw_key1; Lisp_Key_Data raw_key2; -#else /* not USE_KKCC */ - struct key_data raw_key1; - struct key_data raw_key2; -#endif /* not USE_KKCC */ if (STRINGP (keys)) c = make_char (string_ichar (keys, idx)); else @@ -2200,11 +2049,7 @@ struct raw_lookup_key_mapper_closure { int remaining; -#ifdef USE_KKCC const Lisp_Key_Data *raw_keys; -#else /* not USE_KKCC */ - const struct key_data *raw_keys; -#endif /* not USE_KKCC */ int raw_keys_count; int keys_so_far; int accept_default; @@ -2215,11 +2060,7 @@ /* Caller should gc-protect args (keymaps may autoload) */ static Lisp_Object raw_lookup_key (Lisp_Object keymap, -#ifdef USE_KKCC const Lisp_Key_Data *raw_keys, int raw_keys_count, -#else /* not USE_KKCC */ - const struct key_data *raw_keys, int raw_keys_count, -#endif /* not USE_KKCC */ int keys_so_far, int accept_default) { /* This function can GC */ @@ -2242,11 +2083,7 @@ int accept_default = c->accept_default; int remaining = c->remaining; int keys_so_far = c->keys_so_far; -#ifdef USE_KKCC const Lisp_Key_Data *raw_keys = c->raw_keys; -#else /* not USE_KKCC */ - const struct key_data *raw_keys = c->raw_keys; -#endif /* not USE_KKCC */ Lisp_Object cmd; if (! meta_prefix_char_p (&(raw_keys[0]))) @@ -2299,11 +2136,7 @@ keys_so_far + 1, accept_default); else if ((raw_keys[1].modifiers & XEMACS_MOD_META) == 0) { -#ifdef USE_KKCC Lisp_Key_Data metified; -#else /* not USE_KKCC */ - struct key_data metified; -#endif /* not USE_KKCC */ metified.keysym = raw_keys[1].keysym; metified.modifiers = raw_keys[1].modifiers | (unsigned char) XEMACS_MOD_META; @@ -2335,13 +2168,8 @@ int accept_default) { /* This function can GC */ -#ifdef USE_KKCC Lisp_Key_Data kkk[20]; Lisp_Key_Data *raw_keys; -#else /* not USE_KKCC */ - struct key_data kkk[20]; - struct key_data *raw_keys; -#endif /* not USE_KKCC */ int i; if (nkeys == 0) @@ -2350,11 +2178,7 @@ if (nkeys < countof (kkk)) raw_keys = kkk; else -#ifdef USE_KKCC raw_keys = alloca_array (Lisp_Key_Data, nkeys); -#else /* not USE_KKCC */ - raw_keys = alloca_array (struct key_data, nkeys); -#endif /* not USE_KKCC */ for (i = 0; i < nkeys; i++) { @@ -2368,19 +2192,11 @@ int accept_default) { /* This function can GC */ -#ifdef USE_KKCC Lisp_Key_Data kkk[20]; -#else /* not USE_KKCC */ - struct key_data kkk[20]; -#endif /* not USE_KKCC */ Lisp_Object event; int nkeys; -#ifdef USE_KKCC Lisp_Key_Data *raw_keys; -#else /* not USE_KKCC */ - struct key_data *raw_keys; -#endif /* not USE_KKCC */ Lisp_Object tem = Qnil; struct gcpro gcpro1, gcpro2; int iii; @@ -2392,11 +2208,7 @@ if (nkeys < countof (kkk)) raw_keys = kkk; else -#ifdef USE_KKCC raw_keys = alloca_array (Lisp_Key_Data, nkeys); -#else /* not USE_KKCC */ - raw_keys = alloca_array (struct key_data, nkeys); -#endif /* not USE_KKCC */ nkeys = 0; EVENT_CHAIN_LOOP (event, event_head) @@ -2445,11 +2257,7 @@ { int length = string_char_length (keys); int i; -#ifdef USE_KKCC Lisp_Key_Data *raw_keys = alloca_array (Lisp_Key_Data, length); -#else /* not USE_KKCC */ - struct key_data *raw_keys = alloca_array (struct key_data, length); -#endif /* not USE_KKCC */ if (length == 0) return Qnil; @@ -3028,11 +2836,7 @@ struct map_keymap_unsorted_closure { -#ifdef USE_KKCC void (*fn) (const Lisp_Key_Data *, Lisp_Object binding, void *arg); -#else /* not USE_KKCC */ - void (*fn) (const struct key_data *, Lisp_Object binding, void *arg); -#endif /* not USE_KKCC */ void *arg; int modifiers; }; @@ -3060,11 +2864,7 @@ } else { -#ifdef USE_KKCC Lisp_Key_Data key; -#else /* not USE_KKCC */ - struct key_data key; -#endif /* not USE_KKCC */ key.keysym = keysym; key.modifiers = modifiers; ((*closure->fn) (&key, value, closure->arg)); @@ -3171,11 +2971,7 @@ static void map_keymap_sorted (Lisp_Object keymap_table, int modifiers, -#ifdef USE_KKCC void (*function) (const Lisp_Key_Data *key, -#else /* not USE_KKCC */ - void (*function) (const struct key_data *key, -#endif /* not USE_KKCC */ Lisp_Object binding, void *map_keymap_sorted_closure), void *map_keymap_sorted_closure) @@ -3208,11 +3004,7 @@ map_keymap_sorted_closure); else { -#ifdef USE_KKCC Lisp_Key_Data k; -#else /* not USE_KKCC */ - struct key_data k; -#endif /* not USE_KKCC */ k.keysym = keysym; k.modifiers = modifiers; ((*function) (&k, binding, map_keymap_sorted_closure)); @@ -3224,11 +3016,7 @@ /* used by Fmap_keymap() */ static void -#ifdef USE_KKCC map_keymap_mapper (const Lisp_Key_Data *key, -#else /* not USE_KKCC */ -map_keymap_mapper (const struct key_data *key, -#endif /* not USE_KKCC */ Lisp_Object binding, void *function) { @@ -3241,11 +3029,7 @@ static void map_keymap (Lisp_Object keymap_table, int sort_first, -#ifdef USE_KKCC void (*function) (const Lisp_Key_Data *key, -#else /* not USE_KKCC */ - void (*function) (const struct key_data *key, -#endif /* not USE_KKCC */ Lisp_Object binding, void *fn_arg), void *fn_arg) @@ -3344,11 +3128,7 @@ Lisp_Object vec; int j; int len; -#ifdef USE_KKCC Lisp_Key_Data key; -#else /* not USE_KKCC */ - struct key_data key; -#endif /* not USE_KKCC */ key.keysym = keysym; key.modifiers = modifiers; @@ -3436,11 +3216,7 @@ NGCPRO1 (p); for (iii = 0; iii < len; iii++) { -#ifdef USE_KKCC Lisp_Key_Data key; -#else /* not USE_KKCC */ - struct key_data key; -#endif /* not USE_KKCC */ define_key_parser (Faref (prefix, make_int (iii)), &key); XVECTOR_DATA (p)[iii] = make_key_description (&key, 1); } @@ -3536,27 +3312,15 @@ if (!EVENTP (key)) { -#ifdef USE_KKCC Lisp_Object event = Fmake_event (Qnil, Qnil); - XSET_EVENT_TYPE (event, empty_event); CHECK_CHAR_COERCE_INT (key); - character_to_event (XCHAR (key), XEVENT(event), + character_to_event (XCHAR (key), XEVENT (event), XCONSOLE (Vselected_console), 0, 1); format_event_object (buf, event, 1); + Fdeallocate_event (event); } else format_event_object (buf, key, 1); -#else /* not USE_KKCC */ - Lisp_Event event; - event.event_type = empty_event; - CHECK_CHAR_COERCE_INT (key); - character_to_event (XCHAR (key), &event, - XCONSOLE (Vselected_console), 0, 1); - format_event_object (buf, &event, 1); - } - else - format_event_object (buf, XEVENT (key), 1); -#endif /* not USE_KKCC */ str = eimake_string (buf); eifree (buf); return str; @@ -3780,11 +3544,7 @@ static Lisp_Object -#ifdef USE_KKCC raw_keys_to_keys (Lisp_Key_Data *keys, int count) -#else /* not USE_KKCC */ -raw_keys_to_keys (struct key_data *keys, int count) -#endif /* not USE_KKCC */ { Lisp_Object result = make_vector (count, Qnil); while (count--) @@ -3794,36 +3554,21 @@ static void -#ifdef USE_KKCC format_raw_keys (Lisp_Key_Data *keys, int count, Eistring *buf) -#else /* not USE_KKCC */ -format_raw_keys (struct key_data *keys, int count, Eistring *buf) -#endif /* not USE_KKCC */ { int i; -#ifdef USE_KKCC Lisp_Object event = Fmake_event (Qnil, Qnil); XSET_EVENT_TYPE (event, key_press_event); XSET_EVENT_CHANNEL (event, Vselected_console); -#else /* not USE_KKCC */ - Lisp_Event event; - event.event_type = key_press_event; - event.channel = Vselected_console; -#endif /* not USE_KKCC */ for (i = 0; i < count; i++) { -#ifdef USE_KKCC - XSET_KEY_DATA_KEYSYM (XEVENT_DATA (event), keys[i].keysym); - XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (event), KEY_DATA_MODIFIERS (&keys[i])); + XSET_EVENT_KEY_KEYSYM (event, keys[i].keysym); + XSET_EVENT_KEY_MODIFIERS (event, KEY_DATA_MODIFIERS (&keys[i])); format_event_object (buf, event, 1); -#else /* not USE_KKCC */ - event.event.key.keysym = keys[i].keysym; - event.event.key.modifiers = keys[i].modifiers; - format_event_object (buf, &event, 1); -#endif /* not USE_KKCC */ if (i < count - 1) eicat_c (buf, " "); } + Fdeallocate_event (event); } @@ -3856,11 +3601,7 @@ int keys_count; int modifiers_so_far; Eistring *target_buffer; -#ifdef USE_KKCC Lisp_Key_Data *keys_so_far; -#else /* not USE_KKCC */ - struct key_data *keys_so_far; -#endif /* not USE_KKCC */ int keys_so_far_total_size; int keys_so_far_malloced; }; @@ -3889,11 +3630,7 @@ Verify that these bindings aren't shadowed by other bindings in the shadow maps. Either nil or number as value from raw_lookup_key() means undefined. */ -#ifdef USE_KKCC Lisp_Key_Data *so_far = c->keys_so_far; -#else /* not USE_KKCC */ - struct key_data *so_far = c->keys_so_far; -#endif /* not USE_KKCC */ for (;;) /* loop over all keys that match */ { @@ -3901,11 +3638,7 @@ int i; so_far [keys_count].keysym = k; -#ifdef USE_KKCC SET_KEY_DATA_MODIFIERS (&so_far [keys_count], modifiers_so_far); -#else /* not USE_KKCC */ - so_far [keys_count].modifiers = modifiers_so_far; -#endif /* not USE_KKCC */ /* now loop over all shadow maps */ for (i = 0; i < c->shadow_count; i++) @@ -3986,18 +3719,10 @@ lower_modifiers = (modifiers_so_far | bucky); else { -#ifdef USE_KKCC Lisp_Key_Data *so_far = c->keys_so_far; -#else /* not USE_KKCC */ - struct key_data *so_far = c->keys_so_far; -#endif /* not USE_KKCC */ lower_modifiers = 0; so_far [lower_keys_count].keysym = key; -#ifdef USE_KKCC SET_KEY_DATA_MODIFIERS (&so_far [lower_keys_count], modifiers_so_far); -#else /* not USE_KKCC */ - so_far [lower_keys_count].modifiers = modifiers_so_far; -#endif /* not USE_KKCC */ lower_keys_count++; } @@ -4006,24 +3731,12 @@ int size = lower_keys_count + 50; if (! c->keys_so_far_malloced) { -#ifdef USE_KKCC Lisp_Key_Data *new = xnew_array (Lisp_Key_Data, size); -#else /* not USE_KKCC */ - struct key_data *new = xnew_array (struct key_data, size); -#endif /* not USE_KKCC */ memcpy ((void *)new, (const void *)c->keys_so_far, -#ifdef USE_KKCC c->keys_so_far_total_size * sizeof (Lisp_Key_Data)); -#else /* not USE_KKCC */ - c->keys_so_far_total_size * sizeof (struct key_data)); -#endif /* not USE_KKCC */ } else -#ifdef USE_KKCC XREALLOC_ARRAY (c->keys_so_far, Lisp_Key_Data, size); -#else /* not USE_KKCC */ - XREALLOC_ARRAY (c->keys_so_far, struct key_data, size); -#endif /* not USE_KKCC */ c->keys_so_far_total_size = size; c->keys_so_far_malloced = 1; @@ -4057,11 +3770,7 @@ /* This function can GC */ Lisp_Object result = Qnil; int i; -#ifdef USE_KKCC Lisp_Key_Data raw[20]; -#else /* not USE_KKCC */ - struct key_data raw[20]; -#endif /* not USE_KKCC */ struct where_is_closure c; c.definition = definition; @@ -4276,11 +3985,7 @@ struct describe_map_shadow_closure { -#ifdef USE_KKCC const Lisp_Key_Data *raw_key; -#else /* not USE_KKCC */ - const struct key_data *raw_key; -#endif /* not USE_KKCC */ Lisp_Object self; }; @@ -4293,15 +3998,9 @@ if (EQ (map, c->self)) return Qzero; /* Not shadowed; terminate search */ -#ifdef USE_KKCC return !NILP (keymap_lookup_directly (map, KEY_DATA_KEYSYM (c->raw_key), KEY_DATA_MODIFIERS (c->raw_key))) -#else /* not USE_KKCC */ - return !NILP (keymap_lookup_directly (map, - c->raw_key->keysym, - c->raw_key->modifiers)) -#endif /* not USE_KKCC */ ? Qt : Qnil; } @@ -4309,35 +4008,21 @@ static Lisp_Object keymap_lookup_inherited_mapper (Lisp_Object km, void *arg) { -#ifdef USE_KKCC Lisp_Key_Data *k = (Lisp_Key_Data *) arg; return keymap_lookup_directly (km, KEY_DATA_KEYSYM (k), KEY_DATA_MODIFIERS (k)); -#else /* not USE_KKCC */ - struct key_data *k = (struct key_data *) arg; - return keymap_lookup_directly (km, k->keysym, k->modifiers); -#endif /* not USE_KKCC */ } static void -#ifdef USE_KKCC describe_map_mapper (const Lisp_Key_Data *key, -#else /* not USE_KKCC */ -describe_map_mapper (const struct key_data *key, -#endif /* not USE_KKCC */ Lisp_Object binding, void *describe_map_closure) { /* This function can GC */ struct describe_map_closure *closure = (struct describe_map_closure *) describe_map_closure; -#ifdef USE_KKCC Lisp_Object keysym = KEY_DATA_KEYSYM (key); int modifiers = KEY_DATA_MODIFIERS (key); -#else /* not USE_KKCC */ - Lisp_Object keysym = key->keysym; - int modifiers = key->modifiers; -#endif /* not USE_KKCC */ /* Don't mention suppressed commands. */ if (SYMBOLP (binding)