Mercurial > hg > xemacs-beta
annotate src/marker.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 | 04bc9d2f42c7 |
| rev | line source |
|---|---|
| 428 | 1 /* Markers: examining, setting and killing. |
| 2 Copyright (C) 1985, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. | |
| 800 | 3 Copyright (C) 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: FSF 19.30. */ | |
| 23 | |
| 24 /* This file has been Mule-ized. */ | |
| 25 | |
| 26 /* Note that markers are currently kept in an unordered list. | |
| 27 This means that marker operations may be inefficient if | |
| 28 there are a bunch of markers in the buffer. This probably | |
| 29 won't have a significant impact on redisplay (which uses | |
| 30 markers), but if it does, it wouldn't be too hard to change | |
| 31 to an ordered gap array. (Just copy the code from extents.c.) | |
| 32 */ | |
| 33 | |
| 34 #include <config.h> | |
| 35 #include "lisp.h" | |
| 36 | |
| 37 #include "buffer.h" | |
| 38 | |
| 39 static Lisp_Object | |
| 40 mark_marker (Lisp_Object obj) | |
| 41 { | |
| 440 | 42 Lisp_Marker *marker = XMARKER (obj); |
| 428 | 43 Lisp_Object buf; |
| 44 /* DO NOT mark through the marker's chain. | |
| 45 The buffer's markers chain does not preserve markers from gc; | |
| 46 Instead, markers are removed from the chain when they are freed | |
| 47 by gc. | |
| 48 */ | |
| 49 if (!marker->buffer) | |
| 50 return (Qnil); | |
| 51 | |
| 793 | 52 buf = wrap_buffer (marker->buffer); |
| 428 | 53 return (buf); |
| 54 } | |
| 55 | |
| 56 static void | |
| 57 print_marker (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) | |
| 58 { | |
| 440 | 59 Lisp_Marker *marker = XMARKER (obj); |
| 428 | 60 |
| 61 if (print_readably) | |
| 563 | 62 printing_unreadable_object ("#<marker 0x%lx>", (long) marker); |
| 428 | 63 |
| 826 | 64 write_c_string (printcharfun, GETTEXT ("#<marker ")); |
| 428 | 65 if (!marker->buffer) |
| 826 | 66 write_c_string (printcharfun, GETTEXT ("in no buffer")); |
| 428 | 67 else |
| 68 { | |
| 826 | 69 write_fmt_string (printcharfun, "at %ld in ", |
| 70 (long) marker_position (obj)); | |
| 428 | 71 print_internal (marker->buffer->name, printcharfun, 0); |
| 72 } | |
| 826 | 73 if (marker->insertion_type) |
| 74 write_c_string (printcharfun, " insertion-type=t"); | |
| 800 | 75 write_fmt_string (printcharfun, " 0x%lx>", (long) marker); |
| 428 | 76 } |
| 77 | |
| 78 static int | |
| 79 marker_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) | |
| 80 { | |
| 440 | 81 Lisp_Marker *marker1 = XMARKER (obj1); |
| 82 Lisp_Marker *marker2 = XMARKER (obj2); | |
| 428 | 83 |
| 84 return ((marker1->buffer == marker2->buffer) && | |
| 665 | 85 (marker1->membpos == marker2->membpos || |
| 428 | 86 /* All markers pointing nowhere are equal */ |
| 87 !marker1->buffer)); | |
| 88 } | |
| 89 | |
| 90 static unsigned long | |
| 91 marker_hash (Lisp_Object obj, int depth) | |
| 92 { | |
| 93 unsigned long hash = (unsigned long) XMARKER (obj)->buffer; | |
| 94 if (hash) | |
| 665 | 95 hash = HASH2 (hash, XMARKER (obj)->membpos); |
| 428 | 96 return hash; |
| 97 } | |
| 98 | |
| 1204 | 99 static const struct memory_description marker_description[] = { |
| 100 { XD_LISP_OBJECT, offsetof (Lisp_Marker, next), 0, 0, XD_FLAG_NO_KKCC }, | |
| 101 { XD_LISP_OBJECT, offsetof (Lisp_Marker, prev), 0, 0, XD_FLAG_NO_KKCC }, | |
| 440 | 102 { XD_LISP_OBJECT, offsetof (Lisp_Marker, buffer) }, |
| 428 | 103 { XD_END } |
| 104 }; | |
| 105 | |
| 934 | 106 DEFINE_BASIC_LRECORD_IMPLEMENTATION ("marker", marker, |
| 107 1, /*dumpable-flag*/ | |
| 108 mark_marker, print_marker, 0, | |
| 1204 | 109 marker_equal, marker_hash, |
| 110 marker_description, Lisp_Marker); | |
| 428 | 111 |
| 112 /* Operations on markers. */ | |
| 113 | |
| 114 DEFUN ("marker-buffer", Fmarker_buffer, 1, 1, 0, /* | |
| 115 Return the buffer that MARKER points into, or nil if none. | |
| 116 Return nil if MARKER points into a dead buffer or doesn't point anywhere. | |
| 117 */ | |
| 118 (marker)) | |
| 119 { | |
| 120 struct buffer *buf; | |
| 121 CHECK_MARKER (marker); | |
| 122 /* Return marker's buffer only if it is not dead. */ | |
| 123 if ((buf = XMARKER (marker)->buffer) && BUFFER_LIVE_P (buf)) | |
| 124 { | |
| 793 | 125 return wrap_buffer (buf); |
| 428 | 126 } |
| 127 return Qnil; | |
| 128 } | |
| 129 | |
| 130 DEFUN ("marker-position", Fmarker_position, 1, 1, 0, /* | |
| 131 Return the position MARKER points at, as a character number. | |
| 132 Return `nil' if marker doesn't point anywhere. | |
| 133 */ | |
| 134 (marker)) | |
| 135 { | |
| 136 CHECK_MARKER (marker); | |
| 137 return XMARKER (marker)->buffer ? make_int (marker_position (marker)) : Qnil; | |
| 138 } | |
| 139 | |
| 140 #if 0 /* useful debugging function */ | |
| 141 | |
| 142 static void | |
| 143 check_marker_circularities (struct buffer *buf) | |
| 144 { | |
| 440 | 145 Lisp_Marker *tortoise, *hare; |
| 428 | 146 |
| 147 tortoise = BUF_MARKERS (buf); | |
| 148 hare = tortoise; | |
| 149 | |
| 150 if (!tortoise) | |
| 151 return; | |
| 152 | |
| 153 while (1) | |
| 154 { | |
| 155 assert (hare->buffer == buf); | |
| 156 hare = hare->next; | |
| 157 if (!hare) | |
| 158 return; | |
| 159 assert (hare->buffer == buf); | |
| 160 hare = hare->next; | |
| 161 if (!hare) | |
| 162 return; | |
| 163 tortoise = tortoise->next; | |
| 164 assert (tortoise != hare); | |
| 165 } | |
| 166 } | |
| 167 | |
| 168 #endif | |
| 169 | |
| 170 static Lisp_Object | |
| 444 | 171 set_marker_internal (Lisp_Object marker, Lisp_Object position, |
| 172 Lisp_Object buffer, int restricted_p) | |
| 428 | 173 { |
| 665 | 174 Charbpos charno; |
| 428 | 175 struct buffer *b; |
| 440 | 176 Lisp_Marker *m; |
| 428 | 177 int point_p; |
| 178 | |
| 179 CHECK_MARKER (marker); | |
| 180 | |
| 181 point_p = POINT_MARKER_P (marker); | |
| 182 | |
| 183 /* If position is nil or a marker that points nowhere, | |
| 184 make this marker point nowhere. */ | |
| 444 | 185 if (NILP (position) || |
| 186 (MARKERP (position) && !XMARKER (position)->buffer)) | |
| 428 | 187 { |
| 188 if (point_p) | |
| 563 | 189 invalid_operation ("Can't make point-marker point nowhere", |
| 190 marker); | |
| 428 | 191 if (XMARKER (marker)->buffer) |
| 192 unchain_marker (marker); | |
| 193 return marker; | |
| 194 } | |
| 195 | |
| 444 | 196 CHECK_INT_COERCE_MARKER (position); |
| 428 | 197 if (NILP (buffer)) |
| 198 b = current_buffer; | |
| 199 else | |
| 200 { | |
| 201 CHECK_BUFFER (buffer); | |
| 202 b = XBUFFER (buffer); | |
| 203 /* If buffer is dead, set marker to point nowhere. */ | |
| 204 if (!BUFFER_LIVE_P (XBUFFER (buffer))) | |
| 205 { | |
| 206 if (point_p) | |
| 563 | 207 invalid_operation |
| 428 | 208 ("Can't move point-marker in a killed buffer", marker); |
| 209 if (XMARKER (marker)->buffer) | |
| 210 unchain_marker (marker); | |
| 211 return marker; | |
| 212 } | |
| 213 } | |
| 214 | |
| 444 | 215 charno = XINT (position); |
| 428 | 216 m = XMARKER (marker); |
| 217 | |
| 218 if (restricted_p) | |
| 219 { | |
| 220 if (charno < BUF_BEGV (b)) charno = BUF_BEGV (b); | |
| 221 if (charno > BUF_ZV (b)) charno = BUF_ZV (b); | |
| 222 } | |
| 223 else | |
| 224 { | |
| 225 if (charno < BUF_BEG (b)) charno = BUF_BEG (b); | |
| 226 if (charno > BUF_Z (b)) charno = BUF_Z (b); | |
| 227 } | |
| 228 | |
| 229 if (point_p) | |
| 230 { | |
| 231 #ifndef moving_point_by_moving_its_marker_is_a_bug | |
| 232 BUF_SET_PT (b, charno); /* this will move the marker */ | |
| 233 #else /* It's not a feature, so it must be a bug */ | |
| 563 | 234 invalid_operation ("DEBUG: attempt to move point via point-marker", |
| 235 marker); | |
| 428 | 236 #endif |
| 237 } | |
| 238 else | |
| 239 { | |
| 665 | 240 m->membpos = charbpos_to_membpos (b, charno); |
| 428 | 241 } |
| 242 | |
| 243 if (m->buffer != b) | |
| 244 { | |
| 245 if (point_p) | |
| 563 | 246 invalid_operation ("Can't change buffer of point-marker", marker); |
| 428 | 247 if (m->buffer != 0) |
| 248 unchain_marker (marker); | |
| 249 m->buffer = b; | |
| 250 marker_next (m) = BUF_MARKERS (b); | |
| 251 marker_prev (m) = 0; | |
| 252 if (BUF_MARKERS (b)) | |
| 253 marker_prev (BUF_MARKERS (b)) = m; | |
| 254 BUF_MARKERS (b) = m; | |
| 255 } | |
| 256 | |
| 257 return marker; | |
| 258 } | |
| 259 | |
| 260 | |
| 261 DEFUN ("set-marker", Fset_marker, 2, 3, 0, /* | |
| 444 | 262 Move MARKER to position POSITION in BUFFER. |
| 263 POSITION can be a marker, an integer or nil. If POSITION is an | |
| 264 integer, make MARKER point before the POSITIONth character in BUFFER. | |
| 265 If POSITION is nil, makes MARKER point nowhere. Then it no longer | |
| 266 slows down editing in any buffer. If POSITION is less than 1, move | |
| 267 MARKER to the beginning of BUFFER. If POSITION is greater than the | |
| 268 size of BUFFER, move MARKER to the end of BUFFER. | |
| 428 | 269 BUFFER defaults to the current buffer. |
| 444 | 270 If this marker was returned by (point-marker t), then changing its |
| 271 position moves point. You cannot change its buffer or make it point | |
| 272 nowhere. | |
| 273 The return value is MARKER. | |
| 428 | 274 */ |
| 444 | 275 (marker, position, buffer)) |
| 428 | 276 { |
| 444 | 277 return set_marker_internal (marker, position, buffer, 0); |
| 428 | 278 } |
| 279 | |
| 280 | |
| 281 /* This version of Fset_marker won't let the position | |
| 282 be outside the visible part. */ | |
| 283 Lisp_Object | |
| 444 | 284 set_marker_restricted (Lisp_Object marker, Lisp_Object position, |
| 285 Lisp_Object buffer) | |
| 428 | 286 { |
| 444 | 287 return set_marker_internal (marker, position, buffer, 1); |
| 428 | 288 } |
| 289 | |
| 290 | |
| 291 /* This is called during garbage collection, | |
| 292 so we must be careful to ignore and preserve mark bits, | |
| 293 including those in chain fields of markers. */ | |
| 294 | |
| 295 void | |
| 296 unchain_marker (Lisp_Object m) | |
| 297 { | |
| 440 | 298 Lisp_Marker *marker = XMARKER (m); |
| 428 | 299 struct buffer *b = marker->buffer; |
| 300 | |
| 301 if (b == 0) | |
| 302 return; | |
| 303 | |
| 800 | 304 #ifdef ERROR_CHECK_STRUCTURES |
| 428 | 305 assert (BUFFER_LIVE_P (b)); |
| 306 #endif | |
| 307 | |
| 308 if (marker_next (marker)) | |
| 309 marker_prev (marker_next (marker)) = marker_prev (marker); | |
| 310 if (marker_prev (marker)) | |
| 311 marker_next (marker_prev (marker)) = marker_next (marker); | |
| 312 else | |
| 313 BUF_MARKERS (b) = marker_next (marker); | |
| 314 | |
| 800 | 315 #ifdef ERROR_CHECK_STRUCTURES |
| 428 | 316 assert (marker != XMARKER (b->point_marker)); |
| 317 #endif | |
| 318 | |
| 319 marker->buffer = 0; | |
| 320 } | |
| 321 | |
| 665 | 322 Bytebpos |
| 826 | 323 byte_marker_position (Lisp_Object marker) |
| 428 | 324 { |
| 440 | 325 Lisp_Marker *m = XMARKER (marker); |
| 428 | 326 struct buffer *buf = m->buffer; |
| 665 | 327 Bytebpos pos; |
| 428 | 328 |
| 329 if (!buf) | |
| 563 | 330 invalid_argument ("Marker does not point anywhere", Qunbound); |
| 428 | 331 |
| 332 /* FSF claims that marker indices could end up denormalized, i.e. | |
| 333 in the gap. This is way bogus if it ever happens, and means | |
| 334 something fucked up elsewhere. Since I've overhauled all this | |
| 335 shit, I don't think this can happen. In any case, the following | |
| 336 macro has an assert() in it that will catch these denormalized | |
| 337 positions. */ | |
| 665 | 338 pos = membpos_to_bytebpos (buf, m->membpos); |
| 428 | 339 |
| 340 return pos; | |
| 341 } | |
| 342 | |
| 665 | 343 Charbpos |
| 428 | 344 marker_position (Lisp_Object marker) |
| 345 { | |
| 346 struct buffer *buf = XMARKER (marker)->buffer; | |
| 347 | |
| 348 if (!buf) | |
| 563 | 349 invalid_argument ("Marker does not point anywhere", Qunbound); |
| 428 | 350 |
| 826 | 351 return bytebpos_to_charbpos (buf, byte_marker_position (marker)); |
| 428 | 352 } |
| 353 | |
| 354 void | |
| 826 | 355 set_byte_marker_position (Lisp_Object marker, Bytebpos pos) |
| 428 | 356 { |
| 440 | 357 Lisp_Marker *m = XMARKER (marker); |
| 428 | 358 struct buffer *buf = m->buffer; |
| 359 | |
| 360 if (!buf) | |
| 563 | 361 invalid_argument ("Marker does not point anywhere", Qunbound); |
| 428 | 362 |
| 665 | 363 m->membpos = bytebpos_to_membpos (buf, pos); |
| 428 | 364 } |
| 365 | |
| 366 void | |
| 665 | 367 set_marker_position (Lisp_Object marker, Charbpos pos) |
| 428 | 368 { |
| 369 struct buffer *buf = XMARKER (marker)->buffer; | |
| 370 | |
| 371 if (!buf) | |
| 563 | 372 invalid_argument ("Marker does not point anywhere", Qunbound); |
| 428 | 373 |
| 826 | 374 set_byte_marker_position (marker, charbpos_to_bytebpos (buf, pos)); |
| 428 | 375 } |
| 376 | |
| 377 static Lisp_Object | |
| 378 copy_marker_1 (Lisp_Object marker, Lisp_Object type, int noseeum) | |
| 379 { | |
| 380 REGISTER Lisp_Object new; | |
| 381 | |
| 382 while (1) | |
| 383 { | |
| 384 if (INTP (marker) || MARKERP (marker)) | |
| 385 { | |
| 386 if (noseeum) | |
| 387 new = noseeum_make_marker (); | |
| 388 else | |
| 389 new = Fmake_marker (); | |
| 390 Fset_marker (new, marker, | |
| 391 (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil)); | |
| 392 XMARKER (new)->insertion_type = !NILP (type); | |
| 393 return new; | |
| 394 } | |
| 395 else | |
| 396 marker = wrong_type_argument (Qinteger_or_marker_p, marker); | |
| 397 } | |
| 398 | |
| 1204 | 399 RETURN_NOT_REACHED (Qnil); /* not reached */ |
| 428 | 400 } |
| 401 | |
| 402 DEFUN ("copy-marker", Fcopy_marker, 1, 2, 0, /* | |
| 444 | 403 Return a new marker pointing at the same place as MARKER-OR-INTEGER. |
| 404 If MARKER-OR-INTEGER is an integer, return a new marker pointing | |
| 428 | 405 at that position in the current buffer. |
| 444 | 406 Optional argument MARKER-TYPE specifies the insertion type of the new |
| 407 marker; see `marker-insertion-type'. | |
| 428 | 408 */ |
| 444 | 409 (marker_or_integer, marker_type)) |
| 428 | 410 { |
| 444 | 411 return copy_marker_1 (marker_or_integer, marker_type, 0); |
| 428 | 412 } |
| 413 | |
| 414 Lisp_Object | |
| 444 | 415 noseeum_copy_marker (Lisp_Object marker, Lisp_Object marker_type) |
| 428 | 416 { |
| 444 | 417 return copy_marker_1 (marker, marker_type, 1); |
| 428 | 418 } |
| 419 | |
| 420 DEFUN ("marker-insertion-type", Fmarker_insertion_type, 1, 1, 0, /* | |
| 421 Return insertion type of MARKER: t if it stays after inserted text. | |
| 422 nil means the marker stays before text inserted there. | |
| 423 */ | |
| 424 (marker)) | |
| 425 { | |
| 426 CHECK_MARKER (marker); | |
| 427 return XMARKER (marker)->insertion_type ? Qt : Qnil; | |
| 428 } | |
| 429 | |
| 430 DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type, 2, 2, 0, /* | |
| 431 Set the insertion-type of MARKER to TYPE. | |
| 432 If TYPE is t, it means the marker advances when you insert text at it. | |
| 433 If TYPE is nil, it means the marker stays behind when you insert text at it. | |
| 434 */ | |
| 435 (marker, type)) | |
| 436 { | |
| 437 CHECK_MARKER (marker); | |
| 438 | |
| 439 XMARKER (marker)->insertion_type = ! NILP (type); | |
| 440 return type; | |
| 441 } | |
| 442 | |
| 443 /* #### What is the possible use of this? It looks quite useless to | |
| 444 me, because there is no way to find *which* markers are positioned | |
| 445 at POSITION. Additional bogosity bonus: (buffer-has-markers-at | |
| 446 (point)) will always return t because of the `point-marker'. The | |
| 447 same goes for the position of mark. Bletch! | |
| 448 | |
| 449 Someone should discuss this with Stallman, but I don't have the | |
| 450 stomach. In fact, this function sucks so badly that I'm disabling | |
| 451 it by default (although I've debugged it). If you want to use it, | |
| 452 use extents instead. --hniksic */ | |
| 453 #if 0 | |
| 826 | 454 DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, 1, 1, 0, /* |
| 428 | 455 Return t if there are markers pointing at POSITION in the current buffer. |
| 456 */ | |
| 457 (position)) | |
| 458 { | |
| 440 | 459 Lisp_Marker *marker; |
| 665 | 460 Membpos pos; |
| 428 | 461 |
| 665 | 462 /* A small optimization trick: convert POS to membpos now, rather |
| 463 than converting every marker's memory index to charbpos. */ | |
| 464 pos = bytebpos_to_membpos (current_buffer, | |
| 428 | 465 get_buffer_pos_byte (current_buffer, position, |
| 466 GB_COERCE_RANGE)); | |
| 467 | |
| 468 for (marker = BUF_MARKERS (current_buffer); | |
| 469 marker; | |
| 470 marker = marker_next (marker)) | |
| 471 { | |
| 665 | 472 /* We use marker->membpos, so we don't have to go through the |
| 428 | 473 unwieldy operation of creating a Lisp_Object for |
| 474 marker_position() every time around. */ | |
| 665 | 475 if (marker->membpos == pos) |
| 428 | 476 return Qt; |
| 477 } | |
| 478 | |
| 479 return Qnil; | |
| 480 } | |
| 481 #endif /* 0 */ | |
| 482 | |
| 483 #ifdef MEMORY_USAGE_STATS | |
| 484 | |
| 485 int | |
| 486 compute_buffer_marker_usage (struct buffer *b, struct overhead_stats *ovstats) | |
| 487 { | |
| 440 | 488 Lisp_Marker *m; |
| 428 | 489 int total = 0; |
| 490 int overhead; | |
| 491 | |
| 492 for (m = BUF_MARKERS (b); m; m = m->next) | |
| 440 | 493 total += sizeof (Lisp_Marker); |
| 428 | 494 ovstats->was_requested += total; |
| 495 overhead = fixed_type_block_overhead (total); | |
| 496 /* #### claiming this is all malloc overhead is not really right, | |
| 497 but it has to go somewhere. */ | |
| 498 ovstats->malloc_overhead += overhead; | |
| 499 return total + overhead; | |
| 500 } | |
| 501 | |
| 502 #endif /* MEMORY_USAGE_STATS */ | |
| 503 | |
| 504 | |
| 505 void | |
| 506 syms_of_marker (void) | |
| 507 { | |
| 442 | 508 INIT_LRECORD_IMPLEMENTATION (marker); |
| 509 | |
| 428 | 510 DEFSUBR (Fmarker_position); |
| 511 DEFSUBR (Fmarker_buffer); | |
| 512 DEFSUBR (Fset_marker); | |
| 513 DEFSUBR (Fcopy_marker); | |
| 514 DEFSUBR (Fmarker_insertion_type); | |
| 515 DEFSUBR (Fset_marker_insertion_type); | |
| 516 #if 0 /* FSFmacs crock */ | |
| 517 DEFSUBR (Fbuffer_has_markers_at); | |
| 518 #endif | |
| 519 } | |
| 520 | |
| 521 void | |
| 522 init_buffer_markers (struct buffer *b) | |
| 523 { | |
| 793 | 524 Lisp_Object buf = wrap_buffer (b); |
| 428 | 525 |
| 526 b->mark = Fmake_marker (); | |
| 527 BUF_MARKERS (b) = 0; | |
| 528 b->point_marker = Fmake_marker (); | |
| 529 Fset_marker (b->point_marker, | |
| 530 /* For indirect buffers, point is already set. */ | |
| 531 b->base_buffer ? make_int (BUF_PT (b)) : make_int (1), | |
| 532 buf); | |
| 533 } | |
| 534 | |
| 535 void | |
| 536 uninit_buffer_markers (struct buffer *b) | |
| 537 { | |
| 538 /* Unchain all markers of this buffer | |
| 539 and leave them pointing nowhere. */ | |
| 440 | 540 REGISTER Lisp_Marker *m, *next; |
| 428 | 541 for (m = BUF_MARKERS (b); m; m = next) |
| 542 { | |
| 543 m->buffer = 0; | |
| 544 next = marker_next (m); | |
| 545 marker_next (m) = 0; | |
| 546 marker_prev (m) = 0; | |
| 547 } | |
| 548 BUF_MARKERS (b) = 0; | |
| 549 } |