Mercurial > hg > xemacs-beta
diff src/events.h @ 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 | 345b7d75cab4 |
| children | 416490619c01 |
line wrap: on
line diff
--- a/src/events.h Sun Jan 12 11:04:30 2003 +0000 +++ b/src/events.h Sun Jan 12 11:08:22 2003 +0000 @@ -27,10 +27,6 @@ #include "systime.h" -#ifdef USE_KKCC -#include "opaque.h" -#endif /* USE_KKCC */ - /* There is one object called an event_stream. This object contains callback functions for doing the window-system-dependent operations that XEmacs requires. @@ -147,17 +143,17 @@ Stream pairs description ------------------------ - Since there are many possible processes/event loop combinations, the event code - is responsible for creating an appropriate lstream type. The process - implementation does not care about that implementation. + Since there are many possible processes/event loop combinations, the + event code is responsible for creating an appropriate lstream type. The + process implementation does not care about that implementation. - The Create stream pair function is passed two void* values, which identify - process-dependent 'handles'. The process implementation uses these handles - to communicate with child processes. The function must be prepared to receive - handle types of any process implementation. Since only one process - implementation exists in a particular XEmacs configuration, preprocessing - is a means of compiling in the support for the code which deals with particular - handle types. + The Create stream pair function is passed two void* values, which + identify process-dependent 'handles'. The process implementation uses + these handles to communicate with child processes. The function must be + prepared to receive handle types of any process implementation. Since + only one process implementation exists in a particular XEmacs + configuration, preprocessing is a means of compiling in the support for + the code which deals with particular handle types. For example, a unixoid type loop, which relies on file descriptors, may be asked to create a pair of streams by a unix-style process implementation. @@ -209,8 +205,9 @@ void (*unselect_console_cb) (struct console *); void (*select_process_cb) (Lisp_Process *, int doin, int doerr); void (*unselect_process_cb) (Lisp_Process *, int doin, int doerr); - void (*quit_p_cb) (void); - void (*force_event_pending) (struct frame* f); + int (*quit_check_disallowed_p_cb)(void); + void (*drain_queue_cb) (void); + void (*force_event_pending_cb)(struct frame* f); void (*create_io_streams_cb) (void* /* inhandle*/, void* /*outhandle*/ , void * /* errhandle*/, Lisp_Object* /* instream */, @@ -231,17 +228,17 @@ extern struct event_stream *event_stream; -#ifdef USE_KKCC -Lisp_Object make_key_data (void); -Lisp_Object make_button_data (void); -Lisp_Object make_motion_data (void); -Lisp_Object make_process_data (void); -Lisp_Object make_timeout_data (void); -Lisp_Object make_magic_data (void); -Lisp_Object make_magic_eval_data (void); -Lisp_Object make_eval_data (void); -Lisp_Object make_misc_user_data (void); -#endif /* USE_KKCC */ +#ifdef EVENT_DATA_AS_OBJECTS +#define EVENT_FOO_BAR_1(extractor, field) ((extractor)->field) +#define EVENT_FOO_BAR(e, uptype, downtype, field) EVENT_FOO_BAR_1 (X##uptype##_DATA (EVENT_DATA (e)), field) +#define SET_EVENT_FOO_BAR_1(extractor, field, val) \ +do { (extractor)->field = (val); } while (0) +#define SET_EVENT_FOO_BAR(e, uptype, downtype, field, val) SET_EVENT_FOO_BAR_1 (X##uptype##_DATA (EVENT_DATA (e)), field, val) +#else +#define EVENT_FOO_BAR(e, uptype, downtype, field) ((e)->event.downtype.field) +#define SET_EVENT_FOO_BAR(e, uptype, downtype, field, val) \ +do { (e)->event.downtype.field = (val); } while (0) +#endif typedef enum emacs_event_type { @@ -278,15 +275,11 @@ #endif /* MULE */ -#ifdef USE_KKCC struct Lisp_Key_Data -#else /* not USE_KKCC */ -struct key_data -#endif /* not USE_KKCC */ { -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ /* What keysym this is; a character or a symbol. */ Lisp_Object keysym; /* Modifiers held down when key was pressed: control, meta, etc. @@ -315,36 +308,49 @@ #endif /* MULE */ }; -#ifdef USE_KKCC typedef struct Lisp_Key_Data Lisp_Key_Data; +#define KEY_DATA_KEYSYM(d) ((d)->keysym) +#define KEY_DATA_MODIFIERS(d) ((d)->modifiers) +#define SET_KEY_DATA_KEYSYM(d, k) ((d)->keysym = k) +#define SET_KEY_DATA_MODIFIERS(d, m) ((d)->modifiers = m) + +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (key_data, Lisp_Key_Data); #define XKEY_DATA(x) XRECORD (x, key_data, Lisp_Key_Data) #define wrap_key_data(p) wrap_record (p, key_data) #define KEY_DATAP(x) RECORDP (x, key_data) #define CHECK_KEY_DATA(x) CHECK_RECORD (x, key_data) #define CONCHECK_KEY_DATA(x) CONCHECK_RECORD (x, key_data) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XKEY_DATA_KEYSYM(d) (XKEY_DATA (d)->keysym) -#define KEY_DATA_KEYSYM(d) ((d)->keysym) -#define XKEY_DATA_MODIFIERS(d) (XKEY_DATA (d)->modifiers) -#define KEY_DATA_MODIFIERS(d) ((d)->modifiers) +#define EVENT_KEY_KEYSYM(e) EVENT_FOO_BAR (e, KEY, key, keysym) +#define XEVENT_KEY_KEYSYM(e) EVENT_KEY_KEYSYM (XEVENT (e)) +#define SET_EVENT_KEY_KEYSYM(e, val) \ + SET_EVENT_FOO_BAR (e, KEY, key, keysym, val) +#define XSET_EVENT_KEY_KEYSYM(e, val) \ + SET_EVENT_KEY_KEYSYM (XEVENT (e), val) -#define XSET_KEY_DATA_KEYSYM(d, k) (XKEY_DATA (d)->keysym = (k)) -#define SET_KEY_DATA_KEYSYM(d, k) ((d)->keysym = k) -#define XSET_KEY_DATA_MODIFIERS(d, m) (XKEY_DATA (d)->modifiers = m) -#define SET_KEY_DATA_MODIFIERS(d, m) ((d)->modifiers = m) -#endif /* USE_KKCC */ +#define EVENT_KEY_MODIFIERS(e) EVENT_FOO_BAR (e, KEY, key, modifiers) +#define XEVENT_KEY_MODIFIERS(e) EVENT_KEY_MODIFIERS (XEVENT (e)) +#define SET_EVENT_KEY_MODIFIERS(e, val) \ + SET_EVENT_FOO_BAR (e, KEY, key, modifiers, val) +#define XSET_EVENT_KEY_MODIFIERS(e, val) \ + SET_EVENT_KEY_MODIFIERS (XEVENT (e), val) -#ifdef USE_KKCC +#define EVENT_KEY_ALT_KEYCHARS(e, n) \ + EVENT_FOO_BAR (e, KEY, key, alt_keychars[n]) +#define XEVENT_KEY_ALT_KEYCHARS(e, n) EVENT_KEY_ALT_KEYCHARS (XEVENT (e), n) +#define SET_EVENT_KEY_ALT_KEYCHARS(e, n, val) \ + SET_EVENT_FOO_BAR (e, KEY, key, alt_keychars[n], val) +#define XSET_EVENT_KEY_ALT_KEYCHARS(e, n, val) \ + SET_EVENT_KEY_ALT_KEYCHARS (XEVENT (e), n, val) + struct Lisp_Button_Data -#else /* not USE_KKCC */ -struct button_data -#endif /* not USE_KKCC */ { -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ /* What button went down or up. */ int button; /* Bucky-bits on that button: shift, control, meta, etc. Also @@ -353,91 +359,114 @@ /* Where it was at the button-state-change (in pixels). */ int x, y; }; -#ifdef USE_KKCC typedef struct Lisp_Button_Data Lisp_Button_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (button_data, Lisp_Button_Data); #define XBUTTON_DATA(x) XRECORD (x, button_data, Lisp_Button_Data) #define wrap_button_data(p) wrap_record (p, button_data) #define BUTTON_DATAP(x) RECORDP (x, button_data) #define CHECK_BUTTON_DATA(x) CHECK_RECORD (x, button_data) #define CONCHECK_BUTTON_DATA(x) CONCHECK_RECORD (x, button_data) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XBUTTON_DATA_BUTTON(d) (XBUTTON_DATA (d)->button) -#define XBUTTON_DATA_MODIFIERS(d) (XBUTTON_DATA (d)->modifiers) -#define XBUTTON_DATA_X(d) (XBUTTON_DATA (d)->x) -#define XBUTTON_DATA_Y(d) (XBUTTON_DATA (d)->y) +#define EVENT_BUTTON_BUTTON(e) EVENT_FOO_BAR (e, BUTTON, button, button) +#define XEVENT_BUTTON_BUTTON(e) EVENT_BUTTON_BUTTON (XEVENT (e)) +#define SET_EVENT_BUTTON_BUTTON(e, val) \ + SET_EVENT_FOO_BAR (e, BUTTON, button, button, val) +#define XSET_EVENT_BUTTON_BUTTON(e, val) \ + SET_EVENT_BUTTON_BUTTON (XEVENT (e), val) + +#define EVENT_BUTTON_MODIFIERS(e) EVENT_FOO_BAR (e, BUTTON, button, modifiers) +#define XEVENT_BUTTON_MODIFIERS(e) EVENT_BUTTON_MODIFIERS (XEVENT (e)) +#define SET_EVENT_BUTTON_MODIFIERS(e, val) \ + SET_EVENT_FOO_BAR (e, BUTTON, button, modifiers, val) +#define XSET_EVENT_BUTTON_MODIFIERS(e, val) \ + SET_EVENT_BUTTON_MODIFIERS (XEVENT (e), val) -#define XSET_BUTTON_DATA_BUTTON(d, b) (XBUTTON_DATA (d)->button = (b)) -#define XSET_BUTTON_DATA_MODIFIERS(d, m) (XBUTTON_DATA (d)->modifiers = (m)) -#define XSET_BUTTON_DATA_X(d, new_x) (XBUTTON_DATA (d)->x = (new_x)) -#define XSET_BUTTON_DATA_Y(d, new_y) (XBUTTON_DATA (d)->y = (new_y)) -#endif /* USE_KKCC */ +#define EVENT_BUTTON_X(e) EVENT_FOO_BAR (e, BUTTON, button, x) +#define XEVENT_BUTTON_X(e) EVENT_BUTTON_X (XEVENT (e)) +#define SET_EVENT_BUTTON_X(e, val) \ + SET_EVENT_FOO_BAR (e, BUTTON, button, x, val) +#define XSET_EVENT_BUTTON_X(e, val) \ + SET_EVENT_BUTTON_X (XEVENT (e), val) -#ifdef USE_KKCC +#define EVENT_BUTTON_Y(e) EVENT_FOO_BAR (e, BUTTON, button, y) +#define XEVENT_BUTTON_Y(e) EVENT_BUTTON_Y (XEVENT (e)) +#define SET_EVENT_BUTTON_Y(e, val) \ + SET_EVENT_FOO_BAR (e, BUTTON, button, y, val) +#define XSET_EVENT_BUTTON_Y(e, val) \ + SET_EVENT_BUTTON_Y (XEVENT (e), val) + struct Lisp_Motion_Data -#else /* not USE_KKCC */ -struct motion_data -#endif /* not USE_KKCC */ { -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ /* Where it was after it moved (in pixels). */ int x, y; /* Bucky-bits down when the motion was detected. */ int modifiers; }; -#ifdef USE_KKCC typedef struct Lisp_Motion_Data Lisp_Motion_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (motion_data, Lisp_Motion_Data); #define XMOTION_DATA(x) XRECORD (x, motion_data, Lisp_Motion_Data) #define wrap_motion_data(p) wrap_record (p, motion_data) #define MOTION_DATAP(x) RECORDP (x, motion_data) #define CHECK_MOTION_DATA(x) CHECK_RECORD (x, motion_data) #define CONCHECK_MOTION_DATA(x) CONCHECK_RECORD (x, motion_data) - -#define XMOTION_DATA_X(d) (XMOTION_DATA (d)->x) -#define XMOTION_DATA_Y(d) (XMOTION_DATA (d)->y) -#define XMOTION_DATA_MODIFIERS(d) (XMOTION_DATA (d)->modifiers) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XSET_MOTION_DATA_X(d, new_x) (XMOTION_DATA (d)->x = (new_x)) -#define XSET_MOTION_DATA_Y(d, new_y) (XMOTION_DATA (d)->y = (new_y)) -#define XSET_MOTION_DATA_MODIFIERS(d, m) (XMOTION_DATA (d)->modifiers = (m)) -#endif /* USE_KKCC */ +#define EVENT_MOTION_X(e) EVENT_FOO_BAR (e, MOTION, motion, x) +#define XEVENT_MOTION_X(e) EVENT_MOTION_X (XEVENT (e)) +#define SET_EVENT_MOTION_X(e, val) \ + SET_EVENT_FOO_BAR (e, MOTION, motion, x, val) +#define XSET_EVENT_MOTION_X(e, val) \ + SET_EVENT_MOTION_X (XEVENT (e), val) -#ifdef USE_KKCC +#define EVENT_MOTION_Y(e) EVENT_FOO_BAR (e, MOTION, motion, y) +#define XEVENT_MOTION_Y(e) EVENT_MOTION_Y (XEVENT (e)) +#define SET_EVENT_MOTION_Y(e, val) \ + SET_EVENT_FOO_BAR (e, MOTION, motion, y, val) +#define XSET_EVENT_MOTION_Y(e, val) \ + SET_EVENT_MOTION_Y (XEVENT (e), val) + +#define EVENT_MOTION_MODIFIERS(e) EVENT_FOO_BAR (e, MOTION, motion, modifiers) +#define XEVENT_MOTION_MODIFIERS(e) EVENT_MOTION_MODIFIERS (XEVENT (e)) +#define SET_EVENT_MOTION_MODIFIERS(e, val) \ + SET_EVENT_FOO_BAR (e, MOTION, motion, modifiers, val) +#define XSET_EVENT_MOTION_MODIFIERS(e, val) \ + SET_EVENT_MOTION_MODIFIERS (XEVENT (e), val) + struct Lisp_Process_Data -#else /* not USE_KKCC */ -struct process_data -#endif /* not USE_KKCC */ { -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ /* the XEmacs "process" object in question */ Lisp_Object process; }; -#ifdef USE_KKCC typedef struct Lisp_Process_Data Lisp_Process_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (process_data, Lisp_Process_Data); #define XPROCESS_DATA(x) XRECORD (x, process_data, Lisp_Process_Data) #define wrap_process_data(p) wrap_record (p, process_data) #define PROCESS_DATAP(x) RECORDP (x, process_data) #define CHECK_PROCESS_DATA(x) CHECK_RECORD (x, process_data) #define CONCHECK_PROCESS_DATA(x) CONCHECK_RECORD (x, process_data) - -#define XPROCESS_DATA_PROCESS(d) (XPROCESS_DATA (d)->process) -#define XSET_PROCESS_DATA_PROCESS(d, p) (XPROCESS_DATA (d)->process = (p)) -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ -#ifdef USE_KKCC +#define EVENT_PROCESS_PROCESS(e) EVENT_FOO_BAR (e, PROCESS, process, process) +#define XEVENT_PROCESS_PROCESS(e) EVENT_PROCESS_PROCESS (XEVENT (e)) +#define SET_EVENT_PROCESS_PROCESS(e, val) \ + SET_EVENT_FOO_BAR (e, PROCESS, process, process, val) +#define XSET_EVENT_PROCESS_PROCESS(e, val) \ + SET_EVENT_PROCESS_PROCESS (XEVENT (e), val) + struct Lisp_Timeout_Data -#else /* not USE_KKCC */ -struct timeout_data -#endif /* not USE_KKCC */ { /* interval_id The ID returned when the associated call to @@ -452,40 +481,54 @@ processed. object The object passed to that function. */ -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ int interval_id; int id_number; Lisp_Object function; Lisp_Object object; }; -#ifdef USE_KKCC typedef struct Lisp_Timeout_Data Lisp_Timeout_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (timeout_data, Lisp_Timeout_Data); #define XTIMEOUT_DATA(x) XRECORD (x, timeout_data, Lisp_Timeout_Data) #define wrap_timeout_data(p) wrap_record(p, timeout_data) #define TIMEOUT_DATAP(x) RECORDP (x, timeout_data) #define CHECK_TIMEOUT_DATA(x) CHECK_RECORD (x, timeout_data) #define CONCHECK_TIMEOUT_DATA(x) CONCHECK_RECORD (x, timeout_data) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XTIMEOUT_DATA_INTERVAL_ID(d) XTIMEOUT_DATA (d)->interval_id -#define XTIMEOUT_DATA_ID_NUMBER(d) XTIMEOUT_DATA (d)->id_number -#define XTIMEOUT_DATA_FUNCTION(d) XTIMEOUT_DATA (d)->function -#define XTIMEOUT_DATA_OBJECT(d) XTIMEOUT_DATA (d)->object +#define EVENT_TIMEOUT_INTERVAL_ID(e) EVENT_FOO_BAR (e, TIMEOUT, timeout, interval_id) +#define XEVENT_TIMEOUT_INTERVAL_ID(e) EVENT_TIMEOUT_INTERVAL_ID (XEVENT (e)) +#define SET_EVENT_TIMEOUT_INTERVAL_ID(e, val) \ + SET_EVENT_FOO_BAR (e, TIMEOUT, timeout, interval_id, val) +#define XSET_EVENT_TIMEOUT_INTERVAL_ID(e, val) \ + SET_EVENT_TIMEOUT_INTERVAL_ID (XEVENT (e), val) + +#define EVENT_TIMEOUT_ID_NUMBER(e) EVENT_FOO_BAR (e, TIMEOUT, timeout, id_number) +#define XEVENT_TIMEOUT_ID_NUMBER(e) EVENT_TIMEOUT_ID_NUMBER (XEVENT (e)) +#define SET_EVENT_TIMEOUT_ID_NUMBER(e, val) \ + SET_EVENT_FOO_BAR (e, TIMEOUT, timeout, id_number, val) +#define XSET_EVENT_TIMEOUT_ID_NUMBER(e, val) \ + SET_EVENT_TIMEOUT_ID_NUMBER (XEVENT (e), val) -#define XSET_TIMEOUT_DATA_INTERVAL_ID(d, i) XTIMEOUT_DATA (d)->interval_id = (i) -#define XSET_TIMEOUT_DATA_ID_NUMBER(d, n) XTIMEOUT_DATA (d)->id_number = (n) -#define XSET_TIMEOUT_DATA_FUNCTION(d, f) XTIMEOUT_DATA (d)->function = f -#define XSET_TIMEOUT_DATA_OBJECT(d, o) XTIMEOUT_DATA (d)->object = o -#endif /* USE_KKCC */ +#define EVENT_TIMEOUT_FUNCTION(e) EVENT_FOO_BAR (e, TIMEOUT, timeout, function) +#define XEVENT_TIMEOUT_FUNCTION(e) EVENT_TIMEOUT_FUNCTION (XEVENT (e)) +#define SET_EVENT_TIMEOUT_FUNCTION(e, val) \ + SET_EVENT_FOO_BAR (e, TIMEOUT, timeout, function, val) +#define XSET_EVENT_TIMEOUT_FUNCTION(e, val) \ + SET_EVENT_TIMEOUT_FUNCTION (XEVENT (e), val) -#ifdef USE_KKCC +#define EVENT_TIMEOUT_OBJECT(e) EVENT_FOO_BAR (e, TIMEOUT, timeout, object) +#define XEVENT_TIMEOUT_OBJECT(e) EVENT_TIMEOUT_OBJECT (XEVENT (e)) +#define SET_EVENT_TIMEOUT_OBJECT(e, val) \ + SET_EVENT_FOO_BAR (e, TIMEOUT, timeout, object, val) +#define XSET_EVENT_TIMEOUT_OBJECT(e, val) \ + SET_EVENT_TIMEOUT_OBJECT (XEVENT (e), val) + struct Lisp_Eval_Data -#else /* not USE_KKCC */ -struct eval_data -#endif /* not USE_KKCC */ { /* This kind of event is used internally; sometimes the window system interface would like to inform XEmacs of some user action (such as @@ -497,34 +540,38 @@ function An elisp function to call with this event object. object Argument of function. */ -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ Lisp_Object function; Lisp_Object object; }; -#ifdef USE_KKCC typedef struct Lisp_Eval_Data Lisp_Eval_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (eval_data, Lisp_Eval_Data); #define XEVAL_DATA(x) XRECORD (x, eval_data, Lisp_Eval_Data) #define wrap_eval_data(p) wrap_record(p, eval_data) #define EVAL_DATAP(x) RECORDP (x, eval_data) #define CHECK_EVAL_DATA(x) CHECK_RECORD (x, eval_data) #define CONCHECK_EVAL_DATA(x) CONCHECK_RECORD (x, eval_data) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XEVAL_DATA_FUNCTION(d) (XEVAL_DATA (d)->function) -#define XEVAL_DATA_OBJECT(d) (XEVAL_DATA (d)->object) +#define EVENT_EVAL_FUNCTION(e) EVENT_FOO_BAR (e, EVAL, eval, function) +#define XEVENT_EVAL_FUNCTION(e) EVENT_EVAL_FUNCTION (XEVENT (e)) +#define SET_EVENT_EVAL_FUNCTION(e, val) \ + SET_EVENT_FOO_BAR (e, EVAL, eval, function, val) +#define XSET_EVENT_EVAL_FUNCTION(e, val) \ + SET_EVENT_EVAL_FUNCTION (XEVENT (e), val) -#define XSET_EVAL_DATA_FUNCTION(d, f) (XEVAL_DATA (d)->function = f) -#define XSET_EVAL_DATA_OBJECT(d, o) (XEVAL_DATA (d)->object = o) -#endif /* USE_KKCC */ +#define EVENT_EVAL_OBJECT(e) EVENT_FOO_BAR (e, EVAL, eval, object) +#define XEVENT_EVAL_OBJECT(e) EVENT_EVAL_OBJECT (XEVENT (e)) +#define SET_EVENT_EVAL_OBJECT(e, val) \ + SET_EVENT_FOO_BAR (e, EVAL, eval, object, val) +#define XSET_EVENT_EVAL_OBJECT(e, val) \ + SET_EVENT_EVAL_OBJECT (XEVENT (e), val) -#ifdef USE_KKCC struct Lisp_Misc_User_Data -#else /* not USE_KKCC */ -struct misc_user_data -#endif /* not USE_KKCC */ { /* #### The misc-user type is serious junk. It should be separated out into different events. There's no reason to create @@ -546,48 +593,69 @@ by the XEmacs Drag'n'Drop system. Don't depend on their values for other types of misc_user_events. */ -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ Lisp_Object function; Lisp_Object object; int button; int modifiers; int x, y; }; -#ifdef USE_KKCC typedef struct Lisp_Misc_User_Data Lisp_Misc_User_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (misc_user_data, Lisp_Misc_User_Data); #define XMISC_USER_DATA(x) XRECORD (x, misc_user_data, Lisp_Misc_User_Data) #define wrap_misc_user_data(p) wrap_record(p, misc_user_data) #define MISC_USER_DATAP(x) RECORDP (x, misc_user_data) #define CHECK_MISC_USER_DATA(x) CHECK_RECORD (x, misc_user_data) #define CONCHECK_MISC_USER_DATA(x) CONCHECK_RECORD (x, misc_user_data) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XMISC_USER_DATA_FUNCTION(d) (XMISC_USER_DATA (d)->function) -#define XMISC_USER_DATA_OBJECT(d) (XMISC_USER_DATA (d)->object) -#define XMISC_USER_DATA_BUTTON(d) (XMISC_USER_DATA (d)->button) -#define XMISC_USER_DATA_MODIFIERS(d) (XMISC_USER_DATA (d)->modifiers) -#define XMISC_USER_DATA_X(d) (XMISC_USER_DATA (d)->x) -#define XMISC_USER_DATA_Y(d) (XMISC_USER_DATA (d)->y) +#define EVENT_MISC_USER_FUNCTION(e) EVENT_FOO_BAR (e, MISC_USER, misc_user, function) +#define XEVENT_MISC_USER_FUNCTION(e) EVENT_MISC_USER_FUNCTION (XEVENT (e)) +#define SET_EVENT_MISC_USER_FUNCTION(e, val) \ + SET_EVENT_FOO_BAR (e, MISC_USER, misc_user, function, val) +#define XSET_EVENT_MISC_USER_FUNCTION(e, val) \ + SET_EVENT_MISC_USER_FUNCTION (XEVENT (e), val) + +#define EVENT_MISC_USER_OBJECT(e) EVENT_FOO_BAR (e, MISC_USER, misc_user, object) +#define XEVENT_MISC_USER_OBJECT(e) EVENT_MISC_USER_OBJECT (XEVENT (e)) +#define SET_EVENT_MISC_USER_OBJECT(e, val) \ + SET_EVENT_FOO_BAR (e, MISC_USER, misc_user, object, val) +#define XSET_EVENT_MISC_USER_OBJECT(e, val) \ + SET_EVENT_MISC_USER_OBJECT (XEVENT (e), val) -#define XSET_MISC_USER_DATA_FUNCTION(d, f) (XMISC_USER_DATA (d)->function = (f)) -#define XSET_MISC_USER_DATA_OBJECT(d, o) (XMISC_USER_DATA (d)->object = (o)) -#define XSET_MISC_USER_DATA_BUTTON(d, b) (XMISC_USER_DATA (d)->button = (b)) -#define XSET_MISC_USER_DATA_MODIFIERS(d, m) (XMISC_USER_DATA (d)->modifiers = (m)) -#define XSET_MISC_USER_DATA_X(d, new_x) (XMISC_USER_DATA (d)->x = (new_x)) -#define XSET_MISC_USER_DATA_Y(d, new_y) (XMISC_USER_DATA (d)->y = (new_y)) -#endif /* USE_KKCC */ +#define EVENT_MISC_USER_BUTTON(e) EVENT_FOO_BAR (e, MISC_USER, misc_user, button) +#define XEVENT_MISC_USER_BUTTON(e) EVENT_MISC_USER_BUTTON (XEVENT (e)) +#define SET_EVENT_MISC_USER_BUTTON(e, val) \ + SET_EVENT_FOO_BAR (e, MISC_USER, misc_user, button, val) +#define XSET_EVENT_MISC_USER_BUTTON(e, val) \ + SET_EVENT_MISC_USER_BUTTON (XEVENT (e), val) + +#define EVENT_MISC_USER_MODIFIERS(e) EVENT_FOO_BAR (e, MISC_USER, misc_user, modifiers) +#define XEVENT_MISC_USER_MODIFIERS(e) EVENT_MISC_USER_MODIFIERS (XEVENT (e)) +#define SET_EVENT_MISC_USER_MODIFIERS(e, val) \ + SET_EVENT_FOO_BAR (e, MISC_USER, misc_user, modifiers, val) +#define XSET_EVENT_MISC_USER_MODIFIERS(e, val) \ + SET_EVENT_MISC_USER_MODIFIERS (XEVENT (e), val) -#ifdef USE_KKCC -typedef void (*lisp_obj_arg_fun) (Lisp_Object); +#define EVENT_MISC_USER_X(e) EVENT_FOO_BAR (e, MISC_USER, misc_user, x) +#define XEVENT_MISC_USER_X(e) EVENT_MISC_USER_X (XEVENT (e)) +#define SET_EVENT_MISC_USER_X(e, val) \ + SET_EVENT_FOO_BAR (e, MISC_USER, misc_user, x, val) +#define XSET_EVENT_MISC_USER_X(e, val) \ + SET_EVENT_MISC_USER_X (XEVENT (e), val) +#define EVENT_MISC_USER_Y(e) EVENT_FOO_BAR (e, MISC_USER, misc_user, y) +#define XEVENT_MISC_USER_Y(e) EVENT_MISC_USER_Y (XEVENT (e)) +#define SET_EVENT_MISC_USER_Y(e, val) \ + SET_EVENT_FOO_BAR (e, MISC_USER, misc_user, y, val) +#define XSET_EVENT_MISC_USER_Y(e, val) \ + SET_EVENT_MISC_USER_Y (XEVENT (e), val) struct Lisp_Magic_Eval_Data -#else /* not USE_KKCC */ -struct magic_eval_data -#endif /* not USE_KKCC */ { /* This is like an eval event but its contents are not Lisp-accessible. This allows for "internal eval events" that call @@ -602,32 +670,36 @@ object Argument of function. */ -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; -#endif /* USE_KKCC */ +#endif /* EVENT_DATA_AS_OBJECTS */ void (*internal_function) (Lisp_Object); Lisp_Object object; }; -#ifdef USE_KKCC typedef struct Lisp_Magic_Eval_Data Lisp_Magic_Eval_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (magic_eval_data, Lisp_Magic_Eval_Data); #define XMAGIC_EVAL_DATA(x) XRECORD (x, magic_eval_data, Lisp_Magic_Eval_Data) #define wrap_magic_eval_data(p) wrap_record(p, magic_eval_data) #define MAGIC_EVAL_DATAP(x) RECORDP (x, magic_eval_data) #define CHECK_MAGIC_EVAL_DATA(x) CHECK_RECORD (x, magic_eval_data) #define CONCHECK_MAGIC_EVAL_DATA(x) CONCHECK_RECORD (x, magic_eval_data) - -#define XMAGIC_EVAL_DATA_INTERNAL_FUNCTION(d) \ - XMAGIC_EVAL_DATA (d)->internal_function -#define XMAGIC_EVAL_DATA_INTERNAL_FUNOBJ(d) (XMAGIC_EVAL_DATA (d)->internal_function) -#define XMAGIC_EVAL_DATA_OBJECT(d) (XMAGIC_EVAL_DATA (d)->object) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XSET_MAGIC_EVAL_DATA_INTERNAL_FUNCTION(d, f) \ - (XMAGIC_EVAL_DATA (d)->internal_function = f) -#define XSET_MAGIC_EVAL_DATA_INTERNAL_FUNOBJ(d, f) (XMAGIC_EVAL_DATA (d)->internal_function = (f)) -#define XSET_MAGIC_EVAL_DATA_OBJECT(d, o) (XMAGIC_EVAL_DATA (d)->object = (o)) -#endif /* USE_KKCC */ +#define EVENT_MAGIC_EVAL_INTERNAL_FUNCTION(e) EVENT_FOO_BAR (e, MAGIC_EVAL, magic_eval, internal_function) +#define XEVENT_MAGIC_EVAL_INTERNAL_FUNCTION(e) EVENT_MAGIC_EVAL_INTERNAL_FUNCTION (XEVENT (e)) +#define SET_EVENT_MAGIC_EVAL_INTERNAL_FUNCTION(e, val) \ + SET_EVENT_FOO_BAR (e, MAGIC_EVAL, magic_eval, internal_function, val) +#define XSET_EVENT_MAGIC_EVAL_INTERNAL_FUNCTION(e, val) \ + SET_EVENT_MAGIC_EVAL_INTERNAL_FUNCTION (XEVENT (e), val) + +#define EVENT_MAGIC_EVAL_OBJECT(e) EVENT_FOO_BAR (e, MAGIC_EVAL, magic_eval, object) +#define XEVENT_MAGIC_EVAL_OBJECT(e) EVENT_MAGIC_EVAL_OBJECT (XEVENT (e)) +#define SET_EVENT_MAGIC_EVAL_OBJECT(e, val) \ + SET_EVENT_FOO_BAR (e, MAGIC_EVAL, magic_eval, object, val) +#define XSET_EVENT_MAGIC_EVAL_OBJECT(e, val) \ + SET_EVENT_MAGIC_EVAL_OBJECT (XEVENT (e), val) #if defined (HAVE_X_WINDOWS) && defined(emacs) # include <X11/Xlib.h> @@ -638,10 +710,25 @@ #endif -#ifdef USE_KKCC struct Lisp_Magic_Data { +/* No user-serviceable parts within. This is for things like + KeymapNotify and ExposeRegion events and so on that XEmacs itself + doesn't care about, but which it must do something with for proper + interaction with the window system. + + Magic_events are handled somewhat asynchronously, just like + subprocess filters. However, occasionally a magic_event needs to + be handled synchronously; in that case, the asynchronous handling + of the magic_event will push an eval_event back onto the queue, + which will be handled synchronously later. This is one of the + reasons why eval_events exist; I'm not entirely happy with this + aspect of this event model. +*/ + +#ifdef EVENT_DATA_AS_OBJECTS struct lrecord_header lheader; +#endif /* EVENT_DATA_AS_OBJECTS */ union { #ifdef HAVE_GTK @@ -658,61 +745,49 @@ typedef struct Lisp_Magic_Data Lisp_Magic_Data; +#ifdef EVENT_DATA_AS_OBJECTS DECLARE_LRECORD (magic_data, Lisp_Magic_Data); #define XMAGIC_DATA(x) XRECORD (x, magic_data, Lisp_Magic_Data) #define wrap_magic_data(p) wrap_record(p, magic_data) #define MAGIC_DATAP(x) RECORDP (x, magic_data) #define CHECK_MAGIC_DATA(x) CHECK_RECORD (x, magic_data) #define CONCHECK_MAGIC_DATA(x) CONCHECK_RECORD (x, magic_data) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define XMAGIC_DATA_UNDERLYING(d) (XMAGIC_DATA (d)->underlying) -#define XSET_MAGIC_DATA_UNDERLYING(d, u) (XMAGIC_DATA (d)->underlying = (u)) +#define EVENT_MAGIC_UNDERLYING(e) EVENT_FOO_BAR (e, MAGIC, magic, underlying) +#define XEVENT_MAGIC_UNDERLYING(e) EVENT_MAGIC_UNDERLYING (XEVENT (e)) +#define SET_EVENT_MAGIC_UNDERLYING(e, val) \ + SET_EVENT_FOO_BAR (e, MAGIC, magic, underlying, val) +#define XSET_EVENT_MAGIC_UNDERLYING(e, val) \ + SET_EVENT_MAGIC_UNDERLYING (XEVENT (e), val) #ifdef HAVE_GTK -#define XMAGIC_DATA_GDK_EVENT(d) (XMAGIC_DATA (d)->underlying.gdk_event) -#define XSET_MAGIC_DATA_GDK_EVENT(d, e) (XMAGIC_DATA (d)->underlying.gdk_event = (e)) -#endif /*HAVE_GTK*/ +#define EVENT_MAGIC_GDK_EVENT(e) EVENT_FOO_BAR (e, MAGIC, magic, underlying.gdk_event) +#define XEVENT_MAGIC_GDK_EVENT(e) EVENT_MAGIC_GDK_EVENT (XEVENT (e)) +#define SET_EVENT_MAGIC_GDK_EVENT(e, val) \ + SET_EVENT_FOO_BAR (e, MAGIC, magic, underlying.gdk_event, val) +#define XSET_EVENT_MAGIC_GDK_EVENT(e, val) \ + SET_EVENT_MAGIC_GDK_EVENT (XEVENT (e), val) +#endif #ifdef HAVE_X_WINDOWS -#define XMAGIC_DATA_X_EVENT(d) (XMAGIC_DATA (d)->underlying.x_event) -#define XSET_MAGIC_DATA_X_EVENT(d, e) (XMAGIC_DATA (d)->underlying.x_event = (e)) +#define EVENT_MAGIC_X_EVENT(e) EVENT_FOO_BAR (e, MAGIC, magic, underlying.x_event) +#define XEVENT_MAGIC_X_EVENT(e) EVENT_MAGIC_X_EVENT (XEVENT (e)) +#define SET_EVENT_MAGIC_X_EVENT(e, val) \ + SET_EVENT_FOO_BAR (e, MAGIC, magic, underlying.x_event, val) +#define XSET_EVENT_MAGIC_X_EVENT(e, val) \ + SET_EVENT_MAGIC_X_EVENT (XEVENT (e), val) #endif #ifdef HAVE_MS_WINDOWS -#define XMAGIC_DATA_MSWINDOWS_EVENT(d) (XMAGIC_DATA (d)->underlying.mswindows_event) -#define XSET_MAGIC_DATA_MSWINDOWS_EVENT(d, e) (XMAGIC_DATA (d)->underlying.mswindows_event = (e)) +#define EVENT_MAGIC_MSWINDOWS_EVENT(e) EVENT_FOO_BAR (e, MAGIC, magic, underlying.mswindows_event) +#define XEVENT_MAGIC_MSWINDOWS_EVENT(e) EVENT_MAGIC_MSWINDOWS_EVENT (XEVENT (e)) +#define SET_EVENT_MAGIC_MSWINDOWS_EVENT(e, val) \ + SET_EVENT_FOO_BAR (e, MAGIC, magic, underlying.mswindows_event, val) +#define XSET_EVENT_MAGIC_MSWINDOWS_EVENT(e, val) \ + SET_EVENT_MAGIC_MSWINDOWS_EVENT (XEVENT (e), val) #endif -#else /* not USE_KKCC */ -union magic_data -{ -/* No user-serviceable parts within. This is for things like - KeymapNotify and ExposeRegion events and so on that XEmacs itself - doesn't care about, but which it must do something with for proper - interaction with the window system. - - Magic_events are handled somewhat asynchronously, just like - subprocess filters. However, occasionally a magic_event needs to - be handled synchronously; in that case, the asynchronous handling - of the magic_event will push an eval_event back onto the queue, - which will be handled synchronously later. This is one of the - reasons why eval_events exist; I'm not entirely happy with this - aspect of this event model. -*/ - -#ifdef HAVE_GTK - GdkEvent underlying_gdk_event; -#endif -#ifdef HAVE_X_WINDOWS - XEvent underlying_x_event; -#endif -#ifdef HAVE_MS_WINDOWS - int underlying_mswindows_event; -#endif -}; -#endif /* not USE_KKCC */ - - struct Lisp_Timeout { struct lcrecord_header header; @@ -784,22 +859,22 @@ server time and real process time; yuck.) */ unsigned int timestamp; -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS Lisp_Object event_data; -#else /* not USE_KKCC */ +#else /* not EVENT_DATA_AS_OBJECTS */ union { - struct key_data key; - struct button_data button; - struct motion_data motion; - struct process_data process; - struct timeout_data timeout; - struct eval_data eval; /* misc_user_event no longer uses this */ - struct misc_user_data misc; /* because it needs position information */ - union magic_data magic; - struct magic_eval_data magic_eval; + Lisp_Key_Data key; + Lisp_Button_Data button; + Lisp_Motion_Data motion; + Lisp_Process_Data process; + Lisp_Timeout_Data timeout; + Lisp_Eval_Data eval; /* misc_user_event no longer uses this */ + Lisp_Misc_User_Data misc_user;/* because it needs position information */ + Lisp_Magic_Data magic; + Lisp_Magic_Eval_Data magic_eval; } event; -#endif /* not USE_KKCC */ +#endif /* not EVENT_DATA_AS_OBJECTS */ }; DECLARE_LRECORD (event, Lisp_Event); @@ -812,26 +887,29 @@ DECLARE_LRECORD (command_builder, struct command_builder); #define EVENT_CHANNEL(a) ((a)->channel) +#define XEVENT_CHANNEL(ev) (XEVENT (ev)->channel) #define EVENT_TYPE(a) ((a)->event_type) #define XEVENT_TYPE(a) (XEVENT (a)->event_type) #define EVENT_NEXT(a) ((a)->next) #define XEVENT_NEXT(e) (XEVENT (e)->next) +#define EVENT_TIMESTAMP(ev) ((ev)->timestamp) +#define XEVENT_TIMESTAMP(ev) EVENT_TIMESTAMP (XEVENT (ev)) -#ifdef USE_KKCC +#ifdef EVENT_DATA_AS_OBJECTS #define XEVENT_DATA(ev) (XEVENT (ev)->event_data) #define EVENT_DATA(ev) ((ev)->event_data) -#define XEVENT_CHANNEL(ev) (XEVENT (ev)->channel) -#define EVENT_TIMESTAMP(ev) \ - ((ev)->timestamp) -#define XEVENT_TIMESTAMP(ev) EVENT_TIMESTAMP (XEVENT (ev)) +#define SET_EVENT_DATA(ev, d) \ +do { \ + Lisp_Event *mac_event = (ev); \ + mac_event->event_data = (d); \ +} while (0) +#define XSET_EVENT_DATA(ev, d) SET_EVENT_DATA (XEVENT (ev), d) +#endif /* EVENT_DATA_AS_OBJECTS */ -#define SET_EVENT_TIMESTAMP_ZERO(ev) \ - ((ev)->timestamp = 0) -#define SET_EVENT_TIMESTAMP(ev, t) \ - (ev)->timestamp = (t) +#define SET_EVENT_TIMESTAMP_ZERO(ev) ((ev)->timestamp = 0) +#define SET_EVENT_TIMESTAMP(ev, t) ((ev)->timestamp = (t)) #define XSET_EVENT_TIMESTAMP(ev, t) SET_EVENT_TIMESTAMP (XEVENT (ev), t) - #define SET_EVENT_CHANNEL(ev, c) \ do { \ Lisp_Event *mac_event = (ev); \ @@ -839,67 +917,93 @@ } while (0) #define XSET_EVENT_CHANNEL(ev, c) SET_EVENT_CHANNEL (XEVENT (ev), c) -#define SET_EVENT_DATA(ev, d) \ -do { \ - Lisp_Event *mac_event = (ev); \ - mac_event->event_data = (d); \ -} while (0) -#define XSET_EVENT_DATA(ev, d) SET_EVENT_DATA (XEVENT (ev), d) +DECLARE_INLINE_HEADER ( +void +set_event_type (struct Lisp_Event *event, emacs_event_type t) +) +{ +#ifdef EVENT_DATA_AS_OBJECTS + switch (EVENT_TYPE (event)) + { + case key_press_event: + free_key_data (event->event_data); + break; + case button_press_event: + case button_release_event: + free_button_data (event->event_data); + break; + case pointer_motion_event: + free_motion_data (event->event_data); + break; + case process_event: + free_process_data (event->event_data); + break; + case timeout_event: + free_timeout_data (event->event_data); + break; + case magic_event: + free_magic_data (event->event_data); + break; + case magic_eval_event: + free_magic_eval_data (event->event_data); + break; + case eval_event: + free_eval_data (event->event_data); + break; + case misc_user_event: + free_misc_user_data (event->event_data); + break; + default: + break; + } +#endif /* EVENT_DATA_AS_OBJECTS */ -INLINE_HEADER void set_event_type(struct Lisp_Event *event, emacs_event_type t); -INLINE_HEADER void -set_event_type(struct Lisp_Event *event, emacs_event_type t) -{ event->event_type = t; - switch (t) { - case key_press_event: - event->event_data = make_key_data (); - break; - case button_press_event: - case button_release_event: - event->event_data = make_button_data (); - break; - case pointer_motion_event: - event->event_data = make_motion_data (); - break; - case process_event: - event->event_data = make_process_data (); - break; - case timeout_event: - event->event_data = make_timeout_data (); - break; - case magic_event: - event->event_data = make_magic_data (); - break; - case magic_eval_event: - event->event_data = make_magic_eval_data (); - break; - case eval_event: - event->event_data = make_eval_data (); - break; - case misc_user_event: - event->event_data = make_misc_user_data (); - break; - default: - break; - } +#ifdef EVENT_DATA_AS_OBJECTS + switch (t) + { + case key_press_event: + event->event_data = make_key_data (); + break; + case button_press_event: + case button_release_event: + event->event_data = make_button_data (); + break; + case pointer_motion_event: + event->event_data = make_motion_data (); + break; + case process_event: + event->event_data = make_process_data (); + break; + case timeout_event: + event->event_data = make_timeout_data (); + break; + case magic_event: + event->event_data = make_magic_data (); + break; + case magic_eval_event: + event->event_data = make_magic_eval_data (); + break; + case eval_event: + event->event_data = make_eval_data (); + break; + case misc_user_event: + event->event_data = make_misc_user_data (); + break; + default: + event->event_data = Qnil; + break; + } +#endif /* EVENT_DATA_AS_OBJECTS */ } + +#define SET_EVENT_NEXT(ev, n) do { (ev)->next = (n); } while (0) +#define XSET_EVENT_NEXT(ev, n) SET_EVENT_NEXT (XEVENT (ev), n) + #define XSET_EVENT_TYPE(ev, t) set_event_type (XEVENT (ev), t) #define SET_EVENT_TYPE(ev, t) set_event_type (ev, t) - -#define SET_EVENT_NEXT(ev, n) \ -do { \ - Lisp_Event *mac_event = (ev); \ - mac_event->next = (n); \ -} while (0) -#define XSET_EVENT_NEXT(ev, n) SET_EVENT_NEXT (XEVENT (ev), n) - -#else /* NOT USE_KKCC */ -#define XSET_EVENT_NEXT(e, n) do { (XEVENT (e)->next = (n)); } while (0) -#endif - #define EVENT_CHAIN_LOOP(event, chain) \ for (event = chain; !NILP (event); event = XEVENT_NEXT (event)) @@ -956,45 +1060,52 @@ #define KEYSYM(x) (intern (x)) /* from events.c */ -#ifdef USE_KKCC void format_event_object (Eistring *buf, Lisp_Object event, int brief); -#else /* not USE_KKCC */ -void format_event_object (Eistring *buf, Lisp_Event *event, int brief); -#endif /* not USE_KKCC */ -#ifdef USE_KKCC //void format_event_data_object (Eistring *buf, Lisp_Object data, int brief); -void copy_event_data (Lisp_Object dest, Lisp_Object src); -#endif /* USE_KKCC */ void character_to_event (Ichar c, Lisp_Event *event, struct console *con, int use_console_meta_flag, int do_backspace_mapping); void zero_event (Lisp_Event *e); + +#define MECR_DEALLOCATE_EVENT 1 + void deallocate_event_chain (Lisp_Object event); Lisp_Object event_chain_tail (Lisp_Object event); void enqueue_event (Lisp_Object event, Lisp_Object *head, Lisp_Object *tail); Lisp_Object dequeue_event (Lisp_Object *head, Lisp_Object *tail); void enqueue_event_chain (Lisp_Object event_chain, Lisp_Object *head, Lisp_Object *tail); +int map_event_chain_remove (int (*fn) (Lisp_Object ev, void *user_data), + Lisp_Object *head, Lisp_Object *tail, + void *user_data, int flags); int event_chain_count (Lisp_Object event_chain); -Lisp_Object transfer_event_chain_pointer (Lisp_Object pointer, - Lisp_Object old_chain, - Lisp_Object new_chain); -void nth_of_key_sequence_as_event (Lisp_Object seq, int n, Lisp_Object event); -Lisp_Object key_sequence_to_event_chain (Lisp_Object seq); Lisp_Object event_chain_find_previous (Lisp_Object event_chain, Lisp_Object event); Lisp_Object event_chain_nth (Lisp_Object event_chain, int n); Lisp_Object copy_event_chain (Lisp_Object event_chain); +Lisp_Object transfer_event_chain_pointer (Lisp_Object pointer, + Lisp_Object old_chain, + Lisp_Object new_chain); + + +void nth_of_key_sequence_as_event (Lisp_Object seq, int n, Lisp_Object event); +Lisp_Object key_sequence_to_event_chain (Lisp_Object seq); /* True if this is a non-internal event (keyboard press, menu, scrollbar, mouse button) */ int command_event_p (Lisp_Object event); void define_self_inserting_symbol (Lisp_Object, Lisp_Object); -Ichar event_to_character (Lisp_Event *, int, int, int); +Ichar event_to_character (Lisp_Object, int, int, int); struct console *event_console_or_selected (Lisp_Object event); +void upshift_event (Lisp_Object event); +void downshift_event (Lisp_Object event); +int event_upshifted_p (Lisp_Object event); /* from event-stream.c */ +extern Lisp_Object dispatch_event_queue; Lisp_Object allocate_command_builder (Lisp_Object console, int with_echo_buf); +void enqueue_dispatch_event (Lisp_Object event); +Lisp_Object dequeue_dispatch_event (void); void enqueue_magic_eval_event (void (*fun) (Lisp_Object), Lisp_Object object); void event_stream_handle_magic_event (Lisp_Event *event); void event_stream_format_magic_event (Lisp_Event *event, Lisp_Object pstream); @@ -1073,6 +1184,7 @@ void signal_fake_event (void); void drain_signal_event_pipe (void); +void drain_tty_devices (void); extern int fake_event_occurred; @@ -1082,6 +1194,7 @@ int doerr, int *infd, int *errfd); void event_stream_unixoid_unselect_process (Lisp_Process *proc, int doin, int doerr, int *infd, int *errfd); +struct console *find_tty_or_stream_console_from_fd (int fd); int read_event_from_tty_or_stream_desc (Lisp_Event *event, struct console *con); void event_stream_unixoid_create_io_streams (void* inhandle, void* outhandle, @@ -1098,11 +1211,15 @@ USID* in_usid, USID* err_usid); +#endif /* HAVE_UNIXOID_EVENT_LOOP */ + +/* The following is not inside of HAVE_UNIXOID_EVENT_LOOP because of the + possibility of combiling XEmacs with no-MSW, no-X, no-TTY -- + process-unix.c is still compiled. #### Should we still compile + subprocesses with no event loops? */ /* Beware: this evil macro evaluates its arg many times */ #define FD_TO_USID(fd) ((fd)==0 ? (USID)999999 : ((fd)<0 ? USID_DONTHASH : (USID)(fd))) -#endif /* HAVE_UNIXOID_EVENT_LOOP */ - /* Define this if you want the tty event stream to be used when the first console is tty, even if HAVE_X_WINDOWS is defined */ /* #define DEBUG_TTY_EVENT_STREAM */ @@ -1139,20 +1256,17 @@ something that's not part of a possible function key, we have to unread all of those events. */ Lisp_Object last_non_munged_event; - /* One set of values for function-key-map, one for key-translation-map */ - struct munging_key_translation - { - /* First event that can begin a possible function key sequence - (to be translated according to function-key-map). Normally - this is the first event in the chain. However, once we've - translated a sequence through function-key-map, this will point - to the first event after the translated sequence: we don't ever - want to translate any events twice through function-key-map, or - things could get really screwed up (e.g. if the user created a - translation loop). If this is nil, then the next-read event is - the first that can begin a function key sequence. */ - Lisp_Object first_mungeable_event; - } munge_me[2]; + /* One value for function-key-map, one for key-translation-map: + First event that can begin a possible function key sequence + (to be translated according to function-key-map). Normally + this is the first event in the chain. However, once we've + translated a sequence through function-key-map, this will point + to the first event after the translated sequence: we don't ever + want to translate any events twice through function-key-map, or + things could get really screwed up (e.g. if the user created a + translation loop). If this is nil, then the next-read event is + the first that can begin a function key sequence. */ + Lisp_Object first_mungeable_event[2]; Ibyte *echo_buf; Bytecount echo_buf_length; /* size of echo_buf */