Mercurial > hg > xemacs-beta
annotate src/extents.h @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* 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 (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Mar 2010 04:08:17 -0600 |
| parents | e0db3c197671 |
| children | 1fae11d56ad2 |
| rev | line source |
|---|---|
| 428 | 1 /* Copyright (c) 1994, 1995 Free Software Foundation. |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
2 Copyright (c) 1995, 1996, 2002, 2010 Ben Wing. |
| 428 | 3 |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 440 | 23 #ifndef INCLUDED_extents_h_ |
| 24 #define INCLUDED_extents_h_ | |
| 428 | 25 |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
26 DECLARE_LISP_OBJECT (extent, struct extent); |
| 428 | 27 #define XEXTENT(x) XRECORD (x, extent, struct extent) |
| 617 | 28 #define wrap_extent(p) wrap_record (p, extent) |
| 428 | 29 #define EXTENTP(x) RECORDP (x, extent) |
| 30 #define CHECK_EXTENT(x) CHECK_RECORD (x, extent) | |
| 31 #define CONCHECK_EXTENT(x) CONCHECK_RECORD (x, extent) | |
| 32 | |
| 872 | 33 struct extent_auxiliary; |
| 428 | 34 |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
35 DECLARE_LISP_OBJECT (extent_auxiliary, struct extent_auxiliary); |
| 428 | 36 #define XEXTENT_AUXILIARY(x) \ |
| 37 XRECORD (x, extent_auxiliary, struct extent_auxiliary) | |
| 617 | 38 #define wrap_extent_auxiliary(p) wrap_record (p, extent_auxiliary) |
| 428 | 39 #define EXTENT_AUXILIARYP(x) RECORDP (x, extent_auxiliary) |
| 40 #define CHECK_EXTENT_AUXILIARY(x) CHECK_RECORD (x, extent_auxiliary) | |
| 41 #define CONCHECK_EXTENT_AUXILIARY(x) CONCHECK_RECORD (x, extent_auxiliary) | |
| 42 | |
| 872 | 43 struct extent_info; |
| 428 | 44 |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
45 DECLARE_LISP_OBJECT (extent_info, struct extent_info); |
| 428 | 46 #define XEXTENT_INFO(x) XRECORD (x, extent_info, struct extent_info) |
| 617 | 47 #define wrap_extent_info(p) wrap_record (p, extent_info) |
| 428 | 48 #define EXTENT_INFOP(x) RECORDP (x, extent_info) |
| 49 #define CHECK_EXTENT_INFO(x) CHECK_RECORD (x, extent_info) | |
| 50 #define CONCHECK_EXTENT_INFO(x) CONCHECK_RECORD (x, extent_info) | |
| 51 | |
| 3092 | 52 #ifdef NEW_GC |
| 53 struct gap_array_marker; | |
| 54 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
55 DECLARE_LISP_OBJECT (gap_array_marker, struct gap_array_marker); |
| 3092 | 56 #define XGAP_ARRAY_MARKER(x) \ |
| 57 XRECORD (x, gap_array_marker, struct gap_array_marker) | |
| 58 #define wrap_gap_array_marker(p) wrap_record (p, gap_array_marker) | |
| 59 #define GAP_ARRAY_MARKERP(x) RECORDP (x, gap_array_marker) | |
| 60 #define CHECK_GAP_ARRAY_MARKER(x) CHECK_RECORD (x, gap_array_marker) | |
| 61 #define CONCHECK_GAP_ARRAY_MARKER(x) CONCHECK_RECORD (x, gap_array_marker) | |
| 62 | |
| 63 struct gap_array; | |
| 64 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
65 DECLARE_LISP_OBJECT (gap_array, struct gap_array); |
| 3092 | 66 #define XGAP_ARRAY(x) XRECORD (x, gap_array, struct gap_array) |
| 67 #define wrap_gap_array(p) wrap_record (p, gap_array) | |
| 68 #define GAP_ARRAYP(x) RECORDP (x, gap_array) | |
| 69 #define CHECK_GAP_ARRAY(x) CHECK_RECORD (x, gap_array) | |
| 70 #define CONCHECK_GAP_ARRAY(x) CONCHECK_RECORD (x, gap_array) | |
| 71 | |
| 72 struct extent_list_marker; | |
| 73 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
74 DECLARE_LISP_OBJECT (extent_list_marker, struct extent_list_marker); |
| 3092 | 75 #define XEXTENT_LIST_MARKER(x) \ |
| 76 XRECORD (x, extent_list_marker, struct extent_list_marker) | |
| 77 #define wrap_extent_list_marker(p) wrap_record (p, extent_list_marker) | |
| 78 #define EXTENT_LIST_MARKERP(x) RECORDP (x, extent_list_marker) | |
| 79 #define CHECK_EXTENT_LIST_MARKER(x) CHECK_RECORD (x, extent_list_marker) | |
| 80 #define CONCHECK_EXTENT_LIST_MARKER(x) CONCHECK_RECORD (x, extent_list_marker) | |
| 81 | |
| 82 struct extent_list; | |
| 83 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
84 DECLARE_LISP_OBJECT (extent_list, struct extent_list); |
| 3092 | 85 #define XEXTENT_LIST(x) XRECORD (x, extent_list, struct extent_list) |
| 86 #define wrap_extent_list(p) wrap_record (p, extent_list) | |
| 87 #define EXTENT_LISTP(x) RECORDP (x, extent_list) | |
| 88 #define CHECK_EXTENT_LIST(x) CHECK_RECORD (x, extent_list) | |
| 89 #define CONCHECK_EXTENT_LIST(x) CONCHECK_RECORD (x, extent_list) | |
| 90 | |
| 91 struct stack_of_extents; | |
| 92 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4690
diff
changeset
|
93 DECLARE_LISP_OBJECT (stack_of_extents, struct stack_of_extents); |
| 3092 | 94 #define XSTACK_OF_EXTENTS(x) \ |
| 95 XRECORD (x, stack_of_extents, struct stack_of_extents) | |
| 96 #define wrap_stack_of_extents(p) wrap_record (p, stack_of_extents) | |
| 97 #define STACK_OF_EXTENTSP(x) RECORDP (x, stack_of_extents) | |
| 98 #define CHECK_STACK_OF_EXTENTS(x) CHECK_RECORD (x, stack_of_extents) | |
| 99 #define CONCHECK_STACK_OF_EXTENTS(x) CONCHECK_RECORD (x, stack_of_extents) | |
| 100 #endif /* NEW_GC */ | |
| 101 | |
| 872 | 102 /* the layouts for glyphs (extent->flags.glyph_layout). Must fit in 2 bits. */ |
| 103 typedef enum glyph_layout | |
| 826 | 104 { |
| 872 | 105 GL_TEXT, |
| 106 GL_OUTSIDE_MARGIN, | |
| 107 GL_INSIDE_MARGIN, | |
| 108 GL_WHITESPACE | |
| 109 } glyph_layout; | |
| 428 | 110 |
| 872 | 111 struct extent; |
| 428 | 112 |
| 872 | 113 void set_extent_endpoints (EXTENT extent, Bytexpos s, Bytexpos e, |
| 114 Lisp_Object object); | |
| 428 | 115 |
| 872 | 116 |
| 117 void flush_cached_extent_info (Lisp_Object extent_info); | |
| 647 | 118 |
| 826 | 119 void set_extent_glyph (EXTENT extent, Lisp_Object glyph, int endp, |
| 120 glyph_layout layout); | |
| 121 | |
| 428 | 122 |
| 123 /* flags for map_extents() and friends */ | |
| 124 #define ME_END_CLOSED (1 << 0) | |
| 125 #define ME_START_OPEN (1 << 1) | |
| 126 #define ME_ALL_EXTENTS_CLOSED (1 << 2) | |
| 127 #define ME_ALL_EXTENTS_OPEN (2 << 2) | |
| 128 #define ME_ALL_EXTENTS_CLOSED_OPEN (3 << 2) | |
| 129 #define ME_ALL_EXTENTS_OPEN_CLOSED (4 << 2) | |
| 130 #define ME_ALL_EXTENTS_MASK (7 << 2) | |
| 131 #define ME_START_IN_REGION (1 << 5) | |
| 132 #define ME_END_IN_REGION (2 << 5) | |
| 133 #define ME_START_AND_END_IN_REGION (3 << 5) | |
| 134 #define ME_START_OR_END_IN_REGION (4 << 5) | |
| 135 #define ME_IN_REGION_MASK (7 << 5) | |
| 136 #define ME_NEGATE_IN_REGION (1 << 8) | |
| 137 /* the following flags are internal-only */ | |
| 138 #define ME_INCLUDE_INTERNAL (1 << 9) | |
| 139 #define ME_MIGHT_THROW (1 << 10) | |
| 140 #define ME_MIGHT_MODIFY_TEXT (1 << 11) | |
| 141 #define ME_MIGHT_MODIFY_EXTENTS (1 << 12) | |
| 142 #define ME_MIGHT_MOVE_SOE (1 << 13) | |
| 143 #define ME_MIGHT_CALL_ELISP (ME_MIGHT_THROW | ME_MIGHT_MODIFY_TEXT | \ | |
| 144 ME_MIGHT_MODIFY_EXTENTS | ME_MIGHT_MOVE_SOE) | |
| 145 | |
| 146 | |
| 147 extern int inside_undo; | |
| 442 | 148 extern int in_modeline_generation; |
| 428 | 149 |
|
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
150 extern Fixnum mouse_highlight_priority; |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
151 |
| 872 | 152 EXFUN (Fextent_at, 5); |
| 153 EXFUN (Fextent_property, 3); | |
| 154 EXFUN (Fput_text_property, 5); | |
| 155 | |
| 156 EXFUN (Fdetach_extent, 1); | |
| 157 EXFUN (Fextent_end_position, 1); | |
| 158 EXFUN (Fextent_object, 1); | |
| 159 EXFUN (Fextent_properties, 1); | |
| 160 EXFUN (Fextent_start_position, 1); | |
| 161 EXFUN (Fget_char_property, 4); | |
| 162 EXFUN (Fmake_extent, 3); | |
| 163 EXFUN (Fnext_extent_change, 2); | |
| 164 EXFUN (Fprevious_extent_change, 2); | |
| 2506 | 165 EXFUN (Fprevious_single_char_property_change, 4); |
| 872 | 166 EXFUN (Fset_extent_endpoints, 4); |
| 167 EXFUN (Fset_extent_parent, 2); | |
| 168 EXFUN (Fset_extent_property, 3); | |
|
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
169 EXFUN (Fset_extent_priority, 2); |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
170 EXFUN (Fset_extent_face, 2); |
|
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3092
diff
changeset
|
171 EXFUN (Fmap_extents, 8); |
| 872 | 172 |
| 173 enum extent_at_flag | |
| 174 { | |
| 175 EXTENT_AT_DEFAULT = 0, | |
| 176 EXTENT_AT_AFTER = 0, | |
| 177 EXTENT_AT_BEFORE, | |
| 178 EXTENT_AT_AT | |
| 179 }; | |
| 180 | |
| 181 Bytexpos extent_endpoint_byte (EXTENT extent, int endp); | |
| 182 Charxpos extent_endpoint_char (EXTENT extent, int endp); | |
| 2506 | 183 Bytexpos next_previous_single_property_change (Bytexpos pos, Lisp_Object prop, |
| 184 Lisp_Object object, | |
| 185 Bytexpos limit, | |
| 186 Boolint next, | |
| 187 Boolint text_props_only); | |
| 872 | 188 Lisp_Object get_char_property (Bytexpos position, Lisp_Object prop, |
| 189 Lisp_Object object, enum extent_at_flag fl, | |
| 190 int text_props_only); | |
| 191 void adjust_extents (Lisp_Object object, Memxpos from, | |
| 192 Memxpos to, int amount); | |
| 193 void adjust_extents_for_deletion (Lisp_Object object, Bytexpos from, | |
| 194 Bytexpos to, int gapsize, | |
| 195 int numdel, int movegapsize); | |
| 196 void verify_extent_modification (Lisp_Object object, Bytexpos from, | |
| 197 Bytexpos to, | |
| 198 Lisp_Object inhibit_read_only_value); | |
| 199 void process_extents_for_insertion (Lisp_Object object, | |
| 200 Bytexpos opoint, Bytecount length); | |
| 201 void process_extents_for_deletion (Lisp_Object object, Bytexpos from, | |
| 202 Bytexpos to, int destroy_them); | |
| 203 /* Note the following function is in Charbpos's */ | |
| 204 void report_extent_modification (Lisp_Object buffer, Charbpos start, | |
| 205 Charbpos end, int afterp); | |
| 206 void add_string_extents (Lisp_Object string, struct buffer *buf, | |
| 207 Bytexpos opoint, Bytecount length); | |
| 208 void splice_in_string_extents (Lisp_Object string, struct buffer *buf, | |
| 209 Bytexpos opoint, Bytecount length, | |
| 210 Bytecount pos); | |
| 211 void copy_string_extents (Lisp_Object new_string, | |
| 212 Lisp_Object old_string, | |
| 213 Bytecount new_pos, Bytecount old_pos, | |
| 214 Bytecount length); | |
| 215 void detach_all_extents (Lisp_Object object); | |
| 216 Lisp_Object extent_at (Bytexpos position, Lisp_Object object, | |
| 217 Lisp_Object property, EXTENT before, | |
| 218 enum extent_at_flag at_flag, int all_extents); | |
| 219 | |
| 220 | |
| 428 | 221 struct extent_fragment *extent_fragment_new (Lisp_Object buffer_or_string, |
| 222 struct frame *frm); | |
| 223 face_index extent_fragment_update (struct window *w, | |
| 224 struct extent_fragment *ef, | |
| 826 | 225 Bytexpos pos, Lisp_Object last_glyph); |
| 428 | 226 void extent_fragment_delete (struct extent_fragment *ef); |
| 227 | |
| 228 /* from alloc.c */ | |
| 229 struct extent *allocate_extent (void); | |
| 230 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
231 void attach_extent_auxiliary (EXTENT ext); |
| 428 | 232 void init_buffer_extents (struct buffer *b); |
| 233 void uninit_buffer_extents (struct buffer *b); | |
| 234 | |
| 235 #ifdef ERROR_CHECK_EXTENTS | |
| 236 void sledgehammer_extent_check (Lisp_Object obj); | |
| 237 #endif | |
| 238 | |
| 239 #ifdef MEMORY_USAGE_STATS | |
| 240 int compute_buffer_extent_usage (struct buffer *b, | |
| 241 struct overhead_stats *ovstats); | |
| 242 #endif | |
| 243 | |
| 440 | 244 #endif /* INCLUDED_extents_h_ */ |