Mercurial > hg > xemacs-beta
comparison src/glyphs.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 | c925bacdda60 |
children | 9d77c73d4103 |
comparison
equal
deleted
inserted
replaced
1203:5f2f8dcbfb3e | 1204:e22b0213b713 |
---|---|
404 | 404 |
405 /* Oh well. */ | 405 /* Oh well. */ |
406 invalid_argument ("Unable to interpret glyph instantiator", | 406 invalid_argument ("Unable to interpret glyph instantiator", |
407 data); | 407 data); |
408 | 408 |
409 RETURN_NOT_REACHED (Qnil) | 409 RETURN_NOT_REACHED (Qnil); |
410 } | 410 } |
411 | 411 |
412 Lisp_Object | 412 Lisp_Object |
413 find_keyword_in_vector_or_given (Lisp_Object vector, Lisp_Object keyword, | 413 find_keyword_in_vector_or_given (Lisp_Object vector, Lisp_Object keyword, |
414 Lisp_Object default_) | 414 Lisp_Object default_) |
832 * Image-Instance Object * | 832 * Image-Instance Object * |
833 ****************************************************************************/ | 833 ****************************************************************************/ |
834 | 834 |
835 Lisp_Object Qimage_instancep; | 835 Lisp_Object Qimage_instancep; |
836 | 836 |
837 /* %%#### KKCC: Don't yet handle the equivalent of setting the device field | |
838 of image instances w/dead devices to nil. */ | |
839 | |
840 static const struct memory_description text_image_instance_description_1 [] = { | |
841 { XD_LISP_OBJECT, offsetof (struct text_image_instance, string) }, | |
842 { XD_END } | |
843 }; | |
844 | |
845 static const struct sized_memory_description text_image_instance_description = { | |
846 sizeof (struct text_image_instance), text_image_instance_description_1 | |
847 }; | |
848 | |
849 static const struct memory_description pixmap_image_instance_description_1 [] = { | |
850 { XD_LISP_OBJECT, offsetof (struct pixmap_image_instance, hotspot_x) }, | |
851 { XD_LISP_OBJECT, offsetof (struct pixmap_image_instance, hotspot_x) }, | |
852 { XD_LISP_OBJECT, offsetof (struct pixmap_image_instance, filename) }, | |
853 { XD_LISP_OBJECT, offsetof (struct pixmap_image_instance, mask_filename) }, | |
854 { XD_LISP_OBJECT, offsetof (struct pixmap_image_instance, fg) }, | |
855 { XD_LISP_OBJECT, offsetof (struct pixmap_image_instance, bg) }, | |
856 { XD_LISP_OBJECT, offsetof (struct pixmap_image_instance, auxdata) }, | |
857 { XD_END } | |
858 }; | |
859 | |
860 static const struct sized_memory_description pixmap_image_instance_description = { | |
861 sizeof (struct pixmap_image_instance), pixmap_image_instance_description_1 | |
862 }; | |
863 | |
864 static const struct memory_description subwindow_image_instance_description_1 [] = { | |
865 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, face) }, | |
866 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, type) }, | |
867 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, props) }, | |
868 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, items) }, | |
869 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, pending_items) }, | |
870 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, children) }, | |
871 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, width) }, | |
872 { XD_LISP_OBJECT, offsetof (struct subwindow_image_instance, height) }, | |
873 { XD_END } | |
874 }; | |
875 | |
876 static const struct sized_memory_description subwindow_image_instance_description = { | |
877 sizeof (struct subwindow_image_instance), subwindow_image_instance_description_1 | |
878 }; | |
879 | |
880 static const struct memory_description image_instance_data_description_1 [] = { | |
881 { XD_STRUCT_ARRAY, IMAGE_TEXT, | |
882 1, &text_image_instance_description }, | |
883 { XD_STRUCT_ARRAY, IMAGE_MONO_PIXMAP, | |
884 1, &pixmap_image_instance_description }, | |
885 { XD_STRUCT_ARRAY, IMAGE_COLOR_PIXMAP, | |
886 1, &pixmap_image_instance_description }, | |
887 { XD_STRUCT_ARRAY, IMAGE_WIDGET, | |
888 1, &subwindow_image_instance_description }, | |
889 { XD_END } | |
890 }; | |
891 | |
892 static const struct sized_memory_description image_instance_data_description = { | |
893 0, image_instance_data_description_1 | |
894 }; | |
895 | |
896 static const struct memory_description image_instance_description[] = { | |
897 { XD_INT, offsetof (struct Lisp_Image_Instance, type) }, | |
898 { XD_LISP_OBJECT, offsetof (Lisp_Image_Instance, domain) }, | |
899 { XD_LISP_OBJECT, offsetof (Lisp_Image_Instance, device) }, | |
900 { XD_LISP_OBJECT, offsetof (Lisp_Image_Instance, name) }, | |
901 { XD_LISP_OBJECT, offsetof (Lisp_Image_Instance, parent) }, | |
902 { XD_LISP_OBJECT, offsetof (Lisp_Image_Instance, instantiator) }, | |
903 { XD_UNION, offsetof (struct Lisp_Image_Instance, u), | |
904 XD_INDIRECT (0, 0), &image_instance_data_description }, | |
905 { XD_END } | |
906 }; | |
907 | |
837 static Lisp_Object | 908 static Lisp_Object |
838 mark_image_instance (Lisp_Object obj) | 909 mark_image_instance (Lisp_Object obj) |
839 { | 910 { |
840 Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj); | 911 Lisp_Image_Instance *i = XIMAGE_INSTANCE (obj); |
841 | 912 |
847 ERROR_CHECK_IMAGE_INSTANCE (obj); | 918 ERROR_CHECK_IMAGE_INSTANCE (obj); |
848 #endif | 919 #endif |
849 | 920 |
850 mark_object (i->name); | 921 mark_object (i->name); |
851 mark_object (i->instantiator); | 922 mark_object (i->instantiator); |
852 /* Is this legal in marking? We may get in the situation where the | 923 /* #### Is this legal in marking? We may get in the situation where the |
853 domain has been deleted - making the instance unusable. It seems | 924 domain has been deleted - making the instance unusable. It seems |
854 better to remove the domain so that it can be finalized. */ | 925 better to remove the domain so that it can be finalized. */ |
855 if (!DOMAIN_LIVE_P (i->domain)) | 926 if (!DOMAIN_LIVE_P (i->domain)) |
856 i->domain = Qnil; | 927 i->domain = Qnil; |
857 else | 928 else |
1227 (XDEVICE (image_instance_device (obj)), | 1298 (XDEVICE (image_instance_device (obj)), |
1228 image_instance_hash, (i, depth), | 1299 image_instance_hash, (i, depth), |
1229 0)); | 1300 0)); |
1230 } | 1301 } |
1231 | 1302 |
1232 #ifdef USE_KKCC | |
1233 DEFINE_LRECORD_IMPLEMENTATION ("image-instance", image_instance, | 1303 DEFINE_LRECORD_IMPLEMENTATION ("image-instance", image_instance, |
1234 0, /*dumpable-flag*/ | 1304 0, /*dumpable-flag*/ |
1235 mark_image_instance, print_image_instance, | 1305 mark_image_instance, print_image_instance, |
1236 finalize_image_instance, image_instance_equal, | 1306 finalize_image_instance, image_instance_equal, |
1237 image_instance_hash, 0, | 1307 image_instance_hash, |
1308 image_instance_description, | |
1238 Lisp_Image_Instance); | 1309 Lisp_Image_Instance); |
1239 #else /* not USE_KKCC */ | |
1240 DEFINE_LRECORD_IMPLEMENTATION ("image-instance", image_instance, | |
1241 mark_image_instance, print_image_instance, | |
1242 finalize_image_instance, image_instance_equal, | |
1243 image_instance_hash, 0, | |
1244 Lisp_Image_Instance); | |
1245 #endif /* not USE_KKCC */ | |
1246 | 1310 |
1247 static Lisp_Object | 1311 static Lisp_Object |
1248 allocate_image_instance (Lisp_Object governing_domain, Lisp_Object parent, | 1312 allocate_image_instance (Lisp_Object governing_domain, Lisp_Object parent, |
1249 Lisp_Object instantiator) | 1313 Lisp_Object instantiator) |
1250 { | 1314 { |
1251 Lisp_Image_Instance *lp = | 1315 Lisp_Image_Instance *lp = |
1252 alloc_lcrecord_type (Lisp_Image_Instance, &lrecord_image_instance); | 1316 alloc_lcrecord_type (Lisp_Image_Instance, &lrecord_image_instance); |
1253 Lisp_Object val; | 1317 Lisp_Object val; |
1254 | 1318 |
1255 zero_lcrecord (lp); | |
1256 /* It's not possible to simply keep a record of the domain in which | 1319 /* It's not possible to simply keep a record of the domain in which |
1257 the instance was instantiated. This is because caching may mean | 1320 the instance was instantiated. This is because caching may mean |
1258 that the domain becomes invalid but the instance remains | 1321 that the domain becomes invalid but the instance remains |
1259 valid. However, the only truly relevant domain is the domain in | 1322 valid. However, the only truly relevant domain is the domain in |
1260 which the instance is cached since this is the one that will be | 1323 which the instance is cached since this is the one that will be |
1265 domain device in order to finalize the image instance | 1328 domain device in order to finalize the image instance |
1266 properly. We therefore record the device also. */ | 1329 properly. We therefore record the device also. */ |
1267 lp->device = DOMAIN_DEVICE (governing_domain); | 1330 lp->device = DOMAIN_DEVICE (governing_domain); |
1268 lp->type = IMAGE_NOTHING; | 1331 lp->type = IMAGE_NOTHING; |
1269 lp->name = Qnil; | 1332 lp->name = Qnil; |
1270 lp->x_offset = 0; | |
1271 lp->y_offset = 0; | |
1272 lp->width = IMAGE_UNSPECIFIED_GEOMETRY; | 1333 lp->width = IMAGE_UNSPECIFIED_GEOMETRY; |
1273 lp->margin_width = 0; | |
1274 lp->height = IMAGE_UNSPECIFIED_GEOMETRY; | 1334 lp->height = IMAGE_UNSPECIFIED_GEOMETRY; |
1275 lp->parent = parent; | 1335 lp->parent = parent; |
1276 lp->instantiator = instantiator; | 1336 lp->instantiator = instantiator; |
1277 /* So that layouts get done. */ | 1337 /* So that layouts get done. */ |
1278 lp->layout_changed = 1; | 1338 lp->layout_changed = 1; |
1279 lp->initialized = 0; | |
1280 | 1339 |
1281 val = wrap_image_instance (lp); | 1340 val = wrap_image_instance (lp); |
1282 MARK_GLYPHS_CHANGED; | 1341 MARK_GLYPHS_CHANGED; |
1283 | 1342 |
1284 return val; | 1343 return val; |
3054 | 3113 |
3055 /**************************************************************************** | 3114 /**************************************************************************** |
3056 * Image Specifier Object * | 3115 * Image Specifier Object * |
3057 ****************************************************************************/ | 3116 ****************************************************************************/ |
3058 | 3117 |
3059 DEFINE_SPECIFIER_TYPE (image); | 3118 static const struct memory_description image_specifier_description[] = { |
3119 { XD_LISP_OBJECT, offsetof (struct image_specifier, attachee) }, | |
3120 { XD_LISP_OBJECT, offsetof (struct image_specifier, attachee_property) }, | |
3121 { XD_END } | |
3122 }; | |
3123 | |
3124 DEFINE_SPECIFIER_TYPE_WITH_DATA (image); | |
3060 | 3125 |
3061 static void | 3126 static void |
3062 image_create (Lisp_Object obj) | 3127 image_create (Lisp_Object obj) |
3063 { | 3128 { |
3064 Lisp_Specifier *image = XIMAGE_SPECIFIER (obj); | 3129 Lisp_Specifier *image = XIMAGE_SPECIFIER (obj); |
3681 result = cons3 (Qimage, glyph->image, result); | 3746 result = cons3 (Qimage, glyph->image, result); |
3682 | 3747 |
3683 return result; | 3748 return result; |
3684 } | 3749 } |
3685 | 3750 |
3686 static const struct lrecord_description glyph_description[] = { | 3751 static const struct memory_description glyph_description[] = { |
3687 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, image) }, | 3752 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, image) }, |
3688 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, contrib_p) }, | 3753 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, contrib_p) }, |
3689 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, baseline) }, | 3754 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, baseline) }, |
3690 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, face) }, | 3755 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, face) }, |
3691 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, plist) }, | 3756 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, plist) }, |
3692 { XD_END } | 3757 { XD_END } |
3693 }; | 3758 }; |
3694 | 3759 |
3695 #ifdef USE_KKCC | |
3696 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("glyph", glyph, | 3760 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("glyph", glyph, |
3697 1, /*dumpable-flag*/ | 3761 1, /*dumpable-flag*/ |
3698 mark_glyph, print_glyph, 0, | 3762 mark_glyph, print_glyph, 0, |
3699 glyph_equal, glyph_hash, glyph_description, | 3763 glyph_equal, glyph_hash, |
3764 glyph_description, | |
3700 glyph_getprop, glyph_putprop, | 3765 glyph_getprop, glyph_putprop, |
3701 glyph_remprop, glyph_plist, | 3766 glyph_remprop, glyph_plist, |
3702 Lisp_Glyph); | 3767 Lisp_Glyph); |
3703 #else /* not USE_KKCC */ | |
3704 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("glyph", glyph, | |
3705 mark_glyph, print_glyph, 0, | |
3706 glyph_equal, glyph_hash, glyph_description, | |
3707 glyph_getprop, glyph_putprop, | |
3708 glyph_remprop, glyph_plist, | |
3709 Lisp_Glyph); | |
3710 #endif /* not USE_KKCC */ | |
3711 | 3768 |
3712 Lisp_Object | 3769 Lisp_Object |
3713 allocate_glyph (enum glyph_type type, | 3770 allocate_glyph (enum glyph_type type, |
3714 void (*after_change) (Lisp_Object glyph, Lisp_Object property, | 3771 void (*after_change) (Lisp_Object glyph, Lisp_Object property, |
3715 Lisp_Object locale)) | 3772 Lisp_Object locale)) |
4672 Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow); | 4729 Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow); |
4673 struct frame* f; | 4730 struct frame* f; |
4674 | 4731 |
4675 ERROR_CHECK_IMAGE_INSTANCE (subwindow); | 4732 ERROR_CHECK_IMAGE_INSTANCE (subwindow); |
4676 | 4733 |
4677 if (!image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii)) | 4734 if (!(image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii)) |
4678 & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK) | 4735 & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK)) |
4679 || | 4736 || !IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii)) |
4680 !IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii)) | |
4681 return; | 4737 return; |
4682 | 4738 |
4683 #ifdef DEBUG_WIDGETS | 4739 #ifdef DEBUG_WIDGETS |
4684 stderr_out ("unmapping subwindow %p\n", IMAGE_INSTANCE_SUBWINDOW_ID (ii)); | 4740 stderr_out ("unmapping subwindow %p\n", IMAGE_INSTANCE_SUBWINDOW_ID (ii)); |
4685 #endif | 4741 #endif |
4704 Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow); | 4760 Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow); |
4705 struct frame* f; | 4761 struct frame* f; |
4706 | 4762 |
4707 ERROR_CHECK_IMAGE_INSTANCE (subwindow); | 4763 ERROR_CHECK_IMAGE_INSTANCE (subwindow); |
4708 | 4764 |
4709 if (!image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii)) | 4765 if (!(image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii)) |
4710 & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK)) | 4766 & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK))) |
4711 return; | 4767 return; |
4712 | 4768 |
4713 #ifdef DEBUG_WIDGETS | 4769 #ifdef DEBUG_WIDGETS |
4714 stderr_out ("mapping subwindow %p, %dx%d@%d+%d\n", | 4770 stderr_out ("mapping subwindow %p, %dx%d@%d+%d\n", |
4715 IMAGE_INSTANCE_SUBWINDOW_ID (ii), | 4771 IMAGE_INSTANCE_SUBWINDOW_ID (ii), |
5117 DEFSUBR (Fset_instantiator_property); | 5173 DEFSUBR (Fset_instantiator_property); |
5118 | 5174 |
5119 /* Qbuffer defined in general.c. */ | 5175 /* Qbuffer defined in general.c. */ |
5120 /* Qpointer defined above */ | 5176 /* Qpointer defined above */ |
5121 | 5177 |
5122 /* Unfortunately, timeout handlers must be lisp functions. This is | 5178 /* Unfortunately, timeout handlers must be lisp functions. This is |
5123 for animated glyphs. */ | 5179 for animated glyphs. */ |
5124 DEFSYMBOL (Qglyph_animated_timeout_handler); | 5180 DEFSYMBOL (Qglyph_animated_timeout_handler); |
5125 DEFSUBR (Fglyph_animated_timeout_handler); | 5181 DEFSUBR (Fglyph_animated_timeout_handler); |
5126 | 5182 |
5127 /* Errors */ | 5183 /* Errors */ |
5128 DEFERROR_STANDARD (Qimage_conversion_error, Qconversion_error); | 5184 DEFERROR_STANDARD (Qimage_conversion_error, Qconversion_error); |
5129 } | 5185 } |
5130 | |
5131 static const struct lrecord_description image_specifier_description[] = { | |
5132 { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct image_specifier, attachee) }, | |
5133 { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct image_specifier, attachee_property) }, | |
5134 { XD_END } | |
5135 }; | |
5136 | 5186 |
5137 void | 5187 void |
5138 specifier_type_create_image (void) | 5188 specifier_type_create_image (void) |
5139 { | 5189 { |
5140 /* image specifiers */ | 5190 /* image specifiers */ |
5155 { | 5205 { |
5156 REINITIALIZE_SPECIFIER_TYPE (image); | 5206 REINITIALIZE_SPECIFIER_TYPE (image); |
5157 } | 5207 } |
5158 | 5208 |
5159 | 5209 |
5160 static const struct lrecord_description iike_description_1[] = { | 5210 static const struct memory_description iike_description_1[] = { |
5161 { XD_LISP_OBJECT, offsetof (ii_keyword_entry, keyword) }, | 5211 { XD_LISP_OBJECT, offsetof (ii_keyword_entry, keyword) }, |
5162 { XD_END } | 5212 { XD_END } |
5163 }; | 5213 }; |
5164 | 5214 |
5165 static const struct struct_description iike_description = { | 5215 static const struct sized_memory_description iike_description = { |
5166 sizeof (ii_keyword_entry), | 5216 sizeof (ii_keyword_entry), |
5167 iike_description_1 | 5217 iike_description_1 |
5168 }; | 5218 }; |
5169 | 5219 |
5170 static const struct lrecord_description iiked_description_1[] = { | 5220 static const struct memory_description iiked_description_1[] = { |
5171 XD_DYNARR_DESC (ii_keyword_entry_dynarr, &iike_description), | 5221 XD_DYNARR_DESC (ii_keyword_entry_dynarr, &iike_description), |
5172 { XD_END } | 5222 { XD_END } |
5173 }; | 5223 }; |
5174 | 5224 |
5175 static const struct struct_description iiked_description = { | 5225 static const struct sized_memory_description iiked_description = { |
5176 sizeof (ii_keyword_entry_dynarr), | 5226 sizeof (ii_keyword_entry_dynarr), |
5177 iiked_description_1 | 5227 iiked_description_1 |
5178 }; | 5228 }; |
5179 | 5229 |
5180 static const struct lrecord_description iife_description_1[] = { | 5230 static const struct memory_description iife_description_1[] = { |
5181 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, symbol) }, | 5231 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, symbol) }, |
5182 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, device) }, | 5232 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, device) }, |
5183 { XD_STRUCT_PTR, offsetof (image_instantiator_format_entry, meths), 1, &iim_description }, | 5233 { XD_STRUCT_PTR, offsetof (image_instantiator_format_entry, meths), 1, &iim_description }, |
5184 { XD_END } | 5234 { XD_END } |
5185 }; | 5235 }; |
5186 | 5236 |
5187 static const struct struct_description iife_description = { | 5237 static const struct sized_memory_description iife_description = { |
5188 sizeof (image_instantiator_format_entry), | 5238 sizeof (image_instantiator_format_entry), |
5189 iife_description_1 | 5239 iife_description_1 |
5190 }; | 5240 }; |
5191 | 5241 |
5192 static const struct lrecord_description iifed_description_1[] = { | 5242 static const struct memory_description iifed_description_1[] = { |
5193 XD_DYNARR_DESC (image_instantiator_format_entry_dynarr, &iife_description), | 5243 XD_DYNARR_DESC (image_instantiator_format_entry_dynarr, &iife_description), |
5194 { XD_END } | 5244 { XD_END } |
5195 }; | 5245 }; |
5196 | 5246 |
5197 static const struct struct_description iifed_description = { | 5247 static const struct sized_memory_description iifed_description = { |
5198 sizeof (image_instantiator_format_entry_dynarr), | 5248 sizeof (image_instantiator_format_entry_dynarr), |
5199 iifed_description_1 | 5249 iifed_description_1 |
5200 }; | 5250 }; |
5201 | 5251 |
5202 static const struct lrecord_description iim_description_1[] = { | 5252 static const struct memory_description iim_description_1[] = { |
5203 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, symbol) }, | 5253 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, symbol) }, |
5204 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, device) }, | 5254 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, device) }, |
5205 { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, keywords), 1, &iiked_description }, | 5255 { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, keywords), 1, &iiked_description }, |
5206 { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, consoles), 1, &cted_description }, | 5256 { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, consoles), 1, &cted_description }, |
5207 { XD_END } | 5257 { XD_END } |
5208 }; | 5258 }; |
5209 | 5259 |
5210 const struct struct_description iim_description = { | 5260 const struct sized_memory_description iim_description = { |
5211 sizeof (struct image_instantiator_methods), | 5261 sizeof (struct image_instantiator_methods), |
5212 iim_description_1 | 5262 iim_description_1 |
5213 }; | 5263 }; |
5214 | 5264 |
5215 void | 5265 void |