Mercurial > hg > xemacs-beta
view src/indent.c @ 665:fdefd0186b75
[xemacs-hg @ 2001-09-20 06:28:42 by ben]
The great integral types renaming.
The purpose of this is to rationalize the names used for various
integral types, so that they match their intended uses and follow
consist conventions, and eliminate types that were not semantically
different from each other.
The conventions are:
-- All integral types that measure quantities of anything are
signed. Some people disagree vociferously with this, but their
arguments are mostly theoretical, and are vastly outweighed by
the practical headaches of mixing signed and unsigned values,
and more importantly by the far increased likelihood of
inadvertent bugs: Because of the broken "viral" nature of
unsigned quantities in C (operations involving mixed
signed/unsigned are done unsigned, when exactly the opposite is
nearly always wanted), even a single error in declaring a
quantity unsigned that should be signed, or even the even more
subtle error of comparing signed and unsigned values and
forgetting the necessary cast, can be catastrophic, as
comparisons will yield wrong results. -Wsign-compare is turned
on specifically to catch this, but this tends to result in a
great number of warnings when mixing signed and unsigned, and
the casts are annoying. More has been written on this
elsewhere.
-- All such quantity types just mentioned boil down to EMACS_INT,
which is 32 bits on 32-bit machines and 64 bits on 64-bit
machines. This is guaranteed to be the same size as Lisp
objects of type `int', and (as far as I can tell) of size_t
(unsigned!) and ssize_t. The only type below that is not an
EMACS_INT is Hashcode, which is an unsigned value of the same
size as EMACS_INT.
-- Type names should be relatively short (no more than 10
characters or so), with the first letter capitalized and no
underscores if they can at all be avoided.
-- "count" == a zero-based measurement of some quantity. Includes
sizes, offsets, and indexes.
-- "bpos" == a one-based measurement of a position in a buffer.
"Charbpos" and "Bytebpos" count text in the buffer, rather than
bytes in memory; thus Bytebpos does not directly correspond to
the memory representation. Use "Membpos" for this.
-- "Char" refers to internal-format characters, not to the C type
"char", which is really a byte.
-- For the actual name changes, see the script below.
I ran the following script to do the conversion. (NOTE: This script
is idempotent. You can safely run it multiple times and it will
not screw up previous results -- in fact, it will do nothing if
nothing has changed. Thus, it can be run repeatedly as necessary
to handle patches coming in from old workspaces, or old branches.)
There are two tags, just before and just after the change:
`pre-integral-type-rename' and `post-integral-type-rename'. When
merging code from the main trunk into a branch, the best thing to
do is first merge up to `pre-integral-type-rename', then apply the
script and associated changes, then merge from
`post-integral-type-change' to the present. (Alternatively, just do
the merging in one operation; but you may then have a lot of
conflicts needing to be resolved by hand.)
Script `fixtypes.sh' follows:
----------------------------------- cut ------------------------------------
files="*.[ch] s/*.h m/*.h config.h.in ../configure.in Makefile.in.in ../lib-src/*.[ch] ../lwlib/*.[ch]"
gr Memory_Count Bytecount $files
gr Lstream_Data_Count Bytecount $files
gr Element_Count Elemcount $files
gr Hash_Code Hashcode $files
gr extcount bytecount $files
gr bufpos charbpos $files
gr bytind bytebpos $files
gr memind membpos $files
gr bufbyte intbyte $files
gr Extcount Bytecount $files
gr Bufpos Charbpos $files
gr Bytind Bytebpos $files
gr Memind Membpos $files
gr Bufbyte Intbyte $files
gr EXTCOUNT BYTECOUNT $files
gr BUFPOS CHARBPOS $files
gr BYTIND BYTEBPOS $files
gr MEMIND MEMBPOS $files
gr BUFBYTE INTBYTE $files
gr MEMORY_COUNT BYTECOUNT $files
gr LSTREAM_DATA_COUNT BYTECOUNT $files
gr ELEMENT_COUNT ELEMCOUNT $files
gr HASH_CODE HASHCODE $files
----------------------------------- cut ------------------------------------
`fixtypes.sh' is a Bourne-shell script; it uses 'gr':
----------------------------------- cut ------------------------------------
#!/bin/sh
# Usage is like this:
# gr FROM TO FILES ...
# globally replace FROM with TO in FILES. FROM and TO are regular expressions.
# backup files are stored in the `backup' directory.
from="$1"
to="$2"
shift 2
echo ${1+"$@"} | xargs global-replace "s/$from/$to/g"
----------------------------------- cut ------------------------------------
`gr' in turn uses a Perl script to do its real work,
`global-replace', which follows:
----------------------------------- cut ------------------------------------
: #-*- Perl -*-
### global-modify --- modify the contents of a file by a Perl expression
## Copyright (C) 1999 Martin Buchholz.
## Copyright (C) 2001 Ben Wing.
## Authors: Martin Buchholz <martin@xemacs.org>, Ben Wing <ben@xemacs.org>
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.0, May 5, 2001
# This program 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.
#
# This program 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.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
use strict;
use FileHandle;
use Carp;
use Getopt::Long;
use File::Basename;
(my $myName = $0) =~ s@.*/@@; my $usage="
Usage: $myName [--help] [--backup-dir=DIR] [--line-mode] [--hunk-mode]
PERLEXPR FILE ...
Globally modify a file, either line by line or in one big hunk.
Typical usage is like this:
[with GNU print, GNU xargs: guaranteed to handle spaces, quotes, etc.
in file names]
find . -name '*.[ch]' -print0 | xargs -0 $0 's/\bCONST\b/const/g'\n
[with non-GNU print, xargs]
find . -name '*.[ch]' -print | xargs $0 's/\bCONST\b/const/g'\n
The file is read in, either line by line (with --line-mode specified)
or in one big hunk (with --hunk-mode specified; it's the default), and
the Perl expression is then evalled with \$_ set to the line or hunk of
text, including the terminating newline if there is one. It should
destructively modify the value there, storing the changed result in \$_.
Files in which any modifications are made are backed up to the directory
specified using --backup-dir, or to `backup' by default. To disable this,
use --backup-dir= with no argument.
Hunk mode is the default because it is MUCH MUCH faster than line-by-line.
Use line-by-line only when it matters, e.g. you want to do a replacement
only once per line (the default without the `g' argument). Conversely,
when using hunk mode, *ALWAYS* use `g'; otherwise, you will only make one
replacement in the entire file!
";
my %options = ();
$Getopt::Long::ignorecase = 0;
&GetOptions (
\%options,
'help', 'backup-dir=s', 'line-mode', 'hunk-mode',
);
die $usage if $options{"help"} or @ARGV <= 1;
my $code = shift;
die $usage if grep (-d || ! -w, @ARGV);
sub SafeOpen {
open ((my $fh = new FileHandle), $_[0]);
confess "Can't open $_[0]: $!" if ! defined $fh;
return $fh;
}
sub SafeClose {
close $_[0] or confess "Can't close $_[0]: $!";
}
sub FileContents {
my $fh = SafeOpen ("< $_[0]");
my $olddollarslash = $/;
local $/ = undef;
my $contents = <$fh>;
$/ = $olddollarslash;
return $contents;
}
sub WriteStringToFile {
my $fh = SafeOpen ("> $_[0]");
binmode $fh;
print $fh $_[1] or confess "$_[0]: $!\n";
SafeClose $fh;
}
foreach my $file (@ARGV) {
my $changed_p = 0;
my $new_contents = "";
if ($options{"line-mode"}) {
my $fh = SafeOpen $file;
while (<$fh>) {
my $save_line = $_;
eval $code;
$changed_p = 1 if $save_line ne $_;
$new_contents .= $_;
}
} else {
my $orig_contents = $_ = FileContents $file;
eval $code;
if ($_ ne $orig_contents) {
$changed_p = 1;
$new_contents = $_;
}
}
if ($changed_p) {
my $backdir = $options{"backup-dir"};
$backdir = "backup" if !defined ($backdir);
if ($backdir) {
my ($name, $path, $suffix) = fileparse ($file, "");
my $backfulldir = $path . $backdir;
my $backfile = "$backfulldir/$name";
mkdir $backfulldir, 0755 unless -d $backfulldir;
print "modifying $file (original saved in $backfile)\n";
rename $file, $backfile;
}
WriteStringToFile ($file, $new_contents);
}
}
----------------------------------- cut ------------------------------------
In addition to those programs, I needed to fix up a few other
things, particularly relating to the duplicate definitions of
types, now that some types merged with others. Specifically:
1. in lisp.h, removed duplicate declarations of Bytecount. The
changed code should now look like this: (In each code snippet
below, the first and last lines are the same as the original, as
are all lines outside of those lines. That allows you to locate
the section to be replaced, and replace the stuff in that
section, verifying that there isn't anything new added that
would need to be kept.)
--------------------------------- snip -------------------------------------
/* Counts of bytes or chars */
typedef EMACS_INT Bytecount;
typedef EMACS_INT Charcount;
/* Counts of elements */
typedef EMACS_INT Elemcount;
/* Hash codes */
typedef unsigned long Hashcode;
/* ------------------------ dynamic arrays ------------------- */
--------------------------------- snip -------------------------------------
2. in lstream.h, removed duplicate declaration of Bytecount.
Rewrote the comment about this type. The changed code should
now look like this:
--------------------------------- snip -------------------------------------
#endif
/* The have been some arguments over the what the type should be that
specifies a count of bytes in a data block to be written out or read in,
using Lstream_read(), Lstream_write(), and related functions.
Originally it was long, which worked fine; Martin "corrected" these to
size_t and ssize_t on the grounds that this is theoretically cleaner and
is in keeping with the C standards. Unfortunately, this practice is
horribly error-prone due to design flaws in the way that mixed
signed/unsigned arithmetic happens. In fact, by doing this change,
Martin introduced a subtle but fatal error that caused the operation of
sending large mail messages to the SMTP server under Windows to fail.
By putting all values back to be signed, avoiding any signed/unsigned
mixing, the bug immediately went away. The type then in use was
Lstream_Data_Count, so that it be reverted cleanly if a vote came to
that. Now it is Bytecount.
Some earlier comments about why the type must be signed: This MUST BE
SIGNED, since it also is used in functions that return the number of
bytes actually read to or written from in an operation, and these
functions can return -1 to signal error.
Note that the standard Unix read() and write() functions define the
count going in as a size_t, which is UNSIGNED, and the count going
out as an ssize_t, which is SIGNED. This is a horrible design
flaw. Not only is it highly likely to lead to logic errors when a
-1 gets interpreted as a large positive number, but operations are
bound to fail in all sorts of horrible ways when a number in the
upper-half of the size_t range is passed in -- this number is
unrepresentable as an ssize_t, so code that checks to see how many
bytes are actually written (which is mandatory if you are dealing
with certain types of devices) will get completely screwed up.
--ben
*/
typedef enum lstream_buffering
--------------------------------- snip -------------------------------------
3. in dumper.c, there are four places, all inside of switch()
statements, where XD_BYTECOUNT appears twice as a case tag. In
each case, the two case blocks contain identical code, and you
should *REMOVE THE SECOND* and leave the first.
author | ben |
---|---|
date | Thu, 20 Sep 2001 06:31:11 +0000 |
parents | 183866b06e0b |
children | e38acbeb1cae |
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. 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" Lisp_Object Qcoerce; /* 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; XSETBUFFER (buffer, buf); value = Fprevious_single_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; Emchar 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 (CHAR_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_String* s, Charbpos init_pos, int tab_width) { int col; int tab_seen; int post_tab; Charbpos pos = init_pos; Emchar 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_char (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 (CHAR_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); XSETBUFFER (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 bi_spaces_at_point (struct buffer *b, Bytebpos bi_pos) { Bytebpos bi_end = BI_BUF_ZV (b); int col = 0; Emchar c; int tab_width = XINT (b->tab_width); if (tab_width <= 0 || tab_width > 1000) tab_width = 8; while (bi_pos < bi_end && (c = BI_BUF_FETCH_CHAR (b, bi_pos), (c == '\t' ? (col += tab_width - col % tab_width) : (c == ' ' ? ++col : 0)))) INC_BYTEBPOS (b, bi_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); XSETBUFFER (buffer, buf); if (!NILP (Fextent_at (make_int (pos), buffer, Qinvisible, Qnil, Qnil))) return Qzero; return make_int (bi_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; Emchar c = 0; XSETBUFFER (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 (CHAR_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. */ xxDEFUN ("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); XSETINT (charbpos, pos->charbpos); XSETINT (hpos, pos->hpos); XSETINT (vpos, pos->vpos); XSETINT (prevhpos, 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_atp (w->line_start_cache, 0)->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 that `vertical-motion' sets WINDOW's buffer's point, not WINDOW's point. (This differs from FSF Emacs, which buggily always sets current buffer's point, regardless of WINDOW.) */ (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_height_and_width (window, &defheight, NULL); /* 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); DEFSYMBOL (Qcoerce); } 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; }