Mercurial > hg > xemacs-beta
view src/indent.c @ 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 | 07dcc7000bbf |
children | c096d8051f89 308d34e9f07d |
line wrap: on
line source
/* Indentation functions. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 2002, 2005 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This file has been Mule-ized. */ /* Synched up with: 19.30. Diverges significantly from FSF. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "device.h" #include "extents.h" #include "faces.h" #include "frame.h" #include "glyphs.h" #include "insdel.h" #ifdef REGION_CACHE_NEEDS_WORK #include "region-cache.h" #endif #include "window.h" /* Indentation can insert tabs if this is non-zero; otherwise always uses spaces */ int indent_tabs_mode; /* Avoid recalculation by remembering things in these variables. */ /* Last value returned by current_column. Some things set last_known_column_point to -1 to mark the memoized value as invalid */ static int last_known_column; /* Last buffer searched by current_column */ static struct buffer *last_known_column_buffer; /* Value of point when current_column was called */ static Charbpos last_known_column_point; /* Value of MODIFF when current_column was called */ static int last_known_column_modified; static Charbpos last_visible_position (Charbpos pos, struct buffer *buf) { Lisp_Object buffer; Lisp_Object value; buffer = wrap_buffer (buf); value = Fprevious_single_char_property_change (make_int (pos), Qinvisible, buffer, Qnil); if (NILP (value)) return 0; /* no visible position found */ else /* #### bug bug bug!!! This will return the position of the beginning of an invisible extent; this extent is very likely to be start-closed, and thus the spaces inserted in `indent-to' will go inside the invisible extent. Not sure what the correct solution is here. Rethink indent-to? */ return XINT (value); } #ifdef REGION_CACHE_NEEDS_WORK /* Allocate or free the width run cache, as requested by the current state of current_buffer's cache_long_line_scans variable. */ static void width_run_cache_on_off (struct buffer *buf) { if (NILP (buf->cache_long_line_scans)) { /* It should be off. */ if (buf->width_run_cache) { free_region_cache (buf->width_run_cache); buf->width_run_cache = 0; buf->width_table = Qnil; } } else { /* It should be on. */ if (buf->width_run_cache == 0) { buf->width_run_cache = new_region_cache (); recompute_width_table (buf, buffer_display_table ()); } } } #endif /* REGION_CACHE_NEEDS_WORK */ /* Cancel any recorded value of the horizontal position. */ void invalidate_current_column (void) { last_known_column_point = -1; } int column_at_point (struct buffer *buf, Charbpos init_pos, int cur_col) { int col; int tab_seen; int tab_width = XINT (buf->tab_width); int post_tab; Charbpos pos = init_pos; Ichar c; if (tab_width <= 0 || tab_width > 1000) tab_width = 8; col = tab_seen = post_tab = 0; while (1) { if (pos <= BUF_BEGV (buf)) break; pos--; c = BUF_FETCH_CHAR (buf, pos); if (c == '\t') { if (tab_seen) col = ((col + tab_width) / tab_width) * tab_width; post_tab += col; col = 0; tab_seen = 1; } else if (c == '\n' || (EQ (buf->selective_display, Qt) && c == '\r')) break; else { /* #### This needs updating to handle the new redisplay. */ /* #### FSFmacs looks at ctl_arrow, display tables. We need to do similar. */ #if 0 displayed_glyphs = glyphs_from_charbpos (sel_frame, buf, XWINDOW (selected_window), pos, dp, 0, col, 0, 0, 0); col += (displayed_glyphs->columns - (displayed_glyphs->begin_columns + displayed_glyphs->end_columns)); #else /* XEmacs */ #ifdef MULE col += XCHARSET_COLUMNS (ichar_charset (c)); #else col ++; #endif /* MULE */ #endif /* XEmacs */ } } if (tab_seen) { col = ((col + tab_width) / tab_width) * tab_width; col += post_tab; } if (cur_col) { last_known_column_buffer = buf; last_known_column = col; last_known_column_point = init_pos; last_known_column_modified = BUF_MODIFF (buf); } return col; } int string_column_at_point (Lisp_Object s, Charbpos init_pos, int tab_width) { int col; int tab_seen; int post_tab; Charbpos pos = init_pos; Ichar c; if (tab_width <= 0 || tab_width > 1000) tab_width = 8; col = tab_seen = post_tab = 0; while (1) { if (pos <= 0) break; pos--; c = string_ichar (s, pos); if (c == '\t') { if (tab_seen) col = ((col + tab_width) / tab_width) * tab_width; post_tab += col; col = 0; tab_seen = 1; } else if (c == '\n') break; else #ifdef MULE col += XCHARSET_COLUMNS (ichar_charset (c)); #else col ++; #endif /* MULE */ } if (tab_seen) { col = ((col + tab_width) / tab_width) * tab_width; col += post_tab; } return col; } int current_column (struct buffer *buf) { if (buf == last_known_column_buffer && BUF_PT (buf) == last_known_column_point && BUF_MODIFF (buf) == last_known_column_modified) return last_known_column; return column_at_point (buf, BUF_PT (buf), 1); } DEFUN ("current-column", Fcurrent_column, 0, 1, 0, /* Return the horizontal position of point. Beginning of line is column 0. This is calculated by adding together the widths of all the displayed representations of the character between the start of the previous line and point. (e.g. control characters will have a width of 2 or 4, tabs will have a variable width.) Ignores finite width of frame, which means that this function may return values greater than (frame-width). Whether the line is visible (if `selective-display' is t) has no effect; however, ^M is treated as end of line when `selective-display' is t. If BUFFER is nil, the current buffer is assumed. */ (buffer)) { return make_int (current_column (decode_buffer (buffer, 0))); } DEFUN ("indent-to", Findent_to, 1, 3, "NIndent to column: ", /* Indent from point with tabs and spaces until COLUMN is reached. Optional second argument MINIMUM says always do at least MINIMUM spaces even if that goes past COLUMN; by default, MINIMUM is zero. If BUFFER is nil, the current buffer is assumed. */ (column, minimum, buffer)) { /* This function can GC */ int mincol; int fromcol; struct buffer *buf = decode_buffer (buffer, 0); int tab_width = XINT (buf->tab_width); Charbpos opoint = 0; CHECK_INT (column); if (NILP (minimum)) minimum = Qzero; else CHECK_INT (minimum); buffer = wrap_buffer (buf); fromcol = current_column (buf); mincol = fromcol + XINT (minimum); if (mincol < XINT (column)) mincol = XINT (column); if (fromcol == mincol) return make_int (mincol); if (tab_width <= 0 || tab_width > 1000) tab_width = 8; if (!NILP (Fextent_at (make_int (BUF_PT (buf)), buffer, Qinvisible, Qnil, Qnil))) { Charbpos last_visible = last_visible_position (BUF_PT (buf), buf); opoint = BUF_PT (buf); if (last_visible >= BUF_BEGV (buf)) BUF_SET_PT (buf, last_visible); else invalid_operation ("Visible portion of buffer not modifiable", Qunbound); } if (indent_tabs_mode) { int n = mincol / tab_width - fromcol / tab_width; if (n != 0) { Finsert_char (make_char ('\t'), make_int (n), Qnil, buffer); fromcol = (mincol / tab_width) * tab_width; } } Finsert_char (make_char (' '), make_int (mincol - fromcol), Qnil, buffer); last_known_column_buffer = buf; last_known_column = mincol; last_known_column_point = BUF_PT (buf); last_known_column_modified = BUF_MODIFF (buf); /* Not in FSF: */ if (opoint > 0) BUF_SET_PT (buf, opoint); return make_int (mincol); } int byte_spaces_at_point (struct buffer *b, Bytebpos byte_pos) { Bytebpos byte_end = BYTE_BUF_ZV (b); int col = 0; Ichar c; int tab_width = XINT (b->tab_width); if (tab_width <= 0 || tab_width > 1000) tab_width = 8; while (byte_pos < byte_end && (c = BYTE_BUF_FETCH_CHAR (b, byte_pos), (c == '\t' ? (col += tab_width - col % tab_width) : (c == ' ' ? ++col : 0)))) INC_BYTEBPOS (b, byte_pos); return col; } DEFUN ("current-indentation", Fcurrent_indentation, 0, 1, 0, /* Return the indentation of the current line. This is the horizontal position of the character following any initial whitespace. */ (buffer)) { struct buffer *buf = decode_buffer (buffer, 0); Charbpos pos = find_next_newline (buf, BUF_PT (buf), -1); buffer = wrap_buffer (buf); if (!NILP (Fextent_at (make_int (pos), buffer, Qinvisible, Qnil, Qnil))) return Qzero; return make_int (byte_spaces_at_point (buf, charbpos_to_bytebpos (buf, pos))); } DEFUN ("move-to-column", Fmove_to_column, 1, 3, 0, /* Move point to column COLUMN in the current line. The column of a character is calculated by adding together the widths as displayed of the previous characters in the line. This function ignores line-continuation; there is no upper limit on the column number a character can have and horizontal scrolling has no effect. If specified column is within a character, point goes after that character. If it's past end of line, point goes to end of line. A value of `coerce' for the second (optional) argument FORCE means if COLUMN is in the middle of a tab character, change it to spaces. Any other non-nil value means the same, plus if the line is too short to reach column COLUMN, then add spaces/tabs to get there. Returns the actual column that it moved to. */ (column, force, buffer)) { /* This function can GC */ Charbpos pos; struct buffer *buf = decode_buffer (buffer, 0); int col = current_column (buf); int goal; Charbpos end; int tab_width = XINT (buf->tab_width); int prev_col = 0; Ichar c = 0; buffer = wrap_buffer (buf); if (tab_width <= 0 || tab_width > 1000) tab_width = 8; CHECK_NATNUM (column); goal = XINT (column); retry: pos = BUF_PT (buf); end = BUF_ZV (buf); /* If we're starting past the desired column, back up to beginning of line and scan from there. */ if (col > goal) { pos = find_next_newline (buf, pos, -1); col = 0; } while (col < goal && pos < end) { c = BUF_FETCH_CHAR (buf, pos); if (c == '\n') break; if (c == '\r' && EQ (buf->selective_display, Qt)) break; if (c == '\t') { prev_col = col; col += tab_width; col = col / tab_width * tab_width; } else { /* #### oh for the days of the complete new redisplay */ /* #### FSFmacs looks at ctl_arrow, display tables. We need to do similar. */ #if 0 displayed_glyphs = glyphs_from_charbpos (selected_frame (), buf, XWINDOW (Fselected_window (Qnil)), pos, dp, 0, col, 0, 0, 0); col += (displayed_glyphs->columns - (displayed_glyphs->begin_columns + displayed_glyphs->end_columns)); #else /* XEmacs */ #ifdef MULE col += XCHARSET_COLUMNS (ichar_charset (c)); #else col ++; #endif /* MULE */ #endif /* XEmacs */ } pos++; } BUF_SET_PT (buf, pos); /* If a tab char made us overshoot, change it to spaces and scan through it again. */ if (!NILP (force) && col > goal && c == '\t' && prev_col < goal) { buffer_delete_range (buf, BUF_PT (buf) - 1, BUF_PT (buf), 0); Findent_to (make_int (col - 1), Qzero, buffer); buffer_insert_emacs_char (buf, ' '); goto retry; } /* If line ends prematurely, add space to the end. */ if (col < goal && !NILP (force) && !EQ (force, Qcoerce)) { col = goal; Findent_to (make_int (col), Qzero, buffer); } last_known_column_buffer = buf; last_known_column = col; last_known_column_point = BUF_PT (buf); last_known_column_modified = BUF_MODIFF (buf); return make_int (col); } #if 0 /* #### OK boys, this function needs to be present, I think. It was there before the 19.12 redisplay rewrite. */ DEFUN ("compute-motion", Fcompute_motion, 7, 7, 0, /* "Scan through the current buffer, calculating screen position. Scan the current buffer forward from offset FROM, assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)-- to position TO or position TOPOS--another cons of the form (HPOS . VPOS)-- and return the ending buffer position and screen location. There are three additional arguments: WIDTH is the number of columns available to display text; this affects handling of continuation lines. This is usually the value returned by `window-width', less one (to allow for the continuation glyph). OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET). HSCROLL is the number of columns not being displayed at the left margin; this is usually taken from a window's hscroll member. TAB-OFFSET is the number of columns of the first tab that aren't being displayed, perhaps because the line was continued within it. If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero. WINDOW is the window to operate on. Currently this is used only to find the display table. It does not matter what buffer WINDOW displays; `compute-motion' always operates on the current buffer. The value is a list of five elements: (POS HPOS VPOS PREVHPOS CONTIN) POS is the buffer position where the scan stopped. VPOS is the vertical position where the scan stopped. HPOS is the horizontal position where the scan stopped. PREVHPOS is the horizontal position one character back from POS. CONTIN is t if a line was continued after (or within) the previous character. For example, to find the buffer position of column COL of line LINE of a certain window, pass the window's starting location as FROM and the window's upper-left coordinates as FROMPOS. Pass the buffer's (point-max) as TO, to limit the scan to the end of the visible section of the buffer, and pass LINE and COL as TOPOS. */ (from, frompos, to, topos, width, offsets, window)) { Lisp_Object charbpos, hpos, vpos, prevhpos, contin; struct position *pos; int hscroll, tab_offset; struct window *w = decode_window (window); CHECK_INT_COERCE_MARKER (from); CHECK_CONS (frompos); CHECK_INT (XCAR (frompos)); CHECK_INT (XCDR (frompos)); CHECK_INT_COERCE_MARKER (to); CHECK_CONS (topos); CHECK_INT (XCAR (topos)); CHECK_INT (XCDR (topos)); CHECK_INT (width); if (!NILP (offsets)) { CHECK_CONS (offsets); CHECK_INT (XCAR (offsets)); CHECK_INT (XCDR (offsets)); hscroll = XINT (XCAR (offsets)); tab_offset = XINT (XCDR (offsets)); } else hscroll = tab_offset = 0; pos = compute_motion (XINT (from), XINT (XCDR (frompos)), XINT (XCAR (frompos)), XINT (to), XINT (XCDR (topos)), XINT (XCAR (topos)), XINT (width), hscroll, tab_offset, w); charbpos = make_int (pos->charbpos); hpos = make_int (pos->hpos); vpos = make_int (pos->vpos); prevhpos = make_int (pos->prevhpos); return list5 (charbpos, hpos, vpos, prevhpos, pos->contin ? Qt : Qnil); } #endif /* 0 */ /* Helper for vmotion_1 - compute vertical pixel motion between START and END in the line start cache CACHE. This just sums the line heights, including both the starting and ending lines. */ static int vpix_motion (line_start_cache_dynarr *cache, int start, int end) { int i, vpix; assert (start <= end); assert (start >= 0); assert (end < Dynarr_length (cache)); vpix = 0; for (i = start; i <= end; i++) vpix += Dynarr_atp (cache, i)->height; return vpix; } /***************************************************************************** vmotion_1 Given a starting position ORIG, move point VTARGET lines in WINDOW. Returns the new value for point. If the arg ret_vpos is not nil, it is taken to be a pointer to an int and the number of lines actually moved is returned in it. If the arg ret_vpix is not nil, it is taken to be a pointer to an int and the vertical pixel height of the motion which took place is returned in it. ****************************************************************************/ static Charbpos vmotion_1 (struct window *w, Charbpos orig, int vtarget, int *ret_vpos, int *ret_vpix) { struct buffer *b = XBUFFER (w->buffer); int elt; elt = point_in_line_start_cache (w, orig, (vtarget < 0 ? -vtarget : vtarget)); /* #### This assertion must be true before the if statements are hit but may possibly be wrong after the call to point_in_line_start_cache if orig is outside of the visible region of the buffer. Handle this. */ assert (elt >= 0); /* Moving downward. */ if (vtarget > 0) { int cur_line = Dynarr_length (w->line_start_cache) - 1 - elt; Charbpos ret_pt; if (cur_line > vtarget) cur_line = vtarget; /* The traditional FSF behavior is to return the end of buffer position if we couldn't move far enough because we hit it. */ if (cur_line < vtarget) ret_pt = BUF_ZV (b); else ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start; while (ret_pt > BUF_ZV (b) && cur_line > 0) { cur_line--; ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start; } if (ret_vpos) *ret_vpos = cur_line; if (ret_vpix) *ret_vpix = vpix_motion (w->line_start_cache, elt, cur_line + elt); return ret_pt; } else if (vtarget < 0) { if (elt < -vtarget) { if (ret_vpos) *ret_vpos = -elt; if (ret_vpix) *ret_vpix = vpix_motion (w->line_start_cache, 0, elt); /* #### This should be BUF_BEGV (b), right? */ return Dynarr_begin (w->line_start_cache)->start; } else { if (ret_vpos) *ret_vpos = vtarget; if (ret_vpix) *ret_vpix = vpix_motion (w->line_start_cache, elt + vtarget, elt); return Dynarr_atp (w->line_start_cache, elt + vtarget)->start; } } else { /* No vertical motion requested so we just return the position of the beginning of the current line. */ if (ret_vpos) *ret_vpos = 0; if (ret_vpix) *ret_vpix = vpix_motion (w->line_start_cache, elt, elt); return Dynarr_atp (w->line_start_cache, elt)->start; } RETURN_NOT_REACHED(0); /* shut up compiler */ } /***************************************************************************** vmotion Given a starting position ORIG, move point VTARGET lines in WINDOW. Returns the new value for point. If the arg ret_vpos is not nil, it is taken to be a pointer to an int and the number of lines actually moved is returned in it. ****************************************************************************/ Charbpos vmotion (struct window *w, Charbpos orig, int vtarget, int *ret_vpos) { return vmotion_1 (w, orig, vtarget, ret_vpos, NULL); } /* Helper for Fvertical_motion. */ static Lisp_Object vertical_motion_1 (Lisp_Object lines, Lisp_Object window, int pixels) { Charbpos charbpos; Charbpos orig; int selected; int *vpos, *vpix; int value=0; struct window *w; if (NILP (window)) window = Fselected_window (Qnil); CHECK_LIVE_WINDOW (window); CHECK_INT (lines); selected = (EQ (window, Fselected_window (Qnil))); w = XWINDOW (window); orig = selected ? BUF_PT (XBUFFER (w->buffer)) : marker_position (w->pointm[CURRENT_DISP]); vpos = pixels ? NULL : &value; vpix = pixels ? &value : NULL; charbpos = vmotion_1 (w, orig, XINT (lines), vpos, vpix); /* Note that the buffer's point is set, not the window's point. */ if (selected) BUF_SET_PT (XBUFFER (w->buffer), charbpos); else set_marker_restricted (w->pointm[CURRENT_DISP], make_int(charbpos), w->buffer); return make_int (value); } DEFUN ("vertical-motion", Fvertical_motion, 1, 3, 0, /* Move to start of frame line LINES lines down. If LINES is negative, this is moving up. Optional second argument is WINDOW to move in, the default is the selected window. Sets point to position found; this may be start of line or just the start of a continuation line. If optional third argument PIXELS is nil, returns number of lines moved; may be closer to zero than LINES if beginning or end of buffer was reached. If PIXELS is non-nil, the vertical pixel height of the motion which took place is returned instead of the actual number of lines moved. A motion of zero lines returns the height of the current line. NOTE NOTE NOTE: GNU Emacs/XEmacs difference. What `vertical-motion' actually does is set WINDOW's buffer's point if WINDOW is the selected window; else, it sets WINDOW's point. This is unfortunately somewhat tricky to work with, and different from GNU Emacs, which always uses the current buffer, not WINDOW's buffer, always sets current buffer's point, and, from the perspective of this function, temporarily makes WINDOW display the current buffer if it wasn't already. */ (lines, window, pixels)) { return vertical_motion_1 (lines, window, !NILP (pixels)); } /* * Like vmotion() but requested and returned movement is in pixels. * HOW specifies the stopping condition. Positive means move at least * PIXELS. Negative means at most. Zero means as close as possible. */ Charbpos vmotion_pixels (Lisp_Object window, Charbpos start, int pixels, int how, int *motion) { struct window *w; Charbpos eobuf, bobuf; int defheight; int needed; int line, next; int remain, abspix, dirn; int elt, nelt; int i; line_start_cache_dynarr *cache; int previous = -1; int lines; if (NILP (window)) window = Fselected_window (Qnil); CHECK_LIVE_WINDOW (window); w = XWINDOW (window); eobuf = BUF_ZV (XBUFFER (w->buffer)); bobuf = BUF_BEGV (XBUFFER (w->buffer)); default_face_width_and_height (window, NULL, &defheight); /* guess num lines needed in line start cache + a few extra */ abspix = abs (pixels); needed = (abspix + defheight-1)/defheight + 3; dirn = (pixels >= 0) ? 1 : -1; while (1) { elt = point_in_line_start_cache (w, start, needed); assert (elt >= 0); /* in the cache */ cache = w->line_start_cache; nelt = Dynarr_length (cache); *motion = 0; if (pixels == 0) /* No vertical motion requested so we just return the position of the beginning of the current display line. */ return Dynarr_atp (cache, elt)->start; if ((dirn < 0 && elt == 0 && Dynarr_atp (cache, elt)->start <= bobuf) || (dirn > 0 && elt == nelt-1 && Dynarr_atp (cache, elt)->end >= eobuf)) return Dynarr_atp (cache, elt)->start; remain = abspix; for (i = elt; (dirn > 0) ? (i < nelt) : (i > 0); i += dirn) { /* cache line we're considering moving over */ int ii = (dirn > 0) ? i : i-1; if (remain < 0) return Dynarr_atp (cache, i)->start; line = Dynarr_atp (cache, ii)->height; next = remain - line; /* is stopping condition satisfied? */ if ((how > 0 && remain <= 0) || /* at least */ (how < 0 && next < 0) || /* at most */ (how == 0 && remain <= abs (next))) /* closest */ return Dynarr_atp (cache, i)->start; /* moving down and nowhere left to go? */ if (dirn > 0 && Dynarr_atp (cache, ii)->end >= eobuf) return Dynarr_atp (cache, ii)->start; /* take the step */ remain = next; *motion += dirn * line; /* moving up and nowhere left to go? */ if (dirn < 0 && Dynarr_atp (cache, ii)->start <= bobuf) return Dynarr_atp (cache, ii)->start; } /* get here => need more cache lines. try again. */ assert (abs (*motion) > previous); /* progress? */ previous = abs (*motion); lines = (pixels < 0) ? elt : (nelt - elt); needed += (remain*lines + abspix-1)/abspix + 3; } RETURN_NOT_REACHED(0); /* shut up compiler */ } DEFUN ("vertical-motion-pixels", Fvertical_motion_pixels, 1, 3, 0, /* Move to start of frame line PIXELS vertical pixels down. If PIXELS is negative, this is moving up. The actual vertical motion in pixels is returned. Optional second argument is WINDOW to move in, the default is the selected window. Optional third argument HOW specifies when to stop. A value less than zero indicates that the motion should be no more than PIXELS. A value greater than zero indicates that the motion should be at least PIXELS. Any other value indicates that the motion should be as close as possible to PIXELS. */ (pixels, window, how)) { Charbpos charbpos; Charbpos orig; int selected; int motion; int howto; struct window *w; if (NILP (window)) window = Fselected_window (Qnil); CHECK_LIVE_WINDOW (window); CHECK_INT (pixels); selected = (EQ (window, Fselected_window (Qnil))); w = XWINDOW (window); orig = selected ? BUF_PT (XBUFFER (w->buffer)) : marker_position (w->pointm[CURRENT_DISP]); howto = INTP (how) ? XINT (how) : 0; charbpos = vmotion_pixels (window, orig, XINT (pixels), howto, &motion); if (selected) BUF_SET_PT (XBUFFER (w->buffer), charbpos); else set_marker_restricted (w->pointm[CURRENT_DISP], make_int(charbpos), w->buffer); return make_int (motion); } void syms_of_indent (void) { DEFSUBR (Fcurrent_indentation); DEFSUBR (Findent_to); DEFSUBR (Fcurrent_column); DEFSUBR (Fmove_to_column); #if 0 /* #### */ DEFSUBR (Fcompute_motion); #endif DEFSUBR (Fvertical_motion); DEFSUBR (Fvertical_motion_pixels); } void vars_of_indent (void) { DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode /* *Indentation can insert tabs if this is non-nil. Setting this variable automatically makes it local to the current buffer. */ ); indent_tabs_mode = 1; }