/* Indentation functions.
- Copyright (C) 1985, 1986, 1987, 1988, 1992 Free Software Foundation, Inc.
+ Copyright (C) 1985,86,87,88,93,94,95 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include "config.h"
+#include <config.h>
#include "lisp.h"
#include "buffer.h"
#include "indent.h"
#include "termchar.h"
#include "termopts.h"
#include "disptab.h"
+#include "intervals.h"
+#include "region-cache.h"
/* Indentation can insert tabs if this is non-zero;
otherwise always uses spaces */
/* Get the display table to use for the current buffer. */
-struct Lisp_Vector *
+struct Lisp_Char_Table *
buffer_display_table ()
{
Lisp_Object thisbuf;
thisbuf = current_buffer->display_table;
- if (XTYPE (thisbuf) == Lisp_Vector
- && XVECTOR (thisbuf)->size == DISP_TABLE_SIZE)
- return XVECTOR (thisbuf);
- if (XTYPE (Vstandard_display_table) == Lisp_Vector
- && XVECTOR (Vstandard_display_table)->size == DISP_TABLE_SIZE)
- return XVECTOR (Vstandard_display_table);
+ if (DISP_TABLE_P (thisbuf))
+ return XCHAR_TABLE (thisbuf);
+ if (DISP_TABLE_P (Vstandard_display_table))
+ return XCHAR_TABLE (Vstandard_display_table);
return 0;
}
+\f
+/* Width run cache considerations. */
+
+/* Return the width of character C under display table DP. */
+
+static int
+character_width (c, dp)
+ int c;
+ struct Lisp_Char_Table *dp;
+{
+ Lisp_Object elt;
+
+ /* These width computations were determined by examining the cases
+ in display_text_line. */
+
+ /* Everything can be handled by the display table, if it's
+ present and the element is right. */
+ if (dp && (elt = DISP_CHAR_VECTOR (dp, c), VECTORP (elt)))
+ return XVECTOR (elt)->size;
+
+ /* Some characters are special. */
+ if (c == '\n' || c == '\t' || c == '\015')
+ return 0;
+
+ /* Printing characters have width 1. */
+ else if (c >= 040 && c < 0177)
+ return 1;
+
+ /* Everybody else (control characters, metacharacters) has other
+ widths. We could return their actual widths here, but they
+ depend on things like ctl_arrow and crud like that, and they're
+ not very common at all. So we'll just claim we don't know their
+ widths. */
+ else
+ return 0;
+}
+
+/* Return true iff the display table DISPTAB specifies the same widths
+ for characters as WIDTHTAB. We use this to decide when to
+ invalidate the buffer's width_run_cache. */
+int
+disptab_matches_widthtab (disptab, widthtab)
+ struct Lisp_Char_Table *disptab;
+ struct Lisp_Vector *widthtab;
+{
+ int i;
+
+ if (widthtab->size != 256)
+ abort ();
+
+ for (i = 0; i < 256; i++)
+ if (character_width (i, disptab)
+ != XFASTINT (widthtab->contents[i]))
+ return 0;
+
+ return 1;
+}
+
+/* Recompute BUF's width table, using the display table DISPTAB. */
+void
+recompute_width_table (buf, disptab)
+ struct buffer *buf;
+ struct Lisp_Char_Table *disptab;
+{
+ int i;
+ struct Lisp_Vector *widthtab;
+
+ if (!VECTORP (buf->width_table))
+ buf->width_table = Fmake_vector (make_number (256), make_number (0));
+ widthtab = XVECTOR (buf->width_table);
+ if (widthtab->size != 256)
+ abort ();
+
+ for (i = 0; i < 256; i++)
+ XSETFASTINT (widthtab->contents[i], character_width (i, disptab));
+}
+
+/* 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 ()
+{
+ if (NILP (current_buffer->cache_long_line_scans))
+ {
+ /* It should be off. */
+ if (current_buffer->width_run_cache)
+ {
+ free_region_cache (current_buffer->width_run_cache);
+ current_buffer->width_run_cache = 0;
+ current_buffer->width_table = Qnil;
+ }
+ }
+ else
+ {
+ /* It should be on. */
+ if (current_buffer->width_run_cache == 0)
+ {
+ current_buffer->width_run_cache = new_region_cache ();
+ recompute_width_table (current_buffer, buffer_display_table ());
+ }
+ }
+}
+
\f
DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
"Return the horizontal position of point. Beginning of line is column 0.\n\
()
{
Lisp_Object temp;
- XFASTINT (temp) = current_column ();
+ XSETFASTINT (temp, current_column ());
return temp;
}
register int c;
register int tab_width = XINT (current_buffer->tab_width);
int ctl_arrow = !NILP (current_buffer->ctl_arrow);
- register struct Lisp_Vector *dp = buffer_display_table ();
+ register struct Lisp_Char_Table *dp = buffer_display_table ();
int stopchar;
if (point == last_known_column_point
}
c = *--ptr;
- if (c >= 040 && c < 0177
- && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector))
- {
- col++;
- }
+ if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
+ else if (c >= 040 && c < 0177)
+ col++;
else if (c == '\n')
break;
else if (c == '\r' && EQ (current_buffer->selective_display, Qt))
col = 0;
tab_seen = 1;
}
- else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
- col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
else
col += (ctl_arrow && c < 0200) ? 2 : 4;
}
return col;
}
\f
+/* Return the width in columns of the part of STRING from BEG to END.
+ If BEG is nil, that stands for the beginning of STRING.
+ If END is nil, that stands for the end of STRING. */
+
+static int
+string_display_width (string, beg, end)
+ Lisp_Object string, beg, end;
+{
+ register int col;
+ register unsigned char *ptr, *stop;
+ register int tab_seen;
+ int post_tab;
+ register int c;
+ register int tab_width = XINT (current_buffer->tab_width);
+ int ctl_arrow = !NILP (current_buffer->ctl_arrow);
+ register struct Lisp_Char_Table *dp = buffer_display_table ();
+ int b, e;
+
+ if (NILP (end))
+ e = XSTRING (string)->size;
+ else
+ {
+ CHECK_NUMBER (end, 0);
+ e = XINT (end);
+ }
+ if (NILP (beg))
+ b = 0;
+ else
+ {
+ CHECK_NUMBER (beg, 0);
+ b = XINT (beg);
+ }
+
+ /* Make a pointer for decrementing through the chars before point. */
+ ptr = XSTRING (string)->data + e;
+ /* Make a pointer to where consecutive chars leave off,
+ going backwards from point. */
+ stop = XSTRING (string)->data + b;
+
+ if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
+
+ col = 0, tab_seen = 0, post_tab = 0;
+
+ while (1)
+ {
+ if (ptr == stop)
+ break;
+
+ c = *--ptr;
+ if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
+ else if (c >= 040 && c < 0177)
+ col++;
+ else if (c == '\n')
+ break;
+ else if (c == '\t')
+ {
+ if (tab_seen)
+ col = ((col + tab_width) / tab_width) * tab_width;
+
+ post_tab += col;
+ col = 0;
+ tab_seen = 1;
+ }
+ else
+ col += (ctl_arrow && c < 0200) ? 2 : 4;
+ }
+
+ if (tab_seen)
+ {
+ col = ((col + tab_width) / tab_width) * tab_width;
+ col += post_tab;
+ }
+
+ return col;
+}
+\f
DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ",
"Indent from point with tabs and spaces until COLUMN is reached.\n\
Optional second argument MIN says always do at least MIN spaces\n\
CHECK_NUMBER (col, 0);
if (NILP (minimum))
- XFASTINT (minimum) = 0;
+ XSETFASTINT (minimum, 0);
CHECK_NUMBER (minimum, 1);
fromcol = current_column ();
if (indent_tabs_mode)
{
Lisp_Object n;
- XFASTINT (n) = mincol / tab_width - fromcol / tab_width;
+ XSETFASTINT (n, mincol / tab_width - fromcol / tab_width);
if (XFASTINT (n) != 0)
{
- Finsert_char (make_number ('\t'), n);
+ Finsert_char (make_number ('\t'), n, Qt);
fromcol = (mincol / tab_width) * tab_width;
}
}
- XFASTINT (col) = mincol - fromcol;
- Finsert_char (make_number (' '), col);
+ XSETFASTINT (col, mincol - fromcol);
+ Finsert_char (make_number (' '), col, Qt);
last_known_column = mincol;
last_known_column_point = point;
XSETINT (col, mincol);
return col;
}
+
\f
DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
0, 0, 0,
{
Lisp_Object val;
- XFASTINT (val) = position_indentation (find_next_newline (point, -1));
+ XSETFASTINT (val, position_indentation (find_next_newline (point, -1)));
return val;
}
register int tab_width = XINT (current_buffer->tab_width);
register unsigned char *p;
register unsigned char *stop;
-
+
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
-
+
stop = &FETCH_CHAR (BUFFER_CEILING_OF (pos)) + 1;
p = &FETCH_CHAR (pos);
while (1)
}
}
}
+
+/* Test whether the line beginning at POS is indented beyond COLUMN.
+ Blank lines are treated as if they had the same indentation as the
+ preceding line. */
+int
+indented_beyond_p (pos, column)
+ int pos, column;
+{
+ while (pos > BEGV && FETCH_CHAR (pos) == '\n')
+ pos = find_next_newline_no_quit (pos - 1, -1);
+ return (position_indentation (pos) >= column);
+}
+
\f
-DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, 0,
+DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
"Move point to column COLUMN in the current line.\n\
The column of a character is calculated by adding together the widths\n\
as displayed of the previous characters in the line.\n\
register int end;
register int tab_width = XINT (current_buffer->tab_width);
register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
- register struct Lisp_Vector *dp = buffer_display_table ();
+ register struct Lisp_Char_Table *dp = buffer_display_table ();
Lisp_Object val;
int prev_col;
while (col < goal && pos < end)
{
c = FETCH_CHAR (pos);
+ if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ {
+ col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
+ pos++;
+ continue;
+ }
if (c == '\n')
break;
if (c == '\r' && EQ (current_buffer->selective_display, Qt))
col += tab_width;
col = col / tab_width * tab_width;
}
- else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
- col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
else if (ctl_arrow && (c < 040 || c == 0177))
- col++;
+ col += 2;
else if (c < 040 || c >= 0177)
- col += 3;
+ col += 4;
else
col++;
}
old_point = point;
Findent_to (make_number (col), Qnil);
SET_PT (old_point);
+ /* Set the last_known... vars consistently. */
+ col = goal;
}
/* If line ends prematurely, add space to the end. */
last_known_column_point = point;
last_known_column_modified = MODIFF;
- XFASTINT (val) = col;
+ XSETFASTINT (val, col);
return val;
}
+
\f
+/* compute_motion: compute buffer posn given screen posn and vice versa */
+
struct position val_compute_motion;
/* Scan the current buffer forward from offset FROM, pretending that
this is at line FROMVPOS, column FROMHPOS, until reaching buffer
offset TO or line TOVPOS, column TOHPOS (whichever comes first),
- and return the ending buffer position and screen location.
+ and return the ending buffer position and screen location. If we
+ can't hit the requested column exactly (because of a tab or other
+ multi-column character), overshoot.
+
+ DID_MOTION is 1 if FROMHPOS has already accounted for overlay strings
+ at FROM. This is the case if FROMVPOS and FROMVPOS came from an
+ earlier call to compute_motion. The other common case is that FROMHPOS
+ is zero and FROM is a position that "belongs" at column zero, but might
+ be shifted by overlay strings; in this case DID_MOTION should be 0.
WIDTH is the number of columns available to display text;
compute_motion uses this to handle continuation lines and such.
compute_motion returns a pointer to a struct position. The bufpos
member gives the buffer position at the end of the scan, and hpos
- and vpos give its cartesian location. I'm not clear on what the
- other members are.
+ and vpos give its cartesian location. prevhpos is the column at
+ which the character before bufpos started, and contin is non-zero
+ if we reached the current line by continuing the previous.
+
+ Note that FROMHPOS and TOHPOS should be expressed in real screen
+ columns, taking HSCROLL and the truncation glyph at the left margin
+ into account. That is, beginning-of-line moves you to the hpos
+ -HSCROLL + (HSCROLL > 0).
+
+ Note that FROMHPOS and TOHPOS should be expressed in real screen
+ columns, taking HSCROLL and the truncation glyph at the left margin
+ into account. That is, beginning-of-line moves you to the hpos
+ -HSCROLL + (HSCROLL > 0).
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 FROMVPOS and FROMHPOS.
Pass the buffer's ZV as TO, to limit the scan to the end of the
visible section of the buffer, and pass LINE and COL as TOVPOS and
- TOHPOS.
+ TOHPOS.
When displaying in window w, a typical formula for WIDTH is:
window_width - 1
- (has_vertical_scroll_bars
- ? VERTICAL_SCROLL_BAR_WIDTH
+ ? FRAME_SCROLL_BAR_COLS (XFRAME (window->frame))
: (window_width + window_left != frame_width))
where
FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (window)))
and frame_width = FRAME_WIDTH (XFRAME (window->frame))
- Or,
- window_internal_width (w) - 1
+ Or you can let window_internal_width do this all for you, and write:
+ window_internal_width (w) - 1
The `-1' accounts for the continuation-line backslashes; the rest
- accounts for window borders if the window is split vertically, and
- the scroll bars if the frame supports them. */
+ accounts for window borders if the window is split horizontally, and
+ the scroll bars if they are turned on. */
struct position *
-compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, tab_offset)
+compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win)
int from, fromvpos, fromhpos, to, tovpos, tohpos;
+ int did_motion;
register int width;
int hscroll, tab_offset;
+ struct window *win;
{
register int hpos = fromhpos;
register int vpos = fromvpos;
register int c;
register int tab_width = XFASTINT (current_buffer->tab_width);
register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
- register struct Lisp_Vector *dp = buffer_display_table ();
+ register struct Lisp_Char_Table *dp = window_display_table (win);
int selective
- = XTYPE (current_buffer->selective_display) == Lisp_Int
- ? XINT (current_buffer->selective_display)
- : !NILP (current_buffer->selective_display) ? -1 : 0;
- int prev_vpos, prev_hpos;
+ = (INTEGERP (current_buffer->selective_display)
+ ? XINT (current_buffer->selective_display)
+ : !NILP (current_buffer->selective_display) ? -1 : 0);
+ int prev_vpos = vpos, prev_hpos = 0;
int selective_rlen
- = (selective && dp && XTYPE (DISP_INVIS_VECTOR (dp)) == Lisp_Vector
+ = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
+ /* The next location where the `invisible' property changes, or an
+ overlay starts or ends. */
+ int next_boundary = from;
+
+ /* For computing runs of characters with similar widths.
+ Invariant: width_run_width is zero, or all the characters
+ from width_run_start to width_run_end have a fixed width of
+ width_run_width. */
+ int width_run_start = from;
+ int width_run_end = from;
+ int width_run_width = 0;
+ Lisp_Object *width_table;
+ Lisp_Object buffer;
+
+ /* The next buffer pos where we should consult the width run cache. */
+ int next_width_run = from;
+
+ XSETBUFFER (buffer, current_buffer);
+
+ width_run_cache_on_off ();
+ if (dp == buffer_display_table ())
+ width_table = (VECTORP (current_buffer->width_table)
+ ? XVECTOR (current_buffer->width_table)->contents
+ : 0);
+ else
+ /* If the window has its own display table, we can't use the width
+ run cache, because that's based on the buffer's display table. */
+ width_table = 0;
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
- for (pos = from; pos < to; pos++)
- {
- /* Stop if past the target screen position. */
- if (vpos > tovpos
- || (vpos == tovpos && hpos >= tohpos))
- break;
- prev_vpos = vpos;
- prev_hpos = hpos;
-
- c = FETCH_CHAR (pos);
- if (c >= 040 && c < 0177
- && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector))
- hpos++;
- else if (c == '\t')
- {
- hpos += tab_width - ((hpos + tab_offset + hscroll - (hscroll > 0)
- /* Add tab_width here to make sure positive.
- hpos can be negative after continuation
- but can't be less than -tab_width. */
- + tab_width)
- % tab_width);
- }
- else if (c == '\n')
- {
- if (selective > 0 && position_indentation (pos + 1) >= selective)
- {
- /* Skip any number of invisible lines all at once */
- do
- {
- while (++pos < to && FETCH_CHAR (pos) != '\n');
- }
- while (pos < to && position_indentation (pos + 1) >= selective);
- pos--;
- /* Allow for the " ..." that is displayed for them. */
- if (selective_rlen)
- {
- hpos += selective_rlen;
- if (hpos >= width)
- hpos = width;
- }
- /* We have skipped the invis text, but not the newline after. */
- }
- else
- {
- /* A visible line. */
- vpos++;
- hpos = 0;
- hpos -= hscroll;
- if (hscroll > 0) hpos++; /* Count the ! on column 0 */
- tab_offset = 0;
- }
- }
- else if (c == CR && selective < 0)
+ pos = from;
+ while (1)
+ {
+ while (pos == next_boundary)
{
- /* In selective display mode,
- everything from a ^M to the end of the line is invisible */
- while (pos < to && FETCH_CHAR (pos) != '\n') pos++;
- /* Stop *before* the real newline. */
- pos--;
- /* Allow for the " ..." that is displayed for them. */
- if (selective_rlen)
- {
- hpos += selective_rlen;
- if (hpos >= width)
- hpos = width;
- }
+ /* If the caller says that the screen position came from an earlier
+ call to compute_motion, then we've already accounted for the
+ overlay strings at point. This is only true the first time
+ through, so clear the flag after testing it. */
+ if (!did_motion)
+ /* We need to skip past the overlay strings. Currently those
+ strings must contain single-column printing characters;
+ if we want to relax that restriction, something will have
+ to be changed here. */
+ hpos += overlay_strings (pos, win, (char **)0);
+ did_motion = 0;
+
+ if (pos >= to)
+ break;
+
+ {
+ Lisp_Object prop, position, end, limit, proplimit;
+
+ XSETFASTINT (position, pos);
+
+ /* Give faster response for overlay lookup near POS. */
+ recenter_overlay_lists (current_buffer, pos);
+
+ /* We must not advance farther than the next overlay change.
+ The overlay change might change the invisible property;
+ or there might be overlay strings to be displayed there. */
+ limit = Fnext_overlay_change (position);
+ /* As for text properties, this gives a lower bound
+ for where the invisible text property could change. */
+ proplimit = Fnext_property_change (position, buffer, Qt);
+ if (XFASTINT (limit) < XFASTINT (proplimit))
+ proplimit = limit;
+ /* PROPLIMIT is now a lower bound for the next change
+ in invisible status. If that is plenty far away,
+ use that lower bound. */
+ if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to)
+ next_boundary = XFASTINT (proplimit);
+ /* Otherwise, scan for the next `invisible' property change. */
+ else
+ {
+ /* Don't scan terribly far. */
+ XSETFASTINT (proplimit, min (pos + 100, to));
+ /* No matter what. don't go past next overlay change. */
+ if (XFASTINT (limit) < XFASTINT (proplimit))
+ proplimit = limit;
+ end = Fnext_single_property_change (position, Qinvisible,
+ buffer, proplimit);
+ next_boundary = XFASTINT (end);
+ }
+ /* if the `invisible' property is set, we can skip to
+ the next property change */
+ prop = Fget_char_property (position, Qinvisible,
+ Fcurrent_buffer ());
+ if (TEXT_PROP_MEANS_INVISIBLE (prop))
+ pos = next_boundary;
+ }
}
- else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
- hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
- else
- hpos += (ctl_arrow && c < 0200) ? 2 : 4;
/* Handle right margin. */
if (hpos >= width
&& (hpos > width
- || (pos < ZV - 1
- && FETCH_CHAR (pos + 1) != '\n')))
+ || (pos < ZV && FETCH_CHAR (pos) != '\n')))
{
- if (vpos > tovpos
- || (vpos == tovpos && hpos >= tohpos))
- break;
if (hscroll
|| (truncate_partial_width_windows
- && width + 1 < FRAME_WIDTH (selected_frame))
+ && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
|| !NILP (current_buffer->truncate_lines))
{
/* Truncating: skip to newline. */
- while (pos < to && FETCH_CHAR (pos) != '\n') pos++;
- pos--;
+ pos = find_before_next_newline (pos, to, 1);
hpos = width;
}
else
{
/* Continuing. */
- vpos++;
- hpos -= width;
- tab_offset += width;
+ vpos += hpos / width;
+ tab_offset += hpos - hpos % width;
+ hpos %= width;
+ }
+ }
+
+ /* Stop if past the target buffer position or screen position. */
+ if (pos >= to)
+ break;
+ if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
+ break;
+
+ prev_vpos = vpos;
+ prev_hpos = hpos;
+
+ /* Consult the width run cache to see if we can avoid inspecting
+ the text character-by-character. */
+ if (current_buffer->width_run_cache && pos >= next_width_run)
+ {
+ int run_end;
+ int common_width
+ = region_cache_forward (current_buffer,
+ current_buffer->width_run_cache,
+ pos, &run_end);
+
+ /* A width of zero means the character's width varies (like
+ a tab), is meaningless (like a newline), or we just don't
+ want to skip over it for some other reason. */
+ if (common_width != 0)
+ {
+ int run_end_hpos;
+
+ /* Don't go past the final buffer posn the user
+ requested. */
+ if (run_end > to)
+ run_end = to;
+
+ run_end_hpos = hpos + (run_end - pos) * common_width;
+
+ /* Don't go past the final horizontal position the user
+ requested. */
+ if (vpos == tovpos && run_end_hpos > tohpos)
+ {
+ run_end = pos + (tohpos - hpos) / common_width;
+ run_end_hpos = hpos + (run_end - pos) * common_width;
+ }
+
+ /* Don't go past the margin. */
+ if (run_end_hpos >= width)
+ {
+ run_end = pos + (width - hpos) / common_width;
+ run_end_hpos = hpos + (run_end - pos) * common_width;
+ }
+
+ hpos = run_end_hpos;
+ if (run_end > pos)
+ prev_hpos = hpos - common_width;
+ pos = run_end;
+ }
+
+ next_width_run = run_end + 1;
+ }
+
+ /* We have to scan the text character-by-character. */
+ else
+ {
+ c = FETCH_CHAR (pos);
+ pos++;
+
+ /* Perhaps add some info to the width_run_cache. */
+ if (current_buffer->width_run_cache)
+ {
+ /* Is this character part of the current run? If so, extend
+ the run. */
+ if (pos - 1 == width_run_end
+ && width_table[c] == width_run_width)
+ width_run_end = pos;
+
+ /* The previous run is over, since this is a character at a
+ different position, or a different width. */
+ else
+ {
+ /* Have we accumulated a run to put in the cache?
+ (Currently, we only cache runs of width == 1). */
+ if (width_run_start < width_run_end
+ && width_run_width == 1)
+ know_region_cache (current_buffer,
+ current_buffer->width_run_cache,
+ width_run_start, width_run_end);
+
+ /* Start recording a new width run. */
+ width_run_width = width_table[c];
+ width_run_start = pos - 1;
+ width_run_end = pos;
+ }
}
+ if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
+ else if (c >= 040 && c < 0177)
+ hpos++;
+ else if (c == '\t')
+ {
+ int tem = (hpos + tab_offset + hscroll - (hscroll > 0)) % tab_width;
+ if (tem < 0)
+ tem += tab_width;
+ hpos += tab_width - tem;
+ }
+ else if (c == '\n')
+ {
+ if (selective > 0 && indented_beyond_p (pos, selective))
+ {
+ /* Skip any number of invisible lines all at once */
+ do
+ pos = find_before_next_newline (pos, to, 1) + 1;
+ while (pos < to
+ && indented_beyond_p (pos, selective));
+ /* Allow for the " ..." that is displayed for them. */
+ if (selective_rlen)
+ {
+ hpos += selective_rlen;
+ if (hpos >= width)
+ hpos = width;
+ }
+ --pos;
+ /* We have skipped the invis text, but not the
+ newline after. */
+ }
+ else
+ {
+ /* A visible line. */
+ vpos++;
+ hpos = 0;
+ hpos -= hscroll;
+ /* Count the truncation glyph on column 0 */
+ if (hscroll > 0)
+ hpos++;
+ tab_offset = 0;
+ }
+ }
+ else if (c == CR && selective < 0)
+ {
+ /* In selective display mode,
+ everything from a ^M to the end of the line is invisible.
+ Stop *before* the real newline. */
+ pos = find_before_next_newline (pos, to, 1);
+ /* Allow for the " ..." that is displayed for them. */
+ if (selective_rlen)
+ {
+ hpos += selective_rlen;
+ if (hpos >= width)
+ hpos = width;
+ }
+ }
+ else
+ hpos += (ctl_arrow && c < 0200) ? 2 : 4;
}
}
+ /* Remember any final width run in the cache. */
+ if (current_buffer->width_run_cache
+ && width_run_width == 1
+ && width_run_start < width_run_end)
+ know_region_cache (current_buffer, current_buffer->width_run_cache,
+ width_run_start, width_run_end);
+
val_compute_motion.bufpos = pos;
val_compute_motion.hpos = hpos;
val_compute_motion.vpos = vpos;
return &val_compute_motion;
}
+#if 0 /* The doc string is too long for some compilers,
+ but make-docfile can find it in this comment. */
+DEFUN ("compute-motion", Ffoo, Sfoo, 7, 7, 0,
+ "Scan through the current buffer, calculating screen position.\n\
+Scan the current buffer forward from offset FROM,\n\
+assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--\n\
+to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--\n\
+and return the ending buffer position and screen location.\n\
+\n\
+There are three additional arguments:\n\
+\n\
+WIDTH is the number of columns available to display text;\n\
+this affects handling of continuation lines.\n\
+This is usually the value returned by `window-width', less one (to allow\n\
+for the continuation glyph).\n\
+\n\
+OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).\n\
+HSCROLL is the number of columns not being displayed at the left\n\
+margin; this is usually taken from a window's hscroll member.\n\
+TAB-OFFSET is the number of columns of the first tab that aren't\n\
+being displayed, perhaps because the line was continued within it.\n\
+If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.\n\
+\n\
+WINDOW is the window to operate on. Currently this is used only to\n\
+find the display table. It does not matter what buffer WINDOW displays;\n\
+`compute-motion' always operates on the current buffer.\n\
+\n\
+The value is a list of five elements:\n\
+ (POS HPOS VPOS PREVHPOS CONTIN)\n\
+POS is the buffer position where the scan stopped.\n\
+VPOS is the vertical position where the scan stopped.\n\
+HPOS is the horizontal position where the scan stopped.\n\
+\n\
+PREVHPOS is the horizontal position one character back from POS.\n\
+CONTIN is t if a line was continued after (or within) the previous character.\n\
+\n\
+For example, to find the buffer position of column COL of line LINE\n\
+of a certain window, pass the window's starting location as FROM\n\
+and the window's upper-left coordinates as FROMPOS.\n\
+Pass the buffer's (point-max) as TO, to limit the scan to the end of the\n\
+visible section of the buffer, and pass LINE and COL as TOPOS.")
+ (from, frompos, to, topos, width, offsets, window)
+#endif
+
+DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0,
+ 0)
+ (from, frompos, to, topos, width, offsets, window)
+ Lisp_Object from, frompos, to, topos;
+ Lisp_Object width, offsets, window;
+{
+ Lisp_Object bufpos, hpos, vpos, prevhpos, contin;
+ struct position *pos;
+ int hscroll, tab_offset;
+
+ CHECK_NUMBER_COERCE_MARKER (from, 0);
+ CHECK_CONS (frompos, 0);
+ CHECK_NUMBER (XCONS (frompos)->car, 0);
+ CHECK_NUMBER (XCONS (frompos)->cdr, 0);
+ CHECK_NUMBER_COERCE_MARKER (to, 0);
+ CHECK_CONS (topos, 0);
+ CHECK_NUMBER (XCONS (topos)->car, 0);
+ CHECK_NUMBER (XCONS (topos)->cdr, 0);
+ CHECK_NUMBER (width, 0);
+ if (!NILP (offsets))
+ {
+ CHECK_CONS (offsets, 0);
+ CHECK_NUMBER (XCONS (offsets)->car, 0);
+ CHECK_NUMBER (XCONS (offsets)->cdr, 0);
+ hscroll = XINT (XCONS (offsets)->car);
+ tab_offset = XINT (XCONS (offsets)->cdr);
+ }
+ else
+ hscroll = tab_offset = 0;
+
+ if (NILP (window))
+ window = Fselected_window ();
+ else
+ CHECK_LIVE_WINDOW (window, 0);
+
+ pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr),
+ XINT (XCONS (frompos)->car), 0,
+ XINT (to), XINT (XCONS (topos)->cdr),
+ XINT (XCONS (topos)->car),
+ XINT (width), hscroll, tab_offset,
+ XWINDOW (window));
+
+ XSETFASTINT (bufpos, pos->bufpos);
+ XSETINT (hpos, pos->hpos);
+ XSETINT (vpos, pos->vpos);
+ XSETINT (prevhpos, pos->prevhpos);
+
+ return Fcons (bufpos,
+ Fcons (hpos,
+ Fcons (vpos,
+ Fcons (prevhpos,
+ Fcons (pos->contin ? Qt : Qnil, Qnil)))));
+
+}
\f
-/* Return the column of position POS in window W's buffer,
- rounded down to a multiple of the internal width of W.
+/* Return the column of position POS in window W's buffer.
+ The result is rounded down to a multiple of the internal width of W.
This is the amount of indentation of position POS
that is not visible in its horizontal position in the window. */
struct window *w;
register int pos;
{
- int opoint = point;
+ int opoint = PT;
int col;
int width = window_internal_width (w) - 1;
if (pos == BEGV || FETCH_CHAR (pos - 1) == '\n')
return 0;
- SET_PT (pos);
+ TEMP_SET_PT (pos);
col = current_column ();
- SET_PT (opoint);
+ TEMP_SET_PT (opoint);
return col - (col % width);
}
-/* start_hpos is the hpos of the first character of the buffer:
- zero except for the minibuffer window,
- where it is the width of the prompt. */
-
+\f
+/* Fvertical_motion and vmotion */
struct position val_vmotion;
struct position *
-vmotion (from, vtarget, width, hscroll, window)
- register int from, vtarget, width;
- int hscroll;
- Lisp_Object window;
+vmotion (from, vtarget, w)
+ register int from, vtarget;
+ struct window *w;
{
+ int width = window_internal_width (w) - 1;
+ int hscroll = XINT (w->hscroll);
struct position pos;
/* vpos is cumulative vertical position, changed as from is changed */
register int vpos = 0;
- register int prevline;
+ Lisp_Object prevline;
register int first;
int lmargin = hscroll > 0 ? 1 - hscroll : 0;
int selective
- = XTYPE (current_buffer->selective_display) == Lisp_Int
- ? XINT (current_buffer->selective_display)
- : !NILP (current_buffer->selective_display) ? -1 : 0;
- int start_hpos = (EQ (window, minibuf_window) ? minibuf_prompt_width : 0);
+ = (INTEGERP (current_buffer->selective_display)
+ ? XINT (current_buffer->selective_display)
+ : !NILP (current_buffer->selective_display) ? -1 : 0);
+ Lisp_Object window;
+ int start_hpos = 0;
+ int did_motion;
+
+ XSETWINDOW (window, w);
+
+ /* The omission of the clause
+ && marker_position (w->start) == BEG
+ here is deliberate; I think we want to measure from the prompt
+ position even if the minibuffer window has scrolled. */
+ if (EQ (window, minibuf_window))
+ {
+ if (minibuf_prompt_width == 0 && STRINGP (minibuf_prompt))
+ minibuf_prompt_width
+ = string_display_width (minibuf_prompt, Qnil, Qnil);
- retry:
- if (vtarget > vpos)
+ start_hpos = minibuf_prompt_width;
+ }
+
+ if (vpos >= vtarget)
{
- /* Moving downward is simple, but must calculate from beg of line
- to determine hpos of starting point */
- if (from > BEGV && FETCH_CHAR (from - 1) != '\n')
+ /* To move upward, go a line at a time until
+ we have gone at least far enough */
+
+ first = 1;
+
+ while ((vpos > vtarget || first) && from > BEGV)
{
- prevline = find_next_newline (from, -1);
- while (selective > 0
- && prevline > BEGV
- && position_indentation (prevline) >= selective)
- prevline = find_next_newline (prevline - 1, -1);
- pos = *compute_motion (prevline, 0,
- lmargin + (prevline == 1 ? start_hpos : 0),
- from, 1 << (INTBITS - 2), 0,
- width, hscroll, 0);
+ Lisp_Object propval;
+
+ XSETFASTINT (prevline, find_next_newline_no_quit (from - 1, -1));
+ while (XFASTINT (prevline) > BEGV
+ && ((selective > 0
+ && indented_beyond_p (XFASTINT (prevline), selective))
+#ifdef USE_TEXT_PROPERTIES
+ /* watch out for newlines with `invisible' property */
+ || (propval = Fget_char_property (prevline,
+ Qinvisible,
+ window),
+ TEXT_PROP_MEANS_INVISIBLE (propval))
+#endif
+ ))
+ XSETFASTINT (prevline,
+ find_next_newline_no_quit (XFASTINT (prevline) - 1,
+ -1));
+ pos = *compute_motion (XFASTINT (prevline), 0,
+ lmargin + (XFASTINT (prevline) == BEG
+ ? start_hpos : 0),
+ 0,
+ from, 1 << (BITS_PER_INT - 2), 0,
+ width, hscroll, 0, w);
+ vpos -= pos.vpos;
+ first = 0;
+ from = XFASTINT (prevline);
}
- else
+
+ /* If we made exactly the desired vertical distance,
+ or if we hit beginning of buffer,
+ return point found */
+ if (vpos >= vtarget)
{
- pos.hpos = lmargin + (from == 1 ? start_hpos : 0);
- pos.vpos = 0;
+ val_vmotion.bufpos = from;
+ val_vmotion.vpos = vpos;
+ val_vmotion.hpos = lmargin;
+ val_vmotion.contin = 0;
+ val_vmotion.prevhpos = 0;
+ return &val_vmotion;
}
- return compute_motion (from, vpos, pos.hpos,
- ZV, vtarget, - (1 << (INTBITS - 2)),
- width, hscroll, pos.vpos * width);
- }
- /* To move upward, go a line at a time until
- we have gone at least far enough */
-
- first = 1;
-
- while ((vpos > vtarget || first) && from > BEGV)
+ /* Otherwise find the correct spot by moving down */
+ }
+ /* Moving downward is simple, but must calculate from beg of line
+ to determine hpos of starting point */
+ if (from > BEGV && FETCH_CHAR (from - 1) != '\n')
{
- prevline = from;
- while (1)
- {
- prevline = find_next_newline (prevline - 1, -1);
- if (prevline == BEGV
- || selective <= 0
- || position_indentation (prevline) < selective)
- break;
- }
- pos = *compute_motion (prevline, 0,
- lmargin + (prevline == 1 ? start_hpos : 0),
- from, 1 << (INTBITS - 2), 0,
- width, hscroll, 0);
- vpos -= pos.vpos;
- first = 0;
- from = prevline;
+ Lisp_Object propval;
+
+ XSETFASTINT (prevline, find_next_newline_no_quit (from, -1));
+ while (XFASTINT (prevline) > BEGV
+ && ((selective > 0
+ && indented_beyond_p (XFASTINT (prevline), selective))
+#ifdef USE_TEXT_PROPERTIES
+ /* watch out for newlines with `invisible' property */
+ || (propval = Fget_char_property (prevline, Qinvisible,
+ window),
+ TEXT_PROP_MEANS_INVISIBLE (propval))
+#endif
+ ))
+ XSETFASTINT (prevline,
+ find_next_newline_no_quit (XFASTINT (prevline) - 1,
+ -1));
+ pos = *compute_motion (XFASTINT (prevline), 0,
+ lmargin + (XFASTINT (prevline) == BEG
+ ? start_hpos : 0),
+ 0,
+ from, 1 << (BITS_PER_INT - 2), 0,
+ width, hscroll, 0, w);
+ did_motion = 1;
}
-
- /* If we made exactly the desired vertical distance,
- or if we hit beginning of buffer,
- return point found */
- if (vpos >= vtarget)
+ else
{
- val_vmotion.bufpos = from;
- val_vmotion.vpos = vpos;
- val_vmotion.hpos = lmargin;
- val_vmotion.contin = 0;
- val_vmotion.prevhpos = 0;
- return &val_vmotion;
+ pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
+ pos.vpos = 0;
+ did_motion = 0;
}
-
- /* Otherwise find the correct spot by moving down */
- goto retry;
+ return compute_motion (from, vpos, pos.hpos, did_motion,
+ ZV, vtarget, - (1 << (BITS_PER_INT - 2)),
+ width, hscroll, pos.vpos * width, w);
}
-DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 1, 0,
+DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
"Move to start of screen line LINES lines down.\n\
If LINES is negative, this is moving up.\n\
+\n\
+The optional second argument WINDOW specifies the window to use for\n\
+parameters such as width, horizontal scrolling, and so on.\n\
+the default is the selected window.\n\
+It does not matter what buffer is displayed in WINDOW.\n\
+`vertical-motion' always uses the current buffer.\n\
+\n\
Sets point to position found; this may be start of line\n\
- or just the start of a continuation line.\n\
+or just the start of a continuation line.\n\
Returns number of lines moved; may be closer to zero than LINES\n\
- if beginning or end of buffer was reached.")
- (lines)
- Lisp_Object lines;
+if beginning or end of buffer was reached.")
+ (lines, window)
+ Lisp_Object lines, window;
{
struct position pos;
- register struct window *w = XWINDOW (selected_window);
- int width = window_internal_width (w) - 1;
CHECK_NUMBER (lines, 0);
+ if (! NILP (window))
+ CHECK_WINDOW (window, 0);
+ else
+ window = selected_window;
- pos = *vmotion (point, XINT (lines), width,
- /* Not XFASTINT since perhaps could be negative */
- XINT (w->hscroll), selected_window);
+ pos = *vmotion (point, (int) XINT (lines), XWINDOW (window));
SET_PT (pos.bufpos);
return make_number (pos.vpos);
}
\f
+/* file's initialization. */
+
syms_of_indent ()
{
DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode,
defsubr (&Scurrent_column);
defsubr (&Smove_to_column);
defsubr (&Svertical_motion);
+ defsubr (&Scompute_motion);
}