/* Indentation functions.
- Copyright (C) 1985,86,87,88,93,94,95,98, 2000, 2001
+ Copyright (C) 1985,86,87,88,93,94,95,98,2000,01,02,03,2004
Free Software Foundation, Inc.
This file is part of GNU Emacs.
Some things in set last_known_column_point to -1
to mark the memorized value as invalid. */
-int last_known_column;
+double last_known_column;
/* Value of point when current_column was called. */
int last_known_column_modified;
-static int current_column_1 P_ ((void));
-static int position_indentation P_ ((int));
+static double current_column_1 P_ ((void));
+static double position_indentation P_ ((int));
/* Cache of beginning of line found by the last call of
current_column. */
{
Lisp_Object prop, position, overlay_limit, proplimit;
Lisp_Object buffer;
- int end;
+ int end, inv_p;
XSETFASTINT (position, pos);
XSETBUFFER (buffer, current_buffer);
}
/* if the `invisible' property is set, we can skip to
the next property change */
- if (!NILP (window) && EQ (XWINDOW (window)->buffer, buffer))
- prop = Fget_char_property (position, Qinvisible, window);
- else
- prop = Fget_char_property (position, Qinvisible, buffer);
- if (TEXT_PROP_MEANS_INVISIBLE (prop) > NILP (window))
+ prop = Fget_char_property (position, Qinvisible,
+ (!NILP (window)
+ && EQ (XWINDOW (window)->buffer, buffer))
+ ? window : buffer);
+ inv_p = TEXT_PROP_MEANS_INVISIBLE (prop);
+ /* When counting columns (window == nil), don't skip over ellipsis text. */
+ if (NILP (window) ? inv_p == 1 : inv_p)
return *next_boundary_p;
return pos;
}
} \
} while (0)
+
DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
doc: /* Return the horizontal position of point. Beginning of line is column 0.
This is calculated by adding together the widths of all the displayed
()
{
Lisp_Object temp;
- XSETFASTINT (temp, current_column ());
+ XSETFASTINT (temp, (int) current_column ()); /* iftc */
return temp;
}
last_known_column_point = 0;
}
-int
+double
current_column ()
{
register int col;
/* If the buffer has overlays, text properties,
or multibyte characters, use a more general algorithm. */
if (BUF_INTERVALS (current_buffer)
- || !NILP (current_buffer->overlays_before)
- || !NILP (current_buffer->overlays_after)
+ || current_buffer->overlays_before
+ || current_buffer->overlays_after
|| Z != Z_BYTE)
return current_column_1 ();
{
EMACS_INT i, n;
Lisp_Object charvec;
-
+
if (ptr == stop)
{
/* We stopped either for the beginning of the buffer
or for the gap. */
if (ptr == BEGV_ADDR)
break;
-
+
/* It was the gap. Jump back over it. */
stop = BEGV_ADDR;
ptr = GPT_ADDR;
-
+
/* Check whether that brings us to beginning of buffer. */
if (BEGV >= GPT)
break;
}
c = *--ptr;
-
+
if (dp && VECTORP (DISP_CHAR_VECTOR (dp, c)))
{
charvec = DISP_CHAR_VECTOR (dp, c);
charvec = Qnil;
n = 1;
}
-
+
for (i = n - 1; i >= 0; --i)
{
if (VECTORP (charvec))
/* This should be handled the same as
next_element_from_display_vector does it. */
Lisp_Object entry = AREF (charvec, i);
-
+
if (INTEGERP (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry)))
c = FAST_GLYPH_CHAR (XFASTINT (entry));
else
c = ' ';
}
-
+
if (c >= 040 && c < 0177)
col++;
else if (c == '\n'
{
if (tab_seen)
col = ((col + tab_width) / tab_width) * tab_width;
-
+
post_tab += col;
col = 0;
tab_seen = 1;
This function handles characters that are invisible
due to text properties or overlays. */
-static int
+static double
current_column_1 ()
{
register int tab_width = XINT (current_buffer->tab_width);
/* Start the scan at the beginning of this line with column number 0. */
register int col = 0;
int scan, scan_byte;
- int next_boundary, next_boundary_byte;
+ int next_boundary;
int opoint = PT, opoint_byte = PT_BYTE;
scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
scan = PT, scan_byte = PT_BYTE;
SET_PT_BOTH (opoint, opoint_byte);
next_boundary = scan;
- next_boundary_byte = scan_byte;
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
while (scan < opoint)
{
int c;
- EMACS_INT i, n;
- Lisp_Object charvec;
/* Occasionally we may need to skip invisible text. */
while (scan == next_boundary)
goto endloop;
if (scan != old_scan)
scan_byte = CHAR_TO_BYTE (scan);
- next_boundary_byte = CHAR_TO_BYTE (next_boundary);
}
/* Check composition sequence. */
&& ! (multibyte && BASE_LEADING_CODE_P (c))
&& VECTORP (DISP_CHAR_VECTOR (dp, c)))
{
+ Lisp_Object charvec;
+ EMACS_INT i, n;
+
+ /* This character is displayed using a vector of glyphs.
+ Update the column based on those glyphs. */
+
charvec = DISP_CHAR_VECTOR (dp, c);
n = ASIZE (charvec);
- }
- else
- {
- charvec = Qnil;
- n = 1;
- }
- for (i = n - 1; i >= 0; --i)
- {
- if (VECTORP (charvec))
+ for (i = 0; i < n; i++)
{
/* This should be handled the same as
next_element_from_display_vector does it. */
- Lisp_Object entry = AREF (charvec, i);
-
+ Lisp_Object entry;
+ entry = AREF (charvec, i);
+
if (INTEGERP (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry)))
c = FAST_GLYPH_CHAR (XFASTINT (entry));
else
c = ' ';
+
+ if (c == '\n')
+ goto endloop;
+ if (c == '\r' && EQ (current_buffer->selective_display, Qt))
+ goto endloop;
+ if (c == '\t')
+ {
+ col += tab_width;
+ col = col / tab_width * tab_width;
+ }
+ else
+ ++col;
}
-
+ }
+ else
+ {
+ /* The display table says nothing for this character.
+ Display it as itself. */
+
if (c == '\n')
goto endloop;
if (c == '\r' && EQ (current_buffer->selective_display, Qt))
goto endloop;
- scan++;
- scan_byte++;
if (c == '\t')
{
- int prev_col = col;
col += tab_width;
col = col / tab_width * tab_width;
}
{
unsigned char *ptr;
int bytes, width, wide_column;
-
- scan_byte--;
+
ptr = BYTE_POS_ADDR (scan_byte);
MULTIBYTE_BYTES_WIDTH (ptr, dp);
scan_byte += bytes;
+ /* Subtract one to compensate for the increment
+ that is going to happen below. */
+ scan_byte--;
col += width;
}
- else if (VECTORP (charvec))
- ++col;
else if (ctl_arrow && (c < 040 || c == 0177))
col += 2;
else if (c < 040 || c >= 0177)
else
col++;
}
+ scan++;
+ scan_byte++;
+
}
endloop:
If BEG is nil, that stands for the beginning of STRING.
If END is nil, that stands for the end of STRING. */
-static int
+static double
string_display_width (string, beg, end)
Lisp_Object string, beg, end;
{
int b, e;
if (NILP (end))
- e = XSTRING (string)->size;
+ e = SCHARS (string);
else
{
CHECK_NUMBER (end);
}
/* Make a pointer for decrementing through the chars before point. */
- ptr = XSTRING (string)->data + e;
+ ptr = SDATA (string) + e;
/* Make a pointer to where consecutive chars leave off,
going backwards from point. */
- stop = XSTRING (string)->data + b;
+ stop = SDATA (string) + b;
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
}
\f
-static int position_indentation P_ ((int));
+static double position_indentation P_ ((int));
DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
0, 0, 0,
scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
- XSETFASTINT (val, position_indentation (PT_BYTE));
+ XSETFASTINT (val, (int) position_indentation (PT_BYTE)); /* iftc */
SET_PT_BOTH (opoint, opoint_byte);
return val;
}
-static int
+static double
position_indentation (pos_byte)
register int pos_byte;
{
/* The -1 and +1 arrange to point at the first byte of gap
(if STOP_POS_BYTE is the position of the gap)
rather than at the data after the gap. */
-
+
stop = BYTE_POS_ADDR (stop_pos_byte - 1) + 1;
p = BYTE_POS_ADDR (pos_byte);
}
int
indented_beyond_p (pos, pos_byte, column)
- int pos, pos_byte, column;
+ int pos, pos_byte;
+ double column;
{
- int val;
+ double val;
int opoint = PT, opoint_byte = PT_BYTE;
SET_PT_BOTH (pos, pos_byte);
val = position_indentation (PT_BYTE);
SET_PT_BOTH (opoint, opoint_byte);
- return val >= column;
+ return val >= column; /* hmm, float comparison */
}
\f
DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
Lisp_Object val;
int prev_col = 0;
int c = 0;
- int next_boundary;
-
- int pos_byte, end_byte, next_boundary_byte;
+ int next_boundary, pos_byte;
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
CHECK_NATNUM (column);
pos = PT;
pos_byte = PT_BYTE;
end = ZV;
- end_byte = ZV_BYTE;
next_boundary = pos;
- next_boundary_byte = PT_BYTE;
/* If we're starting past the desired column,
back up to beginning of line and scan from there. */
while (pos < end)
{
- Lisp_Object charvec;
- EMACS_INT i, n;
-
while (pos == next_boundary)
{
int prev = pos;
pos = skip_invisible (pos, &next_boundary, end, Qnil);
if (pos != prev)
pos_byte = CHAR_TO_BYTE (pos);
- next_boundary_byte = CHAR_TO_BYTE (next_boundary);
if (pos >= end)
goto endloop;
}
c = FETCH_BYTE (pos_byte);
+ /* See if there is a display table and it relates
+ to this character. */
+
if (dp != 0
&& ! (multibyte && BASE_LEADING_CODE_P (c))
&& VECTORP (DISP_CHAR_VECTOR (dp, c)))
{
+ Lisp_Object charvec;
+ EMACS_INT i, n;
+
+ /* This character is displayed using a vector of glyphs.
+ Update the position based on those glyphs. */
+
charvec = DISP_CHAR_VECTOR (dp, c);
n = ASIZE (charvec);
- }
- else
- {
- charvec = Qnil;
- n = 1;
- }
- for (i = n - 1; i >= 0; --i)
- {
- if (VECTORP (charvec))
+ for (i = 0; i < n; i++)
{
/* This should be handled the same as
next_element_from_display_vector does it. */
- Lisp_Object entry = AREF (charvec, i);
-
+
+ Lisp_Object entry;
+ entry = AREF (charvec, i);
+
if (INTEGERP (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry)))
c = FAST_GLYPH_CHAR (XFASTINT (entry));
else
c = ' ';
+
+ if (c == '\n')
+ goto endloop;
+ if (c == '\r' && EQ (current_buffer->selective_display, Qt))
+ goto endloop;
+ if (c == '\t')
+ {
+ prev_col = col;
+ col += tab_width;
+ col = col / tab_width * tab_width;
+ }
+ else
+ ++col;
}
+ }
+ else
+ {
+ /* The display table doesn't affect this character;
+ it displays as itself. */
-
if (c == '\n')
goto endloop;
if (c == '\r' && EQ (current_buffer->selective_display, Qt))
goto endloop;
- pos++;
- pos_byte++;
if (c == '\t')
{
prev_col = col;
col += tab_width;
col = col / tab_width * tab_width;
}
- else if (VECTORP (charvec))
- ++col;
else if (ctl_arrow && (c < 040 || c == 0177))
col += 2;
else if (c < 040 || c == 0177)
unsigned char *ptr;
int bytes, width, wide_column;
- pos_byte--;
ptr = BYTE_POS_ADDR (pos_byte);
MULTIBYTE_BYTES_WIDTH (ptr, dp);
- pos_byte += bytes;
+ pos_byte += bytes - 1;
col += width;
}
else
col += 4;
}
+
+ pos++;
+ pos_byte++;
}
endloop:
goal_pt_byte = PT_BYTE;
Findent_to (make_number (col), Qnil);
SET_PT_BOTH (goal_pt, goal_pt_byte);
-
+
/* Set the last_known... vars consistently. */
col = goal;
}
window_width - 1
- (has_vertical_scroll_bars
- ? FRAME_SCROLL_BAR_COLS (XFRAME (window->frame))
- : (window_width + window_left != frame_width))
+ ? WINDOW_CONFIG_SCROLL_BAR_COLS (window)
+ : (window_width + window_left != frame_cols))
where
- window_width is XFASTINT (w->width),
- window_left is XFASTINT (w->left),
+ window_width is XFASTINT (w->total_cols),
+ window_left is XFASTINT (w->left_col),
has_vertical_scroll_bars is
- FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (window)))
- and frame_width = FRAME_WIDTH (XFRAME (window->frame))
+ WINDOW_HAS_VERTICAL_SCROLL_BAR (window)
+ and frame_cols = FRAME_COLS (XFRAME (window->frame))
- Or you can let window_internal_width do this all for you, and write:
- window_internal_width (w) - 1
+ Or you can let window_box_text_cols do this all for you, and write:
+ window_box_text_cols (w) - 1
The `-1' accounts for the continuation-line backslashes; the rest
accounts for window borders if the window is split horizontally, and
= (INTEGERP (current_buffer->selective_display)
? XINT (current_buffer->selective_display)
: !NILP (current_buffer->selective_display) ? -1 : 0);
- int prev_hpos = 0;
int selective_rlen
= (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
int wide_column_end_hpos = 0;
int prev_pos; /* Previous buffer position. */
int prev_pos_byte; /* Previous buffer position. */
+ int prev_hpos = 0;
+ int prev_vpos = 0;
int contin_hpos; /* HPOS of last column of continued line. */
int prev_tab_offset; /* Previous tab offset. */
int newpos;
/* Don't skip invisible if we are already at the margin. */
- if (vpos > tovpos || vpos == tovpos && hpos >= tohpos)
+ if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
{
if (contin_hpos && prev_hpos == 0
&& hpos > tohpos
pos = prev_pos;
pos_byte = prev_pos_byte;
hpos = prev_hpos;
+ vpos = prev_vpos;
tab_offset = prev_tab_offset;
}
break;
W_ ^---- next after the point
^---- next char. after the point.
----------
- In case of wide-column character
+ In case of wide-column character
The problem here is continuation at a wide-column character.
In this case, the line may shorter less than WIDTH.
{
if (hscroll
|| (truncate_partial_width_windows
- && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
+ && width + 1 < FRAME_COLS (XFRAME (WINDOW_FRAME (win))))
|| !NILP (current_buffer->truncate_lines))
{
/* Truncating: skip to newline, unless we are already past
if (pos >= next_boundary)
next_boundary = pos + 1;
prev_hpos = width;
+ prev_vpos = vpos;
prev_tab_offset = tab_offset;
}
}
vpos++;
contin_hpos = prev_hpos;
prev_hpos = 0;
+ prev_vpos = vpos;
}
}
pos = prev_pos;
pos_byte = prev_pos_byte;
hpos = prev_hpos;
+ vpos = prev_vpos;
tab_offset = prev_tab_offset;
/* NOTE on contin_hpos, hpos, and prev_hpos.
hpos = contin_hpos;
vpos = vpos - 1;
}
- else if (c == '\n')
- /* If previous character is NEWLINE,
- set VPOS back to previous line */
- vpos = vpos - 1;
break;
}
- if (vpos > tovpos || vpos == tovpos && hpos >= tohpos)
+ if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
{
if (contin_hpos && prev_hpos == 0
&& hpos > tohpos
pos = prev_pos;
pos_byte = prev_pos_byte;
hpos = prev_hpos;
+ vpos = prev_vpos;
tab_offset = prev_tab_offset;
}
break;
break;
prev_hpos = hpos;
+ prev_vpos = vpos;
prev_pos = pos;
prev_pos_byte = pos_byte;
wide_column_end_hpos = 0;
{
EMACS_INT i, n;
Lisp_Object charvec;
-
+
c = FETCH_BYTE (pos_byte);
/* Check composition sequence. */
/* This should be handled the same as
next_element_from_display_vector does it. */
Lisp_Object entry = AREF (charvec, i);
-
+
if (INTEGERP (entry)
&& GLYPH_CHAR_VALID_P (XFASTINT (entry)))
c = FAST_GLYPH_CHAR (XFASTINT (entry));
else
c = ' ';
}
-
+
if (c >= 040 && c < 0177)
hpos++;
else if (c == '\t')
else if (c == '\n')
{
if (selective > 0
- && indented_beyond_p (pos, pos_byte, selective))
+ && indented_beyond_p (pos, pos_byte,
+ (double) selective)) /* iftc */
{
/* If (pos == to), we don't have to take care of
selective display. */
pos_byte = CHAR_TO_BYTE (pos);
}
while (pos < to
- && indented_beyond_p (pos, pos_byte, selective));
+ && indented_beyond_p (pos, pos_byte,
+ (double) selective)); /* iftc */
/* Allow for the " ..." that is displayed for them. */
if (selective_rlen)
{
register int from, vtarget;
struct window *w;
{
- int width = window_internal_width (w) - 1;
+ int width = window_box_text_cols (w);
int hscroll = XINT (w->hscroll);
struct position pos;
/* vpos is cumulative vertical position, changed as from is changed */
XSETWINDOW (window, w);
+ /* We must make room for continuation marks if we don't have fringes. */
+#ifdef HAVE_WINDOW_SYSTEM
+ if (!FRAME_WINDOW_P (XFRAME (w->frame)))
+#endif
+ width -= 1;
+
/* If the window contains this buffer, use it for getting text properties.
Otherwise use the current buffer as arg for doing that. */
if (EQ (w->buffer, Fcurrent_buffer ()))
&& ((selective > 0
&& indented_beyond_p (XFASTINT (prevline),
CHAR_TO_BYTE (XFASTINT (prevline)),
- selective))
+ (double) selective)) /* iftc */
/* watch out for newlines with `invisible' property */
|| (propval = Fget_char_property (prevline,
Qinvisible,
lmargin + (XFASTINT (prevline) == BEG
? start_hpos : 0),
0,
- from,
+ from,
/* Don't care for VPOS... */
1 << (BITS_PER_SHORT - 1),
/* ... nor HPOS. */
&& ((selective > 0
&& indented_beyond_p (XFASTINT (prevline),
CHAR_TO_BYTE (XFASTINT (prevline)),
- selective))
+ (double) selective)) /* iftc */
/* watch out for newlines with `invisible' property */
|| (propval = Fget_char_property (prevline, Qinvisible,
text_prop_object),
lmargin + (XFASTINT (prevline) == BEG
? start_hpos : 0),
0,
- from,
+ from,
/* Don't care for VPOS... */
1 << (BITS_PER_SHORT - 1),
/* ... nor HPOS. */
old_buffer = w->buffer;
XSETBUFFER (w->buffer, current_buffer);
}
-
+
SET_TEXT_POS (pt, PT, PT_BYTE);
start_display (&it, w, pt);
- move_it_by_lines (&it, XINT (lines), 0);
+
+ /* Move to the start of the display line containing PT. If we don't
+ do this, we start moving with IT->current_x == 0, while PT is
+ really at some x > 0. The effect is, in continuation lines, that
+ we end up with the iterator placed at where it thinks X is 0,
+ while the end position is really at some X > 0, the same X that
+ PT had. */
+ move_it_by_lines (&it, 0, 0);
+
+ if (XINT (lines) != 0)
+ move_it_by_lines (&it, XINT (lines), 0);
+
SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
if (BUFFERP (old_buffer))
w->buffer = old_buffer;
-
+
RETURN_UNGCPRO (make_number (it.vpos));
}
defsubr (&Svertical_motion);
defsubr (&Scompute_motion);
}
+
+/* arch-tag: 9adfea44-71f7-4988-8ee3-96da15c502cc
+ (do not change this comment) */