Mercurial > hg > xemacs-beta
diff src/event-stream.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 | a123f88fa975 |
| children | fffe735e63ee |
line wrap: on
line diff
--- a/src/event-stream.c Sun Jan 12 11:04:30 2003 +0000 +++ b/src/event-stream.c Sun Jan 12 11:08:22 2003 +0000 @@ -50,7 +50,12 @@ */ /* TODO: - This stuff is way too hard to maintain - needs rework. + [This stuff is way too hard to maintain - needs rework.] + I don't think it's that bad in the main. I've done a fair amount of + cleanup work over the ages; the only stuff that's probably still somewhat + messy is the command-builder handling, which is that way because it's + trying to be "compatible" with pseudo-standards established by Emacs + v18. The command builder should deal only with key and button events. Other command events should be able to come in the MIDDLE of a key @@ -274,16 +279,53 @@ static void echo_key_event (struct command_builder *, Lisp_Object event); static void maybe_kbd_translate (Lisp_Object event); -/* This structure is basically a typeahead queue: things like - wait-reading-process-output will delay the execution of - keyboard and mouse events by pushing them here. - - Chained through event_next() - command_event_queue_tail is a pointer to the last-added element. +/* There are two event queues here -- the command event queue (#### which + should be called "deferred event queue" and is in my glyph ws) and the + dispatch event queue (#### MS Windows actually has an extra dispatch + queue for non-user events and uses the generic one only for user events; + we should probably generalize this). + + The dispatch queue (which used to occur duplicated inside of each event + implementation) is used for events that have been read from the + window-system event queue(s) and not yet process by + next_event_internal(). It exists for two reasons: (1) because in many + implementations, events often come from the window system by way of + callbacks, and need to push the event to be returned onto a queue; (2) + in order to handle QUIT in a guaranteed correct fashion without + resorting to weird implementation-specific hacks that may or may not + work well, we need to drain the window-system event queues and then look + through to see if there's an event matching quit-char (usually ^G). the + drained events need to go onto a queue. (There are other, similar cases + where we need to drain the pending events so we can look ahead -- for + example, checking for pending expose events under X to avoid excessive + server activity.) + + The command event queue is used *AFTER* an event has been read from + next_event_internal(), when it needs to be pushed back. This includes, + for example, accept-process-output, sleep-for and + wait_delaying_user_input(). Eval events and the like, generated by + enqueue-eval-event, enqueue_magic_eval_event(), etc. are also pushed + onto this queue. Some events generated by callbacks are also pushed + onto this queue, #### although maybe shouldn't be. + + The command queue takes precedence over the dispatch queue. + + #### It is worth investigating to see whether both queues are really + needed, and how exactly they should be used. enqueue-eval-event, for + example, could certainly push onto the dispatch queue, and all callbacks + maybe should. wait_delaying_user_input() seems to need both queues, + since it can take events from the dispatch queue and push them onto the + command queue; but it perhaps could be rewritten to avoid this. #### + In general we need to review the handling of these two queues, figure + out exactly what ought to be happening, and document it. */ + static Lisp_Object command_event_queue; static Lisp_Object command_event_queue_tail; +Lisp_Object dispatch_event_queue; +static Lisp_Object dispatch_event_queue_tail; + /* Nonzero means echo unfinished commands after this many seconds of pause. */ static Lisp_Object Vecho_keystrokes; @@ -318,26 +360,14 @@ static Lisp_Object Vcommand_builder_free_list; -#ifdef USE_KKCC -static const struct lrecord_description munging_key_translation_description_1 [] = { - { XD_LISP_OBJECT, offsetof (struct munging_key_translation, first_mungeable_event) }, - { XD_END } -}; - -static const struct struct_description munging_key_translation_description = { - sizeof (Lisp_Object), - munging_key_translation_description_1 -}; - -static const struct lrecord_description command_builder_description [] = { +static const struct memory_description command_builder_description [] = { { XD_LISP_OBJECT, offsetof (struct command_builder, current_events) }, { XD_LISP_OBJECT, offsetof (struct command_builder, most_current_event) }, { XD_LISP_OBJECT, offsetof (struct command_builder, last_non_munged_event) }, { XD_LISP_OBJECT, offsetof (struct command_builder, console) }, - { XD_STRUCT_ARRAY, offsetof (struct command_builder, munge_me), 2, &munging_key_translation_description }, + { XD_LISP_OBJECT_ARRAY, offsetof (struct command_builder, first_mungeable_event), 2 }, { XD_END } }; -#endif /* USE_KKCC */ static Lisp_Object mark_command_builder (Lisp_Object obj) @@ -346,8 +376,8 @@ mark_object (builder->current_events); mark_object (builder->most_current_event); mark_object (builder->last_non_munged_event); - mark_object (builder->munge_me[0].first_mungeable_event); - mark_object (builder->munge_me[1].first_mungeable_event); + mark_object (builder->first_mungeable_event[0]); + mark_object (builder->first_mungeable_event[1]); return builder->console; } @@ -365,19 +395,12 @@ } } -#ifdef USE_KKCC DEFINE_LRECORD_IMPLEMENTATION ("command-builder", command_builder, 0, /*dumpable-flag*/ mark_command_builder, internal_object_printer, finalize_command_builder, 0, 0, command_builder_description, struct command_builder); -#else /* not USE_KKCC */ -DEFINE_LRECORD_IMPLEMENTATION ("command-builder", command_builder, - mark_command_builder, internal_object_printer, - finalize_command_builder, 0, 0, 0, - struct command_builder); -#endif /* not USE_KKCC */ static void reset_command_builder_event_chain (struct command_builder *builder) @@ -385,15 +408,15 @@ builder->current_events = Qnil; builder->most_current_event = Qnil; builder->last_non_munged_event = Qnil; - builder->munge_me[0].first_mungeable_event = Qnil; - builder->munge_me[1].first_mungeable_event = Qnil; + builder->first_mungeable_event[0] = Qnil; + builder->first_mungeable_event[1] = Qnil; } Lisp_Object allocate_command_builder (Lisp_Object console, int with_echo_buf) { Lisp_Object builder_obj = - allocate_managed_lcrecord (Vcommand_builder_free_list); + alloc_managed_lcrecord (Vcommand_builder_free_list); struct command_builder *builder = XCOMMAND_BUILDER (builder_obj); builder->console = console; @@ -442,14 +465,12 @@ transfer_event_chain_pointer (collapsing->last_non_munged_event, collapsing->current_events, new_buildings->current_events); - new_buildings->munge_me[0].first_mungeable_event = - transfer_event_chain_pointer (collapsing->munge_me[0]. - first_mungeable_event, + new_buildings->first_mungeable_event[0] = + transfer_event_chain_pointer (collapsing->first_mungeable_event[0], collapsing->current_events, new_buildings->current_events); - new_buildings->munge_me[1].first_mungeable_event = - transfer_event_chain_pointer (collapsing->munge_me[1]. - first_mungeable_event, + new_buildings->first_mungeable_event[1] = + transfer_event_chain_pointer (collapsing->first_mungeable_event[1], collapsing->current_events, new_buildings->current_events); @@ -481,10 +502,10 @@ builder->current_events = event; builder->most_current_event = event; - if (NILP (builder->munge_me[0].first_mungeable_event)) - builder->munge_me[0].first_mungeable_event = event; - if (NILP (builder->munge_me[1].first_mungeable_event)) - builder->munge_me[1].first_mungeable_event = event; + if (NILP (builder->first_mungeable_event[0])) + builder->first_mungeable_event[0] = event; + if (NILP (builder->first_mungeable_event[1])) + builder->first_mungeable_event[1] = event; } @@ -513,14 +534,18 @@ static int event_stream_event_pending_p (int user) { + /* #### Hmmm ... There may be some duplication in "drain queue" and + "event pending". Couldn't we just drain the queue and see what's in + it, and not maybe need a separate event method for this? Would this + work when USER is 0? Maybe this would be slow? */ return event_stream && event_stream->event_pending_p (user); } static void event_stream_force_event_pending (struct frame *f) { - if (event_stream->force_event_pending) - event_stream->force_event_pending (f); + if (event_stream->force_event_pending_cb) + event_stream->force_event_pending_cb (f); } static int @@ -540,11 +565,9 @@ if (sigint_happened) { - int ch = CONSOLE_QUIT_CHAR (con); sigint_happened = 0; Vquit_flag = Qnil; - character_to_event (ch, event, con, 1, 1); - event->channel = wrap_console (con); + Fcopy_event (CONSOLE_QUIT_EVENT (con), wrap_event (event)); return 1; } return 0; @@ -754,11 +777,65 @@ in_usid, err_usid); } +static void +event_stream_drain_queue (void) +{ + if (event_stream && event_stream->drain_queue_cb) + event_stream->drain_queue_cb (); +} + +struct remove_quit_p_data +{ + int critical; +}; + +static int +remove_quit_p_event (Lisp_Object ev, void *the_data) +{ + struct remove_quit_p_data *data = (struct remove_quit_p_data *) the_data; + struct console *con = event_console_or_selected (ev); + + if (XEVENT_TYPE (ev) == key_press_event) + { + if (event_matches_key_specifier_p (ev, CONSOLE_QUIT_EVENT (con))) + return 1; + if (event_matches_key_specifier_p (ev, + CONSOLE_CRITICAL_QUIT_EVENT (con))) + { + data->critical = 1; + return 1; + } + } + + return 0; +} + +static int +event_stream_quit_check_disallowed_p (void) +{ + if (event_stream && event_stream->quit_check_disallowed_p_cb) + return event_stream->quit_check_disallowed_p_cb (); + else + return 0; +} + void event_stream_quit_p (void) { - if (event_stream) - event_stream->quit_p_cb (); + struct remove_quit_p_data data; + + if (event_stream_quit_check_disallowed_p ()) + return; + + /* Drain queue so we can check for pending C-g events. */ + event_stream_drain_queue (); + data.critical = 0; + + if (map_event_chain_remove (remove_quit_p_event, + &dispatch_event_queue, + &dispatch_event_queue_tail, + &data, MECR_DEALLOCATE_EVENT)) + Vquit_flag = data.critical ? Qcritical : Qt; } static int @@ -791,11 +868,7 @@ clear_echo_area (selected_frame (), Qnil, 0); } -#ifdef USE_KKCC format_event_object (buf, event, 1); -#else /* not USE_KKCC */ - format_event_object (buf, XEVENT(event), 1); -#endif /* not USE_KKCC */ len = eilen (buf); if (len + buf_index + 4 > command_builder->echo_buf_length) @@ -903,96 +976,57 @@ if (EQ (Fhash_table_count (Vkeyboard_translate_table), Qzero)) return; - c = event_to_character (XEVENT (event), 0, 0, 0); + c = event_to_character (event, 0, 0, 0); if (c != -1) { Lisp_Object traduit = Fgethash (make_char (c), Vkeyboard_translate_table, Qnil); if (!NILP (traduit) && SYMBOLP (traduit)) { -#ifdef USE_KKCC - XSET_KEY_DATA_KEYSYM (XEVENT_DATA (event), traduit); - XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (event), 0); -#else /* not USE_KKCC */ - XEVENT (event)->event.key.keysym = traduit; - XEVENT (event)->event.key.modifiers = 0; -#endif /* not USE_KKCC */ + XSET_EVENT_KEY_KEYSYM (event, traduit); + XSET_EVENT_KEY_MODIFIERS (event, 0); did_translate = 1; } else if (CHARP (traduit)) { -#ifdef USE_KKCC - Lisp_Object ev2 = Fmake_event(Qnil, Qnil); -#else /* not USE_KKCC */ - Lisp_Event ev2; - /* This used to call Fcharacter_to_event() directly into EVENT, but that can eradicate timestamps and other such stuff. This way is safer. */ - zero_event (&ev2); -#endif /* not USE_KKCC */ - -#ifdef USE_KKCC + Lisp_Object ev2 = Fmake_event (Qnil, Qnil); + character_to_event (XCHAR (traduit), XEVENT (ev2), - XCONSOLE (XEVENT_CHANNEL (event)), 1, 1); - XSET_KEY_DATA_KEYSYM (XEVENT_DATA (event), XKEY_DATA_KEYSYM (XEVENT_DATA (ev2))); - XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (event), - XKEY_DATA_MODIFIERS (XEVENT_DATA (ev2))); -#else /* not USE_KKCC */ - character_to_event (XCHAR (traduit), &ev2, - XCONSOLE (EVENT_CHANNEL (XEVENT (event))), 1, 1); - XEVENT (event)->event.key.keysym = ev2.event.key.keysym; - XEVENT (event)->event.key.modifiers = ev2.event.key.modifiers; -#endif /* not USE_KKCC */ + XCONSOLE (XEVENT_CHANNEL (event)), 0, 1); + XSET_EVENT_KEY_KEYSYM (event, XEVENT_KEY_KEYSYM (ev2)); + XSET_EVENT_KEY_MODIFIERS (event, XEVENT_KEY_MODIFIERS (ev2)); + Fdeallocate_event (ev2); did_translate = 1; } } if (!did_translate) { -#ifdef USE_KKCC - Lisp_Object traduit = Fgethash (XKEY_DATA_KEYSYM (XEVENT_DATA (event)), + Lisp_Object traduit = Fgethash (XEVENT_KEY_KEYSYM (event), Vkeyboard_translate_table, Qnil); -#else /* not USE_KKCC */ - Lisp_Object traduit = Fgethash (XEVENT (event)->event.key.keysym, - Vkeyboard_translate_table, Qnil); -#endif /* not USE_KKCC */ if (!NILP (traduit) && SYMBOLP (traduit)) { -#ifdef USE_KKCC - XSET_KEY_DATA_KEYSYM (XEVENT_DATA (event), traduit); -#else /* not USE_KKCC */ - XEVENT (event)->event.key.keysym = traduit; -#endif /* not USE_KKCC */ + XSET_EVENT_KEY_KEYSYM (event, traduit); did_translate = 1; } else if (CHARP (traduit)) { -#ifdef USE_KKCC - Lisp_Object ev2 = Fmake_event(Qnil, Qnil); -#else /* not USE_KKCC */ - Lisp_Event ev2; - /* This used to call Fcharacter_to_event() directly into EVENT, but that can eradicate timestamps and other such stuff. This way is safer. */ - zero_event (&ev2); -#endif /* not USE_KKCC */ - -#ifdef USE_KKCC + Lisp_Object ev2 = Fmake_event (Qnil, Qnil); + character_to_event (XCHAR (traduit), XEVENT (ev2), - XCONSOLE (XEVENT_CHANNEL (event)), 1, 1); - XSET_KEY_DATA_KEYSYM (XEVENT_DATA (event), XKEY_DATA_KEYSYM (XEVENT_DATA (ev2))); - XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (event), - XKEY_DATA_MODIFIERS (XEVENT_DATA (event)) | - XKEY_DATA_MODIFIERS (XEVENT_DATA (ev2))); -#else /* not USE_KKCC */ - character_to_event (XCHAR (traduit), &ev2, - XCONSOLE (EVENT_CHANNEL (XEVENT (event))), 1, 1); - XEVENT (event)->event.key.keysym = ev2.event.key.keysym; - XEVENT (event)->event.key.modifiers |= ev2.event.key.modifiers; -#endif /* not USE_KKCC */ - + XCONSOLE (XEVENT_CHANNEL (event)), 0, 1); + XSET_EVENT_KEY_KEYSYM (event, XEVENT_KEY_KEYSYM (ev2)); + XSET_EVENT_KEY_MODIFIERS (event, + XEVENT_KEY_MODIFIERS (event) | + XEVENT_KEY_MODIFIERS (ev2)); + + Fdeallocate_event (ev2); did_translate = 1; } } @@ -1086,7 +1120,7 @@ } redisplay (); - if (event_matches_key_specifier_p (XEVENT (event), make_char (' '))) + if (event_matches_key_specifier_p (event, make_char (' '))) { /* Discard next key if it is a space */ reset_key_echo (command_builder, 1); @@ -1303,22 +1337,16 @@ return tm->object; } -static const struct lrecord_description timeout_description[] = { +static const struct memory_description timeout_description[] = { { XD_LISP_OBJECT, offsetof (Lisp_Timeout, function) }, { XD_LISP_OBJECT, offsetof (Lisp_Timeout, object) }, { XD_END } }; -#ifdef USE_KKCC DEFINE_LRECORD_IMPLEMENTATION ("timeout", timeout, 1, /*dumpable-flag*/ mark_timeout, internal_object_printer, 0, 0, 0, timeout_description, Lisp_Timeout); -#else /* not USE_KKCC */ -DEFINE_LRECORD_IMPLEMENTATION ("timeout", timeout, - mark_timeout, internal_object_printer, - 0, 0, 0, timeout_description, Lisp_Timeout); -#endif /* not USE_KKCC */ /* Generate a timeout and return its ID. */ @@ -1328,7 +1356,7 @@ Lisp_Object function, Lisp_Object object, int async_p) { - Lisp_Object op = allocate_managed_lcrecord (Vtimeout_free_list); + Lisp_Object op = alloc_managed_lcrecord (Vtimeout_free_list); Lisp_Timeout *timeout = XTIMEOUT (op); EMACS_TIME current_time; EMACS_TIME interval; @@ -1698,6 +1726,18 @@ return dequeue_event (&command_event_queue, &command_event_queue_tail); } +void +enqueue_dispatch_event (Lisp_Object event) +{ + enqueue_event (event, &dispatch_event_queue, &dispatch_event_queue_tail); +} + +Lisp_Object +dequeue_dispatch_event (void) +{ + return dequeue_event (&dispatch_event_queue, &dispatch_event_queue_tail); +} + static void enqueue_command_event_1 (Lisp_Object event_to_copy) { @@ -1708,17 +1748,10 @@ enqueue_magic_eval_event (void (*fun) (Lisp_Object), Lisp_Object object) { Lisp_Object event = Fmake_event (Qnil, Qnil); -#ifdef USE_KKCC XSET_EVENT_TYPE (event, magic_eval_event); /* channel for magic_eval events is nil */ - XSET_MAGIC_EVAL_DATA_INTERNAL_FUNCTION (XEVENT_DATA (event), fun); - XSET_MAGIC_EVAL_DATA_OBJECT (XEVENT_DATA (event), object); -#else /* not USE_KKCC */ - XEVENT (event)->event_type = magic_eval_event; - /* channel for magic_eval events is nil */ - XEVENT (event)->event.magic_eval.internal_function = fun; - XEVENT (event)->event.magic_eval.object = object; -#endif /* not USE_KKCC */ + XSET_EVENT_MAGIC_EVAL_INTERNAL_FUNCTION (event, fun); + XSET_EVENT_MAGIC_EVAL_OBJECT (event, object); enqueue_command_event (event); } @@ -1733,17 +1766,10 @@ { Lisp_Object event = Fmake_event (Qnil, Qnil); -#ifdef USE_KKCC XSET_EVENT_TYPE (event, eval_event); /* channel for eval events is nil */ - XSET_EVAL_DATA_FUNCTION (XEVENT_DATA (event), function); - XSET_EVAL_DATA_OBJECT (XEVENT_DATA (event), object); -#else /* not USE_KKCC */ - XEVENT (event)->event_type = eval_event; - /* channel for eval events is nil */ - XEVENT (event)->event.eval.function = function; - XEVENT (event)->event.eval.object = object; -#endif /* not USE_KKCC */ + XSET_EVENT_EVAL_FUNCTION (event, function); + XSET_EVENT_EVAL_OBJECT (event, object); enqueue_command_event (event); return event; @@ -1754,25 +1780,14 @@ Lisp_Object object) { Lisp_Object event = Fmake_event (Qnil, Qnil); -#ifdef USE_KKCC XSET_EVENT_TYPE (event, misc_user_event); XSET_EVENT_CHANNEL (event, channel); - XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), function); - XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event), object); - XSET_MISC_USER_DATA_BUTTON (XEVENT_DATA (event), 0); - XSET_MISC_USER_DATA_MODIFIERS (XEVENT_DATA (event), 0); - XSET_MISC_USER_DATA_X (XEVENT_DATA (event), -1); - XSET_MISC_USER_DATA_Y (XEVENT_DATA (event), -1); -#else /* not USE_KKCC */ - XEVENT (event)->event_type = misc_user_event; - XEVENT (event)->channel = channel; - XEVENT (event)->event.misc.function = function; - XEVENT (event)->event.misc.object = object; - XEVENT (event)->event.misc.button = 0; - XEVENT (event)->event.misc.modifiers = 0; - XEVENT (event)->event.misc.x = -1; - XEVENT (event)->event.misc.y = -1; -#endif /* not USE_KKCC */ + XSET_EVENT_MISC_USER_FUNCTION (event, function); + XSET_EVENT_MISC_USER_OBJECT (event, object); + XSET_EVENT_MISC_USER_BUTTON (event, 0); + XSET_EVENT_MISC_USER_MODIFIERS (event, 0); + XSET_EVENT_MISC_USER_X (event, -1); + XSET_EVENT_MISC_USER_Y (event, -1); enqueue_command_event (event); return event; @@ -1785,25 +1800,14 @@ { Lisp_Object event = Fmake_event (Qnil, Qnil); -#ifdef USE_KKCC XSET_EVENT_TYPE (event, misc_user_event); XSET_EVENT_CHANNEL (event, channel); - XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), function); - XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event), object); - XSET_MISC_USER_DATA_BUTTON (XEVENT_DATA (event), button); - XSET_MISC_USER_DATA_MODIFIERS (XEVENT_DATA (event), modifiers); - XSET_MISC_USER_DATA_X (XEVENT_DATA (event), x); - XSET_MISC_USER_DATA_Y (XEVENT_DATA (event), y); -#else /* not USE_KKCC */ - XEVENT (event)->event_type = misc_user_event; - XEVENT (event)->channel = channel; - XEVENT (event)->event.misc.function = function; - XEVENT (event)->event.misc.object = object; - XEVENT (event)->event.misc.button = button; - XEVENT (event)->event.misc.modifiers = modifiers; - XEVENT (event)->event.misc.x = x; - XEVENT (event)->event.misc.y = y; -#endif /* not USE_KKCC */ + XSET_EVENT_MISC_USER_FUNCTION (event, function); + XSET_EVENT_MISC_USER_OBJECT (event, object); + XSET_EVENT_MISC_USER_BUTTON (event, button); + XSET_EVENT_MISC_USER_MODIFIERS (event, modifiers); + XSET_EVENT_MISC_USER_X (event, x); + XSET_EVENT_MISC_USER_Y (event, y); enqueue_command_event (event); return event; @@ -2188,45 +2192,26 @@ /* If this was a timeout, then we need to extract some data out of the returned closure and might need to resignal it. */ -#ifdef USE_KKCC if (EVENT_TYPE (e) == timeout_event) -#else /* not USE_KKCC */ - if (e->event_type == timeout_event) -#endif /* not USE_KKCC */ { Lisp_Object tristan, isolde; -#ifdef USE_KKCC - XSET_TIMEOUT_DATA_ID_NUMBER (EVENT_DATA (e), - event_stream_resignal_wakeup (XTIMEOUT_DATA_INTERVAL_ID (EVENT_DATA (e)), 0, &tristan, &isolde)); - - XSET_TIMEOUT_DATA_FUNCTION (EVENT_DATA (e), tristan); - XSET_TIMEOUT_DATA_OBJECT (EVENT_DATA (e), isolde); + SET_EVENT_TIMEOUT_ID_NUMBER (e, + event_stream_resignal_wakeup (EVENT_TIMEOUT_INTERVAL_ID (e), 0, &tristan, &isolde)); + + SET_EVENT_TIMEOUT_FUNCTION (e, tristan); + SET_EVENT_TIMEOUT_OBJECT (e, isolde); /* next_event_internal() doesn't print out timeout events because of the extra info we just set. */ -#else /* not USE_KKCC */ - e->event.timeout.id_number = - event_stream_resignal_wakeup (e->event.timeout.interval_id, 0, - &tristan, &isolde); - - e->event.timeout.function = tristan; - e->event.timeout.object = isolde; - /* next_event_internal() doesn't print out timeout events - because of the extra info we just set. */ -#endif /* not USE_KKCC */ DEBUG_PRINT_EMACS_EVENT ("real, timeout", target_event); } /* If we read a ^G, then set quit-flag and try to QUIT. This may be blocked (see above). */ -#ifdef USE_KKCC if (EVENT_TYPE (e) == key_press_event && -#else /* not USE_KKCC */ - if (e->event_type == key_press_event && -#endif /* not USE_KKCC */ event_matches_key_specifier_p - (e, make_char (CONSOLE_QUIT_CHAR (XCONSOLE (EVENT_CHANNEL (e)))))) + (target_event, CONSOLE_QUIT_EVENT (XCONSOLE (EVENT_CHANNEL (e))))) { Vquit_flag = Qt; QUIT; @@ -2495,8 +2480,7 @@ Note that last-input-char will never have its high-bit set, in an effort to sidestep the ambiguity between M-x and oslash. */ - Vlast_input_char = Fevent_to_character (Vlast_input_event, - Qnil, Qnil, Qnil); + Vlast_input_char = Fevent_to_character (Vlast_input_event, Qnil, Qnil, Qnil); { EMACS_TIME t; EMACS_GET_TIME (t); @@ -2538,7 +2522,7 @@ execute_help_form() calls Fnext_command_event(), which calls this function, as well as Fdispatch_event. */ if (!NILP (Vhelp_form) && - event_matches_key_specifier_p (XEVENT (event), Vhelp_char)) + event_matches_key_specifier_p (event, Vhelp_char)) { /* temporarily reenable quit checking here, because we could get stuck */ Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */ @@ -2873,11 +2857,7 @@ case process_event: { if (NILP (process) || -#ifdef USE_KKCC - EQ (XPROCESS_DATA_PROCESS (XEVENT_DATA (event)), process)) -#else /* not USE_KKCC */ - EQ (XEVENT (event)->event.process.process, process)) -#endif /* not USE_KKCC */ + EQ (XEVENT_PROCESS_PROCESS (event), process)) { done = 1; /* RMS's version always returns nil when proc is nil, @@ -3159,25 +3139,15 @@ case eval_event: { -#ifdef USE_KKCC - call1 (XEVAL_DATA_FUNCTION (XEVENT_DATA (event)), - XEVAL_DATA_OBJECT (XEVENT_DATA (event))); -#else /* not USE_KKCC */ - call1 (XEVENT (event)->event.eval.function, - XEVENT (event)->event.eval.object); -#endif /* not USE_KKCC */ + call1 (XEVENT_EVAL_FUNCTION (event), + XEVENT_EVAL_OBJECT (event)); return; } case magic_eval_event: { -#ifdef USE_KKCC - XMAGIC_EVAL_DATA_INTERNAL_FUNCTION (XEVENT_DATA (event)) - XMAGIC_EVAL_DATA_OBJECT (XEVENT_DATA (event)); -#else /* not USE_KKCC */ - (XEVENT (event)->event.magic_eval.internal_function) - (XEVENT (event)->event.magic_eval.object); -#endif /* not USE_KKCC */ + XEVENT_MAGIC_EVAL_INTERNAL_FUNCTION (event) + XEVENT_MAGIC_EVAL_OBJECT (event); return; } @@ -3190,11 +3160,7 @@ case process_event: { -#ifdef USE_KKCC - Lisp_Object p = XPROCESS_DATA_PROCESS (XEVENT_DATA (event)); -#else /* not USE_KKCC */ - Lisp_Object p = XEVENT (event)->event.process.process; -#endif /* not USE_KKCC */ + Lisp_Object p = XEVENT_PROCESS_PROCESS (event); Charcount readstatus; int iter; @@ -3288,15 +3254,9 @@ { Lisp_Event *e = XEVENT (event); -#ifdef USE_KKCC - if (!NILP (XTIMEOUT_DATA_FUNCTION (EVENT_DATA (e)))) - call1 (XTIMEOUT_DATA_FUNCTION (EVENT_DATA (e)), - XTIMEOUT_DATA_OBJECT (EVENT_DATA (e))); -#else /* not USE_KKCC */ - if (!NILP (e->event.timeout.function)) - call1 (e->event.timeout.function, - e->event.timeout.object); -#endif /* not USE_KKCC */ + if (!NILP (EVENT_TIMEOUT_FUNCTION (e))) + call1 (EVENT_TIMEOUT_FUNCTION (e), + EVENT_TIMEOUT_OBJECT (e)); return; } case magic_event: @@ -3364,7 +3324,7 @@ { Lisp_Object suffix; - EVENT_CHAIN_LOOP (suffix, builder->munge_me[munge].first_mungeable_event) + EVENT_CHAIN_LOOP (suffix, builder->first_mungeable_event[munge]) { Lisp_Object result = munging_key_map_event_binding (suffix, munge); @@ -3408,7 +3368,7 @@ EVENT_CHAIN_LOOP (tempev, suffix) { Lisp_Object *mungeable_event = - &builder->munge_me[1 - munge].first_mungeable_event; + &builder->first_mungeable_event[1 - munge]; if (EQ (tempev, *mungeable_event)) { *mungeable_event = new_chain; @@ -3419,7 +3379,7 @@ /* Now munge the current event chain in the command builder. */ n = event_chain_count (suffix); command_builder_replace_suffix (builder, suffix, new_chain); - builder->munge_me[munge].first_mungeable_event = Qnil; + builder->first_mungeable_event[munge] = Qnil; *did_munge = 1; @@ -3452,13 +3412,8 @@ if (XEVENT_TYPE (evee) == misc_user_event) { if (allow_misc_user_events_p && (NILP (XEVENT_NEXT (evee)))) -#ifdef USE_KKCC - return list2 (XEVAL_DATA_FUNCTION (XEVENT_DATA (evee)), - XEVAL_DATA_OBJECT (XEVENT_DATA (evee))); -#else /* not USE_KKCC */ - return list2 (XEVENT (evee)->event.eval.function, - XEVENT (evee)->event.eval.object); -#endif /* not USE_KKCC */ + return list2 (XEVENT_EVAL_FUNCTION (evee), + XEVENT_EVAL_OBJECT (evee)); else return Qnil; } @@ -3514,47 +3469,14 @@ if (XEVENT_TYPE (builder->most_current_event) == key_press_event && !NILP (Vretry_undefined_key_binding_unshifted)) { - Lisp_Object terminal = builder->most_current_event; -#ifdef USE_KKCC - Lisp_Key_Data* key = XKEY_DATA (XEVENT_DATA (terminal)); -#else /* not USE_KKCC */ - struct key_data *key = &XEVENT (terminal)->event.key; -#endif /* not USE_KKCC */ - Ichar c = 0; -#ifdef USE_KKCC - if ((KEY_DATA_MODIFIERS (key) & XEMACS_MOD_SHIFT) - || (CHAR_OR_CHAR_INTP (KEY_DATA_KEYSYM(key)) - && ((c = XCHAR_OR_CHAR_INT (KEY_DATA_KEYSYM(key))), - c >= 'A' && c <= 'Z'))) -#else /* not USE_KKCC */ - if ((key->modifiers & XEMACS_MOD_SHIFT) - || (CHAR_OR_CHAR_INTP (key->keysym) - && ((c = XCHAR_OR_CHAR_INT (key->keysym)), - c >= 'A' && c <= 'Z'))) -#endif /* not USE_KKCC */ + if (event_upshifted_p (builder->most_current_event)) { Lisp_Object neubauten = copy_command_builder (builder, 0); struct command_builder *neub = XCOMMAND_BUILDER (neubauten); struct gcpro gcpro1; GCPRO1 (neubauten); - terminal = event_chain_tail (neub->current_events); -#ifdef USE_KKCC - key = XKEY_DATA (XEVENT_DATA (terminal)); - - if (KEY_DATA_MODIFIERS (key) & XEMACS_MOD_SHIFT) - SET_KEY_DATA_MODIFIERS (key, (KEY_DATA_MODIFIERS (key) & (~ XEMACS_MOD_SHIFT))); - else - SET_KEY_DATA_KEYSYM (key, make_char (c + 'a' - 'A')); -#else /* not USE_KKCC */ - key = &XEVENT (terminal)->event.key; - - if (key->modifiers & XEMACS_MOD_SHIFT) - key->modifiers &= (~ XEMACS_MOD_SHIFT); - else - key->keysym = make_char (c + 'a' - 'A'); -#endif /* not USE_KKCC */ - + downshift_event (event_chain_tail (neub->current_events)); result = command_builder_find_leaf_no_mule_processing (neub, allow_misc_user_events_p, did_munge); @@ -3573,8 +3495,7 @@ /* help-char is `auto-bound' in every keymap */ if (!NILP (Vprefix_help_command) && - event_matches_key_specifier_p (XEVENT (builder->most_current_event), - Vhelp_char)) + event_matches_key_specifier_p (builder->most_current_event, Vhelp_char)) return Vprefix_help_command; return Qnil; @@ -3623,13 +3544,7 @@ if (XEVENT_TYPE (builder->most_current_event) == key_press_event && !NILP (Vcomposed_character_default_binding)) { -#ifdef USE_KKCC - Lisp_Object keysym = - XKEY_DATA_KEYSYM(XEVENT_DATA (builder->most_current_event)); -#else /* not USE_KKCC */ - Lisp_Object keysym = - XEVENT (builder->most_current_event)->event.key.keysym; -#endif /* not USE_KKCC */ + Lisp_Object keysym = XEVENT_KEY_KEYSYM (builder->most_current_event); if (CHARP (keysym) && !ichar_ascii_p (XCHAR (keysym))) return Vcomposed_character_default_binding; } @@ -4040,7 +3955,7 @@ Lisp_Object recent = command_builder->most_current_event; if (EVENTP (recent) - && event_matches_key_specifier_p (XEVENT (recent), Vmeta_prefix_char)) + && event_matches_key_specifier_p (recent, Vmeta_prefix_char)) { Lisp_Event *e; /* When we see a sequence like "ESC x", pretend we really saw "M-x". @@ -4052,23 +3967,13 @@ */ Fcopy_event (event, recent); e = XEVENT (recent); -#ifdef USE_KKCC if (EVENT_TYPE (e) == key_press_event) - XSET_KEY_DATA_MODIFIERS (EVENT_DATA (e), - XKEY_DATA_MODIFIERS (EVENT_DATA (e)) | - XEMACS_MOD_META); + SET_EVENT_KEY_MODIFIERS (e, EVENT_KEY_MODIFIERS (e) | + XEMACS_MOD_META); else if (EVENT_TYPE (e) == button_press_event || EVENT_TYPE (e) == button_release_event) - XSET_BUTTON_DATA_MODIFIERS (EVENT_DATA (e), - XBUTTON_DATA_MODIFIERS (EVENT_DATA (e)) | - XEMACS_MOD_META); -#else /* not USE_KKCC */ - if (e->event_type == key_press_event) - e->event.key.modifiers |= XEMACS_MOD_META; - else if (e->event_type == button_press_event - || e->event_type == button_release_event) - e->event.button.modifiers |= XEMACS_MOD_META; -#endif /* not USE_KKCC */ + SET_EVENT_BUTTON_MODIFIERS (e, EVENT_BUTTON_MODIFIERS (e) | + XEMACS_MOD_META); else abort (); @@ -4125,16 +4030,11 @@ #if 0 else if (!NILP (Vquit_flag)) { - Lisp_Object quit_event = Fmake_event (Qnil, Qnil); - Lisp_Event *e = XEVENT (quit_event); /* if quit happened during menu acceleration, pretend we read it */ struct console *con = XCONSOLE (Fselected_console ()); - int ch = CONSOLE_QUIT_CHAR (con); - - character_to_event (ch, e, con, 1, 1); - e->channel = wrap_console (con); - - enqueue_command_event (quit_event); + + enqueue_command_event (Fcopy_event (CONSOLE_QUIT_EVENT (con), + Qnil)); Vquit_flag = Qnil; } #endif @@ -4162,15 +4062,9 @@ #ifdef HAVE_SCROLLBARS Lisp_Object fun; -#ifdef USE_KKCC if (XEVENT_TYPE (event) != misc_user_event) return 0; - fun = XMISC_USER_DATA_FUNCTION(XEVENT_DATA (event)); -#else /* not USE_KKCC */ - if (XEVENT (event)->event_type != misc_user_event) - return 0; - fun = XEVENT (event)->event.misc.function; -#endif /* not USE_KKCC */ + fun = XEVENT_MISC_USER_FUNCTION (event); return (EQ (fun, Qscrollbar_line_up) || EQ (fun, Qscrollbar_line_down) || @@ -4307,19 +4201,11 @@ pre_command_hook (); -#ifdef USE_KKCC if (XEVENT_TYPE (event) == misc_user_event) { - call1 (XMISC_USER_DATA_FUNCTION (XEVENT_DATA (event)), - XMISC_USER_DATA_OBJECT (XEVENT_DATA (event))); + call1 (XEVENT_MISC_USER_FUNCTION (event), + XEVENT_MISC_USER_OBJECT (event)); } -#else /* not USE_KKCC */ - if (XEVENT (event)->event_type == misc_user_event) - { - call1 (XEVENT (event)->event.eval.function, - XEVENT (event)->event.eval.object); - } -#endif /* not USE_KKCC */ else { Fcommand_execute (Vthis_command, Qnil, Qnil); @@ -4503,11 +4389,7 @@ Fselect_console (console); command_builder = XCOMMAND_BUILDER (XCONSOLE (console)->command_builder); -#ifdef USE_KKCC switch (XEVENT_TYPE (event)) -#else /* not USE_KKCC */ - switch (XEVENT (event)->event_type) -#endif /* not USE_KKCC */ { case button_press_event: case button_release_event: @@ -4669,27 +4551,15 @@ (a lambda expression). So in the `eval' case I'll just convert it into a lambda expression. */ -#ifdef USE_KKCC - if (EQ (XMISC_USER_DATA_FUNCTION (XEVENT_DATA (event)), Qcall_interactively) - && SYMBOLP (XMISC_USER_DATA_OBJECT (XEVENT_DATA (event)))) - Vthis_command = XMISC_USER_DATA_OBJECT (XEVENT_DATA (event)); - else if (EQ (XMISC_USER_DATA_FUNCTION (XEVENT_DATA (event)), Qeval)) + if (EQ (XEVENT_MISC_USER_FUNCTION (event), Qcall_interactively) + && SYMBOLP (XEVENT_MISC_USER_OBJECT (event))) + Vthis_command = XEVENT_MISC_USER_OBJECT (event); + else if (EQ (XEVENT_MISC_USER_FUNCTION (event), Qeval)) Vthis_command = - Fcons (Qlambda, Fcons (Qnil, XMISC_USER_DATA_OBJECT (XEVENT_DATA (event)))); - else if (SYMBOLP (XMISC_USER_DATA_FUNCTION (XEVENT_DATA (event)))) + Fcons (Qlambda, Fcons (Qnil, XEVENT_MISC_USER_OBJECT (event))); + else if (SYMBOLP (XEVENT_MISC_USER_FUNCTION (event))) /* A scrollbar command or the like. */ - Vthis_command = XMISC_USER_DATA_FUNCTION (XEVENT_DATA (event)); -#else /* not USE_KKCC */ - if (EQ (XEVENT (event)->event.eval.function, Qcall_interactively) - && SYMBOLP (XEVENT (event)->event.eval.object)) - Vthis_command = XEVENT (event)->event.eval.object; - else if (EQ (XEVENT (event)->event.eval.function, Qeval)) - Vthis_command = - Fcons (Qlambda, Fcons (Qnil, XEVENT (event)->event.eval.object)); - else if (SYMBOLP (XEVENT (event)->event.eval.function)) - /* A scrollbar command or the like. */ - Vthis_command = XEVENT (event)->event.eval.function; -#endif /* not USE_KKCC */ + Vthis_command = XEVENT_MISC_USER_FUNCTION (event); else /* Huh? */ Vthis_command = Qnil; @@ -4781,11 +4651,7 @@ execute_internal_event (event); else { -#ifdef USE_KKCC if (XEVENT_TYPE (event) == misc_user_event) -#else /* not USE_KKCC */ - if (XEVENT (event)->event_type == misc_user_event) -#endif /* not USE_KKCC */ reset_current_events (command_builder); result = lookup_command_event (command_builder, event, 1); if (!KEYMAPP (result)) @@ -4852,19 +4718,11 @@ if (NILP (Vdribble_file)) return; -#ifdef USE_KKCC if (XEVENT_TYPE (event) == key_press_event && - !XKEY_DATA_MODIFIERS (XEVENT_DATA (event))) + !XEVENT_KEY_MODIFIERS (event)) { - Lisp_Object keysym = XKEY_DATA_KEYSYM (XEVENT_DATA (event)); - if (CHARP (XKEY_DATA_KEYSYM (XEVENT_DATA (event)))) -#else /* not USE_KKCC */ - if (XEVENT (event)->event_type == key_press_event && - !XEVENT (event)->event.key.modifiers) - { - Lisp_Object keysym = XEVENT (event)->event.key.keysym; - if (CHARP (XEVENT (event)->event.key.keysym)) -#endif /* not USE_KKCC */ + Lisp_Object keysym = XEVENT_KEY_KEYSYM (event); + if (CHARP (XEVENT_KEY_KEYSYM (event))) { Ichar ch = XCHAR (keysym); Ibyte str[MAX_ICHAR_LEN]; @@ -5022,12 +4880,17 @@ Vthis_command_keys = Qnil; staticpro (&Vthis_command_keys); Vthis_command_keys_tail = Qnil; - dump_add_root_object (&Vthis_command_keys_tail); + dump_add_root_lisp_object (&Vthis_command_keys_tail); command_event_queue = Qnil; staticpro (&command_event_queue); command_event_queue_tail = Qnil; - dump_add_root_object (&command_event_queue_tail); + dump_add_root_lisp_object (&command_event_queue_tail); + + dispatch_event_queue = Qnil; + staticpro (&dispatch_event_queue); + dispatch_event_queue_tail = Qnil; + dump_add_root_lisp_object (&dispatch_event_queue_tail); Vlast_selected_frame = Qnil; staticpro (&Vlast_selected_frame);