annotate src/indent.c @ 13616:0e584934cd9e

[LINUX] (LINUX_SBRK_BUG): Defined.
author Richard M. Stallman <rms@gnu.org>
date Tue, 21 Nov 1995 16:55:17 +0000
parents ea373c55ed95
children a46002ac278b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Indentation functions.
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
2 Copyright (C) 1985,86,87,88,93,94,95 Free Software Foundation, Inc.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4 This file is part of GNU Emacs.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 GNU Emacs is free software; you can redistribute it and/or modify
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
12244
ac7375e60931 Update GPL to version 2.
Karl Heuer <kwzh@gnu.org>
parents: 12090
diff changeset
8 the Free Software Foundation; either version 2, or (at your option)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 any later version.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU General Public License for more details.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 along with GNU Emacs; see the file COPYING. If not, write to
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4385
diff changeset
21 #include <config.h>
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22 #include "lisp.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include "buffer.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "indent.h"
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
25 #include "frame.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include "window.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include "termchar.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 #include "termopts.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include "disptab.h"
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
30 #include "intervals.h"
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
31 #include "region-cache.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 /* Indentation can insert tabs if this is non-zero;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 otherwise always uses spaces */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 int indent_tabs_mode;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 #define min(a, b) ((a) < (b) ? (a) : (b))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 #define max(a, b) ((a) > (b) ? (a) : (b))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 #define CR 015
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 /* These three values memoize the current column to avoid recalculation */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 /* Some things in set last_known_column_point to -1
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 to mark the memoized value as invalid */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 /* Last value returned by current_column */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46 int last_known_column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47 /* Value of point when current_column was called */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48 int last_known_column_point;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49 /* Value of MODIFF when current_column was called */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50 int last_known_column_modified;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
51
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
52 /* Get the display table to use for the current buffer. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
54 struct Lisp_Char_Table *
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 buffer_display_table ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57 Lisp_Object thisbuf;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
59 thisbuf = current_buffer->display_table;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
60 if (DISP_TABLE_P (thisbuf))
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
61 return XCHAR_TABLE (thisbuf);
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
62 if (DISP_TABLE_P (Vstandard_display_table))
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
63 return XCHAR_TABLE (Vstandard_display_table);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64 return 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
67 /* Width run cache considerations. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
68
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
69 /* Return the width of character C under display table DP. */
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
70
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
71 static int
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
72 character_width (c, dp)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
73 int c;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
74 struct Lisp_Char_Table *dp;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
75 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
76 Lisp_Object elt;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
77
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
78 /* These width computations were determined by examining the cases
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
79 in display_text_line. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
80
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
81 /* Everything can be handled by the display table, if it's
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
82 present and the element is right. */
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
83 if (dp && (elt = DISP_CHAR_VECTOR (dp, c), VECTORP (elt)))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
84 return XVECTOR (elt)->size;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
85
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
86 /* Some characters are special. */
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
87 if (c == '\n' || c == '\t' || c == '\015')
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
88 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
89
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
90 /* Printing characters have width 1. */
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
91 else if (c >= 040 && c < 0177)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
92 return 1;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
93
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
94 /* Everybody else (control characters, metacharacters) has other
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
95 widths. We could return their actual widths here, but they
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
96 depend on things like ctl_arrow and crud like that, and they're
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
97 not very common at all. So we'll just claim we don't know their
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
98 widths. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
99 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
100 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
101 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
102
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
103 /* Return true iff the display table DISPTAB specifies the same widths
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
104 for characters as WIDTHTAB. We use this to decide when to
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
105 invalidate the buffer's width_run_cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
106 int
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
107 disptab_matches_widthtab (disptab, widthtab)
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
108 struct Lisp_Char_Table *disptab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
109 struct Lisp_Vector *widthtab;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
110 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
111 int i;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
112
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
113 if (widthtab->size != 256)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
114 abort ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
115
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
116 for (i = 0; i < 256; i++)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
117 if (character_width (i, disptab)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
118 != XFASTINT (widthtab->contents[i]))
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
119 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
120
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
121 return 1;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
122 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
123
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
124 /* Recompute BUF's width table, using the display table DISPTAB. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
125 void
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
126 recompute_width_table (buf, disptab)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
127 struct buffer *buf;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
128 struct Lisp_Char_Table *disptab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
129 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
130 int i;
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
131 struct Lisp_Vector *widthtab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
132
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
133 if (!VECTORP (buf->width_table))
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
134 buf->width_table = Fmake_vector (make_number (256), make_number (0));
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
135 widthtab = XVECTOR (buf->width_table);
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
136 if (widthtab->size != 256)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
137 abort ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
138
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
139 for (i = 0; i < 256; i++)
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
140 XSETFASTINT (widthtab->contents[i], character_width (i, disptab));
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
141 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
142
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
143 /* Allocate or free the width run cache, as requested by the current
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
144 state of current_buffer's cache_long_line_scans variable. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
145 static void
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
146 width_run_cache_on_off ()
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
147 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
148 if (NILP (current_buffer->cache_long_line_scans))
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
149 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
150 /* It should be off. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
151 if (current_buffer->width_run_cache)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
152 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
153 free_region_cache (current_buffer->width_run_cache);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
154 current_buffer->width_run_cache = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
155 current_buffer->width_table = Qnil;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
156 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
157 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
158 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
159 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
160 /* It should be on. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
161 if (current_buffer->width_run_cache == 0)
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
162 {
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
163 current_buffer->width_run_cache = new_region_cache ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
164 recompute_width_table (current_buffer, buffer_display_table ());
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
165 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
166 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
167 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
168
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
169
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171 "Return the horizontal position of point. Beginning of line is column 0.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 This is calculated by adding together the widths of all the displayed\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173 representations of the character between the start of the previous line\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 and point. (eg control characters will have a width of 2 or 4, tabs\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175 will have a variable width)\n\
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
176 Ignores finite width of frame, which means that this function may return\n\
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
177 values greater than (frame-width).\n\
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 Whether the line is visible (if `selective-display' is t) has no effect;\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
179 however, ^M is treated as end of line when `selective-display' is t.")
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 Lisp_Object temp;
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
183 XSETFASTINT (temp, current_column ());
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 return temp;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186
327
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
187 /* Cancel any recorded value of the horizontal position. */
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
188
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
189 invalidate_current_column ()
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
190 {
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
191 last_known_column_point = 0;
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
192 }
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
193
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
194 int
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195 current_column ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 register int col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 register unsigned char *ptr, *stop;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 register int tab_seen;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 int post_tab;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 register int c;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202 register int tab_width = XINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
203 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
204 register struct Lisp_Char_Table *dp = buffer_display_table ();
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 int stopchar;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207 if (point == last_known_column_point
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208 && MODIFF == last_known_column_modified)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 return last_known_column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 /* Make a pointer for decrementing through the chars before point. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 ptr = &FETCH_CHAR (point - 1) + 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 /* Make a pointer to where consecutive chars leave off,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 going backwards from point. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 if (point == BEGV)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 stop = ptr;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 else if (point <= GPT || BEGV > GPT)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218 stop = BEGV_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 else
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 stop = GAP_END_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
222 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 col = 0, tab_seen = 0, post_tab = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 while (1)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 if (ptr == stop)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 /* We stopped either for the beginning of the buffer
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 or for the gap. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 if (ptr == BEGV_ADDR)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 /* It was the gap. Jump back over it. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 stop = BEGV_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 ptr = GPT_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 /* Check whether that brings us to beginning of buffer. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 if (BEGV >= GPT) break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 c = *--ptr;
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
242 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
243 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
244 else if (c >= 040 && c < 0177)
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
245 col++;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 else if (c == '\n')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
247 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248 else if (c == '\r' && EQ (current_buffer->selective_display, Qt))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
249 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 else if (c == '\t')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 if (tab_seen)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 col = ((col + tab_width) / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
255 post_tab += col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
256 col = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
257 tab_seen = 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259 else
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
260 col += (ctl_arrow && c < 0200) ? 2 : 4;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 if (tab_seen)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
265 col = ((col + tab_width) / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
266 col += post_tab;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
267 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
268
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 last_known_column = col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
270 last_known_column_point = point;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 return col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
276 /* Return the width in columns of the part of STRING from BEG to END.
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
277 If BEG is nil, that stands for the beginning of STRING.
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
278 If END is nil, that stands for the end of STRING. */
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
279
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
280 static int
11704
6c9716b7a23d (string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents: 11312
diff changeset
281 string_display_width (string, beg, end)
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
282 Lisp_Object string, beg, end;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
283 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
284 register int col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
285 register unsigned char *ptr, *stop;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
286 register int tab_seen;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
287 int post_tab;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
288 register int c;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
289 register int tab_width = XINT (current_buffer->tab_width);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
290 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
291 register struct Lisp_Char_Table *dp = buffer_display_table ();
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
292 int b, e;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
293
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
294 if (NILP (end))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
295 e = XSTRING (string)->size;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
296 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
297 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
298 CHECK_NUMBER (end, 0);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
299 e = XINT (end);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
300 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
301
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
302 if (NILP (beg))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
303 b = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
304 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
305 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
306 CHECK_NUMBER (beg, 0);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
307 b = XINT (beg);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
308 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
309
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
310 /* Make a pointer for decrementing through the chars before point. */
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
311 ptr = XSTRING (string)->data + e;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
312 /* Make a pointer to where consecutive chars leave off,
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
313 going backwards from point. */
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
314 stop = XSTRING (string)->data + b;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
315
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
316 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
317
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
318 col = 0, tab_seen = 0, post_tab = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
319
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
320 while (1)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
321 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
322 if (ptr == stop)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
323 break;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
324
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
325 c = *--ptr;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
326 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
327 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
328 else if (c >= 040 && c < 0177)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
329 col++;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
330 else if (c == '\n')
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
331 break;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
332 else if (c == '\t')
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
333 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
334 if (tab_seen)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
335 col = ((col + tab_width) / tab_width) * tab_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
336
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
337 post_tab += col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
338 col = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
339 tab_seen = 1;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
340 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
341 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
342 col += (ctl_arrow && c < 0200) ? 2 : 4;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
343 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
344
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
345 if (tab_seen)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
346 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
347 col = ((col + tab_width) / tab_width) * tab_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
348 col += post_tab;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
349 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
350
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
351 return col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
352 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
353
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ",
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355 "Indent from point with tabs and spaces until COLUMN is reached.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 Optional second argument MIN says always do at least MIN spaces\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 even if that goes past COLUMN; by default, MIN is zero.")
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 (col, minimum)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
359 Lisp_Object col, minimum;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
360 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361 int mincol;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 register int fromcol;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 register int tab_width = XINT (current_buffer->tab_width);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
365 CHECK_NUMBER (col, 0);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
366 if (NILP (minimum))
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
367 XSETFASTINT (minimum, 0);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 CHECK_NUMBER (minimum, 1);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
370 fromcol = current_column ();
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 mincol = fromcol + XINT (minimum);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 if (mincol < XINT (col)) mincol = XINT (col);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
374 if (fromcol == mincol)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
375 return make_number (mincol);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
376
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
377 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
379 if (indent_tabs_mode)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
380 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
381 Lisp_Object n;
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
382 XSETFASTINT (n, mincol / tab_width - fromcol / tab_width);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
383 if (XFASTINT (n) != 0)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
384 {
8648
f047d8c6db79 (Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents: 8601
diff changeset
385 Finsert_char (make_number ('\t'), n, Qt);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
386
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
387 fromcol = (mincol / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
388 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
389 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
391 XSETFASTINT (col, mincol - fromcol);
8648
f047d8c6db79 (Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents: 8601
diff changeset
392 Finsert_char (make_number (' '), col, Qt);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394 last_known_column = mincol;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 last_known_column_point = point;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398 XSETINT (col, mincol);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399 return col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
401
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
404 0, 0, 0,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
405 "Return the indentation of the current line.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406 This is the horizontal position of the character\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
407 following any initial whitespace.")
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
408 ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
409 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
410 Lisp_Object val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
411
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
412 XSETFASTINT (val, position_indentation (find_next_newline (point, -1)));
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
413 return val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
414 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
415
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
416 position_indentation (pos)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
418 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
419 register int column = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
420 register int tab_width = XINT (current_buffer->tab_width);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
421 register unsigned char *p;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
422 register unsigned char *stop;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
423
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
424 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
425
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426 stop = &FETCH_CHAR (BUFFER_CEILING_OF (pos)) + 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
427 p = &FETCH_CHAR (pos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
428 while (1)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
430 while (p == stop)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
431 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432 if (pos == ZV)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
433 return column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
434 pos += p - &FETCH_CHAR (pos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
435 p = &FETCH_CHAR (pos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
436 stop = &FETCH_CHAR (BUFFER_CEILING_OF (pos)) + 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
437 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
438 switch (*p++)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
439 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 case ' ':
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 column++;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
443 case '\t':
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
444 column += tab_width - column % tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446 default:
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447 return column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
448 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
449 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
450 }
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
451
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
452 /* Test whether the line beginning at POS is indented beyond COLUMN.
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
453 Blank lines are treated as if they had the same indentation as the
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
454 preceding line. */
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
455 int
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
456 indented_beyond_p (pos, column)
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
457 int pos, column;
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
458 {
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
459 while (pos > BEGV && FETCH_CHAR (pos) == '\n')
7892
cabad721720f (vmotion): Use find_next_newline_no_quit.
Richard M. Stallman <rms@gnu.org>
parents: 7566
diff changeset
460 pos = find_next_newline_no_quit (pos - 1, -1);
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
461 return (position_indentation (pos) >= column);
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
462 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
463
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464
13124
e44b06fc718d (Fmove_to_column): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 12244
diff changeset
465 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
466 "Move point to column COLUMN in the current line.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
467 The column of a character is calculated by adding together the widths\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 as displayed of the previous characters in the line.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
469 This function ignores line-continuation;\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 there is no upper limit on the column number a character can have\n\
1208
fa662930e654 * indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
471 and horizontal scrolling has no effect.\n\
fa662930e654 * indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
472 \n\
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
473 If specified column is within a character, point goes after that character.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
474 If it's past end of line, point goes to end of line.\n\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
475 A non-nil second (optional) argument FORCE means, if the line\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
476 is too short to reach column COLUMN then add spaces/tabs to get there,\n\
13453
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
477 and if COLUMN is in the middle of a tab character, change it to spaces.\n\
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
478 \n\
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
479 The return value is the current column.")
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
480 (column, force)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
481 Lisp_Object column, force;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
483 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 register int col = current_column ();
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 register int goal;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
486 register int end;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 register int tab_width = XINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
488 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
489 register struct Lisp_Char_Table *dp = buffer_display_table ();
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491 Lisp_Object val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
492 int prev_col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 int c;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
495 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
496 CHECK_NATNUM (column, 0);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
497 goal = XINT (column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499 retry:
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500 pos = point;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 end = ZV;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
503 /* If we're starting past the desired column,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
504 back up to beginning of line and scan from there. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
505 if (col > goal)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 pos = find_next_newline (pos, -1);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
508 col = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
510
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
511 while (col < goal && pos < end)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
512 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
513 c = FETCH_CHAR (pos);
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
514 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
515 {
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
516 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
517 pos++;
11312
f48922d85166 (Fmove_to_column): Fix minor bug in prev change.
Richard M. Stallman <rms@gnu.org>
parents: 11300
diff changeset
518 continue;
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
519 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
520 if (c == '\n')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
521 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
522 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
523 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
524 pos++;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 if (c == '\t')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 prev_col = col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
528 col += tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
529 col = col / tab_width * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
530 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
531 else if (ctl_arrow && (c < 040 || c == 0177))
5162
9672138155c1 (Fmove_to_column): Increments for control characters
Richard M. Stallman <rms@gnu.org>
parents: 5085
diff changeset
532 col += 2;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
533 else if (c < 040 || c >= 0177)
5162
9672138155c1 (Fmove_to_column): Increments for control characters
Richard M. Stallman <rms@gnu.org>
parents: 5085
diff changeset
534 col += 4;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
535 else
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
536 col++;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
537 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
538
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
539 SET_PT (pos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
540
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
541 /* If a tab char made us overshoot, change it to spaces
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
542 and scan through it again. */
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
543 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
544 {
573
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
545 int old_point;
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
546
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547 del_range (point - 1, point);
573
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
548 Findent_to (make_number (goal), Qnil);
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
549 old_point = point;
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
550 Findent_to (make_number (col), Qnil);
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
551 SET_PT (old_point);
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
552 /* Set the last_known... vars consistently. */
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
553 col = goal;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 /* If line ends prematurely, add space to the end. */
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
557 if (col < goal && !NILP (force))
1208
fa662930e654 * indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
558 Findent_to (make_number (col = goal), Qnil);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
560 last_known_column = col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
561 last_known_column_point = point;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
562 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
563
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
564 XSETFASTINT (val, col);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
565 return val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
566 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
567
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
568
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
569 /* compute_motion: compute buffer posn given screen posn and vice versa */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
570
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
571 struct position val_compute_motion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
572
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
573 /* Scan the current buffer forward from offset FROM, pretending that
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
574 this is at line FROMVPOS, column FROMHPOS, until reaching buffer
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
575 offset TO or line TOVPOS, column TOHPOS (whichever comes first),
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
576 and return the ending buffer position and screen location. If we
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
577 can't hit the requested column exactly (because of a tab or other
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
578 multi-column character), overshoot.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
579
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
580 DID_MOTION is 1 if FROMHPOS has already accounted for overlay strings
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
581 at FROM. This is the case if FROMVPOS and FROMVPOS came from an
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
582 earlier call to compute_motion. The other common case is that FROMHPOS
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
583 is zero and FROM is a position that "belongs" at column zero, but might
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
584 be shifted by overlay strings; in this case DID_MOTION should be 0.
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
585
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
586 WIDTH is the number of columns available to display text;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
587 compute_motion uses this to handle continuation lines and such.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588 HSCROLL is the number of columns not being displayed at the left
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589 margin; this is usually taken from a window's hscroll member.
543
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
590 TAB_OFFSET is the number of columns of the first tab that aren't
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
591 being displayed, perhaps because of a continuation line or
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
592 something.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
593
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
594 compute_motion returns a pointer to a struct position. The bufpos
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
595 member gives the buffer position at the end of the scan, and hpos
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
596 and vpos give its cartesian location. prevhpos is the column at
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
597 which the character before bufpos started, and contin is non-zero
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
598 if we reached the current line by continuing the previous.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
599
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
600 Note that FROMHPOS and TOHPOS should be expressed in real screen
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
601 columns, taking HSCROLL and the truncation glyph at the left margin
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
602 into account. That is, beginning-of-line moves you to the hpos
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
603 -HSCROLL + (HSCROLL > 0).
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
604
6400
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
605 Note that FROMHPOS and TOHPOS should be expressed in real screen
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
606 columns, taking HSCROLL and the truncation glyph at the left margin
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
607 into account. That is, beginning-of-line moves you to the hpos
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
608 -HSCROLL + (HSCROLL > 0).
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
609
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
610 For example, to find the buffer position of column COL of line LINE
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
611 of a certain window, pass the window's starting location as FROM
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
612 and the window's upper-left coordinates as FROMVPOS and FROMHPOS.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
613 Pass the buffer's ZV as TO, to limit the scan to the end of the
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
614 visible section of the buffer, and pass LINE and COL as TOVPOS and
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
615 TOHPOS.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
616
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
617 When displaying in window w, a typical formula for WIDTH is:
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
618
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
619 window_width - 1
1994
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
620 - (has_vertical_scroll_bars
8946
f2249e034d50 (compute_motion): Fix comment.
Karl Heuer <kwzh@gnu.org>
parents: 8905
diff changeset
621 ? FRAME_SCROLL_BAR_COLS (XFRAME (window->frame))
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
622 : (window_width + window_left != frame_width))
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
623
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
624 where
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
625 window_width is XFASTINT (w->width),
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
626 window_left is XFASTINT (w->left),
1994
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
627 has_vertical_scroll_bars is
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
628 FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (window)))
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
629 and frame_width = FRAME_WIDTH (XFRAME (window->frame))
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
630
6400
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
631 Or you can let window_internal_width do this all for you, and write:
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
632 window_internal_width (w) - 1
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
633
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
634 The `-1' accounts for the continuation-line backslashes; the rest
5941
c4cceb65fc5a Fix comments.
Karl Heuer <kwzh@gnu.org>
parents: 5845
diff changeset
635 accounts for window borders if the window is split horizontally, and
6400
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
636 the scroll bars if they are turned on. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
637
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
638 struct position *
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
639 compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
640 int from, fromvpos, fromhpos, to, tovpos, tohpos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
641 int did_motion;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
642 register int width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
643 int hscroll, tab_offset;
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
644 struct window *win;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
645 {
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
646 register int hpos = fromhpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
647 register int vpos = fromvpos;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
648
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
649 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
650 register int c;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
651 register int tab_width = XFASTINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
652 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
653 register struct Lisp_Char_Table *dp = window_display_table (win);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
654 int selective
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
655 = (INTEGERP (current_buffer->selective_display)
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
656 ? XINT (current_buffer->selective_display)
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
657 : !NILP (current_buffer->selective_display) ? -1 : 0);
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
658 int prev_vpos = vpos, prev_hpos = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
659 int selective_rlen
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
660 = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
2017
ffa43acb7de7 (current_column, Fmove_to_column, compute_motion):
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
661 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
662 /* The next location where the `invisible' property changes, or an
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
663 overlay starts or ends. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
664 int next_boundary = from;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
665
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
666 /* For computing runs of characters with similar widths.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
667 Invariant: width_run_width is zero, or all the characters
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
668 from width_run_start to width_run_end have a fixed width of
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
669 width_run_width. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
670 int width_run_start = from;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
671 int width_run_end = from;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
672 int width_run_width = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
673 Lisp_Object *width_table;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
674 Lisp_Object buffer;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
675
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
676 /* The next buffer pos where we should consult the width run cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
677 int next_width_run = from;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
678
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
679 XSETBUFFER (buffer, current_buffer);
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
680
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
681 width_run_cache_on_off ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
682 if (dp == buffer_display_table ())
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
683 width_table = (VECTORP (current_buffer->width_table)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
684 ? XVECTOR (current_buffer->width_table)->contents
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
685 : 0);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
686 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
687 /* If the window has its own display table, we can't use the width
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
688 run cache, because that's based on the buffer's display table. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
689 width_table = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
690
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
691 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
692
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
693 pos = from;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
694 while (1)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
695 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
696 while (pos == next_boundary)
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
697 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
698 /* If the caller says that the screen position came from an earlier
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
699 call to compute_motion, then we've already accounted for the
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
700 overlay strings at point. This is only true the first time
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
701 through, so clear the flag after testing it. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
702 if (!did_motion)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
703 /* We need to skip past the overlay strings. Currently those
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
704 strings must contain single-column printing characters;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
705 if we want to relax that restriction, something will have
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
706 to be changed here. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
707 hpos += overlay_strings (pos, win, (char **)0);
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
708 did_motion = 0;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
709
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
710 if (pos >= to)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
711 break;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
712
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
713 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
714 Lisp_Object prop, position, end, limit, proplimit;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
715
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
716 XSETFASTINT (position, pos);
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
717
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
718 /* Give faster response for overlay lookup near POS. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
719 recenter_overlay_lists (current_buffer, pos);
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
720
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
721 /* We must not advance farther than the next overlay change.
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
722 The overlay change might change the invisible property;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
723 or there might be overlay strings to be displayed there. */
6092
a3e4e8ac2a33 (compute_motion): Allow for invisible overlays in next_invisible lookahead.
Karl Heuer <kwzh@gnu.org>
parents: 6067
diff changeset
724 limit = Fnext_overlay_change (position);
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
725 /* As for text properties, this gives a lower bound
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
726 for where the invisible text property could change. */
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
727 proplimit = Fnext_property_change (position, buffer, Qt);
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
728 if (XFASTINT (limit) < XFASTINT (proplimit))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
729 proplimit = limit;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
730 /* PROPLIMIT is now a lower bound for the next change
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
731 in invisible status. If that is plenty far away,
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
732 use that lower bound. */
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
733 if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to)
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
734 next_boundary = XFASTINT (proplimit);
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
735 /* Otherwise, scan for the next `invisible' property change. */
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
736 else
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
737 {
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
738 /* Don't scan terribly far. */
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
739 XSETFASTINT (proplimit, min (pos + 100, to));
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
740 /* No matter what. don't go past next overlay change. */
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
741 if (XFASTINT (limit) < XFASTINT (proplimit))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
742 proplimit = limit;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
743 end = Fnext_single_property_change (position, Qinvisible,
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
744 buffer, proplimit);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
745 next_boundary = XFASTINT (end);
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
746 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
747 /* if the `invisible' property is set, we can skip to
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
748 the next property change */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
749 prop = Fget_char_property (position, Qinvisible,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
750 Fcurrent_buffer ());
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
751 if (TEXT_PROP_MEANS_INVISIBLE (prop))
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
752 pos = next_boundary;
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
753 }
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
754 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
755
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
756 /* Handle right margin. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
757 if (hpos >= width
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
758 && (hpos > width
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
759 || (pos < ZV && FETCH_CHAR (pos) != '\n')))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
760 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
761 if (hscroll
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
762 || (truncate_partial_width_windows
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
763 && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
764 || !NILP (current_buffer->truncate_lines))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
765 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
766 /* Truncating: skip to newline. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
767 pos = find_before_next_newline (pos, to, 1);
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
768 hpos = width;
13453
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
769 /* If we just skipped next_boundary,
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
770 loop around in the main while
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
771 and handle it. */
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
772 if (pos >= next_boundary)
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
773 next_boundary = pos + 1;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
774 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
775 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
776 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
777 /* Continuing. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
778 vpos += hpos / width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
779 tab_offset += hpos - hpos % width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
780 hpos %= width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
781 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
782 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
783
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
784 /* Stop if past the target buffer position or screen position. */
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
785 if (pos >= to)
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
786 break;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
787 if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
788 break;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
789
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
790 prev_vpos = vpos;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
791 prev_hpos = hpos;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
792
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
793 /* Consult the width run cache to see if we can avoid inspecting
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
794 the text character-by-character. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
795 if (current_buffer->width_run_cache && pos >= next_width_run)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
796 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
797 int run_end;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
798 int common_width
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
799 = region_cache_forward (current_buffer,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
800 current_buffer->width_run_cache,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
801 pos, &run_end);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
802
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
803 /* A width of zero means the character's width varies (like
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
804 a tab), is meaningless (like a newline), or we just don't
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
805 want to skip over it for some other reason. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
806 if (common_width != 0)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
807 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
808 int run_end_hpos;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
809
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
810 /* Don't go past the final buffer posn the user
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
811 requested. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
812 if (run_end > to)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
813 run_end = to;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
814
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
815 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
816
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
817 /* Don't go past the final horizontal position the user
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
818 requested. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
819 if (vpos == tovpos && run_end_hpos > tohpos)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
820 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
821 run_end = pos + (tohpos - hpos) / common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
822 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
823 }
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
824
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
825 /* Don't go past the margin. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
826 if (run_end_hpos >= width)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
827 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
828 run_end = pos + (width - hpos) / common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
829 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
830 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
831
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
832 hpos = run_end_hpos;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
833 if (run_end > pos)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
834 prev_hpos = hpos - common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
835 pos = run_end;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
836 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
837
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
838 next_width_run = run_end + 1;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
839 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
840
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
841 /* We have to scan the text character-by-character. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
842 else
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
843 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
844 c = FETCH_CHAR (pos);
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
845 pos++;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
846
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
847 /* Perhaps add some info to the width_run_cache. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
848 if (current_buffer->width_run_cache)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
849 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
850 /* Is this character part of the current run? If so, extend
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
851 the run. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
852 if (pos - 1 == width_run_end
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
853 && width_table[c] == width_run_width)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
854 width_run_end = pos;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
855
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
856 /* The previous run is over, since this is a character at a
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
857 different position, or a different width. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
858 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
859 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
860 /* Have we accumulated a run to put in the cache?
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
861 (Currently, we only cache runs of width == 1). */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
862 if (width_run_start < width_run_end
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
863 && width_run_width == 1)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
864 know_region_cache (current_buffer,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
865 current_buffer->width_run_cache,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
866 width_run_start, width_run_end);
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
867
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
868 /* Start recording a new width run. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
869 width_run_width = width_table[c];
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
870 width_run_start = pos - 1;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
871 width_run_end = pos;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
872 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
873 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
874
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
875 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
876 hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
877 else if (c >= 040 && c < 0177)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
878 hpos++;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
879 else if (c == '\t')
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
880 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
881 int tem = (hpos + tab_offset + hscroll - (hscroll > 0)) % tab_width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
882 if (tem < 0)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
883 tem += tab_width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
884 hpos += tab_width - tem;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
885 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
886 else if (c == '\n')
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
887 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
888 if (selective > 0 && indented_beyond_p (pos, selective))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
889 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
890 /* Skip any number of invisible lines all at once */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
891 do
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
892 pos = find_before_next_newline (pos, to, 1) + 1;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
893 while (pos < to
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
894 && indented_beyond_p (pos, selective));
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
895 /* Allow for the " ..." that is displayed for them. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
896 if (selective_rlen)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
897 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
898 hpos += selective_rlen;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
899 if (hpos >= width)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
900 hpos = width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
901 }
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
902 --pos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
903 /* We have skipped the invis text, but not the
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
904 newline after. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
905 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
906 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
907 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
908 /* A visible line. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
909 vpos++;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
910 hpos = 0;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
911 hpos -= hscroll;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
912 /* Count the truncation glyph on column 0 */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
913 if (hscroll > 0)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
914 hpos++;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
915 tab_offset = 0;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
916 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
917 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
918 else if (c == CR && selective < 0)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
919 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
920 /* In selective display mode,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
921 everything from a ^M to the end of the line is invisible.
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
922 Stop *before* the real newline. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
923 pos = find_before_next_newline (pos, to, 1);
13453
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
924 /* If we just skipped next_boundary,
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
925 loop around in the main while
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
926 and handle it. */
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
927 if (pos > next_boundary)
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
928 next_boundary = pos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
929 /* Allow for the " ..." that is displayed for them. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
930 if (selective_rlen)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
931 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
932 hpos += selective_rlen;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
933 if (hpos >= width)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
934 hpos = width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
935 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
936 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
937 else
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
938 hpos += (ctl_arrow && c < 0200) ? 2 : 4;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
941
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
942 /* Remember any final width run in the cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
943 if (current_buffer->width_run_cache
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
944 && width_run_width == 1
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
945 && width_run_start < width_run_end)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
946 know_region_cache (current_buffer, current_buffer->width_run_cache,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
947 width_run_start, width_run_end);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
948
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
949 val_compute_motion.bufpos = pos;
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
950 val_compute_motion.hpos = hpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
951 val_compute_motion.vpos = vpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
952 val_compute_motion.prevhpos = prev_hpos;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
953
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
954 /* Nonzero if have just continued a line */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
955 val_compute_motion.contin
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
956 = (pos != from
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
957 && (val_compute_motion.vpos != prev_vpos)
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
958 && c != '\n');
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
959
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
960 return &val_compute_motion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
961 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
962
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
963 #if 0 /* The doc string is too long for some compilers,
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
964 but make-docfile can find it in this comment. */
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
965 DEFUN ("compute-motion", Ffoo, Sfoo, 7, 7, 0,
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
966 "Scan through the current buffer, calculating screen position.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
967 Scan the current buffer forward from offset FROM,\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
968 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
969 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
970 and return the ending buffer position and screen location.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
971 \n\
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
972 There are three additional arguments:\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
973 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
974 WIDTH is the number of columns available to display text;\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
975 this affects handling of continuation lines.\n\
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
976 This is usually the value returned by `window-width', less one (to allow\n\
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
977 for the continuation glyph).\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
978 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
979 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
980 HSCROLL is the number of columns not being displayed at the left\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
981 margin; this is usually taken from a window's hscroll member.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
982 TAB-OFFSET is the number of columns of the first tab that aren't\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
983 being displayed, perhaps because the line was continued within it.\n\
6585
0e26a2431fa2 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6573
diff changeset
984 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
985 \n\
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
986 WINDOW is the window to operate on. Currently this is used only to\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
987 find the display table. It does not matter what buffer WINDOW displays;\n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
988 `compute-motion' always operates on the current buffer.\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
989 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
990 The value is a list of five elements:\n\
6586
de99006a8b38 (Fcompute_motion): Don't use XFASTINT on possibly-negative coords.
Karl Heuer <kwzh@gnu.org>
parents: 6585
diff changeset
991 (POS HPOS VPOS PREVHPOS CONTIN)\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
992 POS is the buffer position where the scan stopped.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
993 VPOS is the vertical position where the scan stopped.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
994 HPOS is the horizontal position where the scan stopped.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
995 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
996 PREVHPOS is the horizontal position one character back from POS.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
997 CONTIN is t if a line was continued after (or within) the previous character.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
998 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
999 For example, to find the buffer position of column COL of line LINE\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1000 of a certain window, pass the window's starting location as FROM\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1001 and the window's upper-left coordinates as FROMPOS.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1002 Pass the buffer's (point-max) as TO, to limit the scan to the end of the\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1003 visible section of the buffer, and pass LINE and COL as TOPOS.")
7566
8a0a7fb9f7d4 Add "args" to dummy definition of compute-motion.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
1004 (from, frompos, to, topos, width, offsets, window)
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1005 #endif
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1006
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1007 DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0,
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1008 0)
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1009 (from, frompos, to, topos, width, offsets, window)
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1010 Lisp_Object from, frompos, to, topos;
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1011 Lisp_Object width, offsets, window;
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1012 {
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1013 Lisp_Object bufpos, hpos, vpos, prevhpos, contin;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1014 struct position *pos;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1015 int hscroll, tab_offset;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1016
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1017 CHECK_NUMBER_COERCE_MARKER (from, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1018 CHECK_CONS (frompos, 0);
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1019 CHECK_NUMBER (XCONS (frompos)->car, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1020 CHECK_NUMBER (XCONS (frompos)->cdr, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1021 CHECK_NUMBER_COERCE_MARKER (to, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1022 CHECK_CONS (topos, 0);
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1023 CHECK_NUMBER (XCONS (topos)->car, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1024 CHECK_NUMBER (XCONS (topos)->cdr, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1025 CHECK_NUMBER (width, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1026 if (!NILP (offsets))
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1027 {
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1028 CHECK_CONS (offsets, 0);
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1029 CHECK_NUMBER (XCONS (offsets)->car, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1030 CHECK_NUMBER (XCONS (offsets)->cdr, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1031 hscroll = XINT (XCONS (offsets)->car);
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1032 tab_offset = XINT (XCONS (offsets)->cdr);
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1033 }
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1034 else
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1035 hscroll = tab_offset = 0;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1036
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1037 if (NILP (window))
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1038 window = Fselected_window ();
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1039 else
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1040 CHECK_LIVE_WINDOW (window, 0);
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1041
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1042 pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1043 XINT (XCONS (frompos)->car), 0,
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1044 XINT (to), XINT (XCONS (topos)->cdr),
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1045 XINT (XCONS (topos)->car),
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1046 XINT (width), hscroll, tab_offset,
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1047 XWINDOW (window));
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1048
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1049 XSETFASTINT (bufpos, pos->bufpos);
9269
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1050 XSETINT (hpos, pos->hpos);
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1051 XSETINT (vpos, pos->vpos);
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1052 XSETINT (prevhpos, pos->prevhpos);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1053
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1054 return Fcons (bufpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1055 Fcons (hpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1056 Fcons (vpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1057 Fcons (prevhpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1058 Fcons (pos->contin ? Qt : Qnil, Qnil)))));
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1059
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1060 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1062 /* Return the column of position POS in window W's buffer.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1063 The result is rounded down to a multiple of the internal width of W.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1064 This is the amount of indentation of position POS
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1065 that is not visible in its horizontal position in the window. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1067 int
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068 pos_tab_offset (w, pos)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069 struct window *w;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1070 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1071 {
8601
c67a4530319e (pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents: 8543
diff changeset
1072 int opoint = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1073 int col;
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
1074 int width = window_internal_width (w) - 1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1075
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1076 if (pos == BEGV || FETCH_CHAR (pos - 1) == '\n')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1077 return 0;
8601
c67a4530319e (pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents: 8543
diff changeset
1078 TEMP_SET_PT (pos);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1079 col = current_column ();
8601
c67a4530319e (pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents: 8543
diff changeset
1080 TEMP_SET_PT (opoint);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081 return col - (col % width);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1082 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1083
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1084
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1085 /* Fvertical_motion and vmotion */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086 struct position val_vmotion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088 struct position *
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1089 vmotion (from, vtarget, w)
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1090 register int from, vtarget;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1091 struct window *w;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1093 int width = window_internal_width (w) - 1;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1094 int hscroll = XINT (w->hscroll);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1095 struct position pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1096 /* vpos is cumulative vertical position, changed as from is changed */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1097 register int vpos = 0;
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1098 Lisp_Object prevline;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1099 register int first;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1100 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 int selective
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1102 = (INTEGERP (current_buffer->selective_display)
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1103 ? XINT (current_buffer->selective_display)
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1104 : !NILP (current_buffer->selective_display) ? -1 : 0);
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1105 Lisp_Object window;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1106 int start_hpos = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1107 int did_motion;
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1108
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1109 XSETWINDOW (window, w);
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1110
6811
d84152a9b7e5 (vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents: 6763
diff changeset
1111 /* The omission of the clause
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1112 && marker_position (w->start) == BEG
6811
d84152a9b7e5 (vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents: 6763
diff changeset
1113 here is deliberate; I think we want to measure from the prompt
d84152a9b7e5 (vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents: 6763
diff changeset
1114 position even if the minibuffer window has scrolled. */
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1115 if (EQ (window, minibuf_window))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1116 {
11813
5b7a7c92323d (vmotion): handle the case where `minibuf_prompt' is nil.
Karl Heuer <kwzh@gnu.org>
parents: 11811
diff changeset
1117 if (minibuf_prompt_width == 0 && STRINGP (minibuf_prompt))
11704
6c9716b7a23d (string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents: 11312
diff changeset
1118 minibuf_prompt_width
6c9716b7a23d (string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents: 11312
diff changeset
1119 = string_display_width (minibuf_prompt, Qnil, Qnil);
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1120
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1121 start_hpos = minibuf_prompt_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1122 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1123
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1124 if (vpos >= vtarget)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1125 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1126 /* To move upward, go a line at a time until
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1127 we have gone at least far enough */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1128
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1129 first = 1;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1130
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1131 while ((vpos > vtarget || first) && from > BEGV)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1132 {
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1133 Lisp_Object propval;
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1134
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1135 XSETFASTINT (prevline, find_next_newline_no_quit (from - 1, -1));
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1136 while (XFASTINT (prevline) > BEGV
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1137 && ((selective > 0
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1138 && indented_beyond_p (XFASTINT (prevline), selective))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1139 #ifdef USE_TEXT_PROPERTIES
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1140 /* watch out for newlines with `invisible' property */
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1141 || (propval = Fget_char_property (prevline,
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1142 Qinvisible,
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1143 window),
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1144 TEXT_PROP_MEANS_INVISIBLE (propval))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1145 #endif
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1146 ))
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1147 XSETFASTINT (prevline,
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1148 find_next_newline_no_quit (XFASTINT (prevline) - 1,
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1149 -1));
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1150 pos = *compute_motion (XFASTINT (prevline), 0,
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1151 lmargin + (XFASTINT (prevline) == BEG
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1152 ? start_hpos : 0),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1153 0,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13185
diff changeset
1154 from, 1 << (BITS_PER_INT - 2), 0,
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1155 width, hscroll, 0, w);
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1156 vpos -= pos.vpos;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1157 first = 0;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1158 from = XFASTINT (prevline);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1161 /* If we made exactly the desired vertical distance,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1162 or if we hit beginning of buffer,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1163 return point found */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1164 if (vpos >= vtarget)
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1165 {
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1166 val_vmotion.bufpos = from;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1167 val_vmotion.vpos = vpos;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1168 val_vmotion.hpos = lmargin;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1169 val_vmotion.contin = 0;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1170 val_vmotion.prevhpos = 0;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1171 return &val_vmotion;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1172 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1173
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1174 /* Otherwise find the correct spot by moving down */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1175 }
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1176 /* Moving downward is simple, but must calculate from beg of line
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1177 to determine hpos of starting point */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1178 if (from > BEGV && FETCH_CHAR (from - 1) != '\n')
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1179 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1180 Lisp_Object propval;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1181
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1182 XSETFASTINT (prevline, find_next_newline_no_quit (from, -1));
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1183 while (XFASTINT (prevline) > BEGV
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1184 && ((selective > 0
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1185 && indented_beyond_p (XFASTINT (prevline), selective))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1186 #ifdef USE_TEXT_PROPERTIES
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1187 /* watch out for newlines with `invisible' property */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1188 || (propval = Fget_char_property (prevline, Qinvisible,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1189 window),
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1190 TEXT_PROP_MEANS_INVISIBLE (propval))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1191 #endif
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1192 ))
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1193 XSETFASTINT (prevline,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1194 find_next_newline_no_quit (XFASTINT (prevline) - 1,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1195 -1));
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1196 pos = *compute_motion (XFASTINT (prevline), 0,
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1197 lmargin + (XFASTINT (prevline) == BEG
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1198 ? start_hpos : 0),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1199 0,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13185
diff changeset
1200 from, 1 << (BITS_PER_INT - 2), 0,
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1201 width, hscroll, 0, w);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1202 did_motion = 1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 }
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1204 else
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1205 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1206 pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1207 pos.vpos = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1208 did_motion = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1209 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1210 return compute_motion (from, vpos, pos.hpos, did_motion,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13185
diff changeset
1211 ZV, vtarget, - (1 << (BITS_PER_INT - 2)),
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1212 width, hscroll, pos.vpos * width, w);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1213 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1214
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1215 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216 "Move to start of screen line LINES lines down.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1217 If LINES is negative, this is moving up.\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1218 \n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1219 The optional second argument WINDOW specifies the window to use for\n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1220 parameters such as width, horizontal scrolling, and so on.\n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1221 the default is the selected window.\n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1222 It does not matter what buffer is displayed in WINDOW.\n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1223 `vertical-motion' always uses the current buffer.\n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1224 \n\
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1225 Sets point to position found; this may be start of line\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1226 or just the start of a continuation line.\n\
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1227 Returns number of lines moved; may be closer to zero than LINES\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1228 if beginning or end of buffer was reached.")
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1229 (lines, window)
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1230 Lisp_Object lines, window;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1231 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 struct position pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1233
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234 CHECK_NUMBER (lines, 0);
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1235 if (! NILP (window))
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1236 CHECK_WINDOW (window, 0);
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1237 else
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1238 window = selected_window;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1239
12090
73e305c8239b (Fvertical_motion): Add cast.
Karl Heuer <kwzh@gnu.org>
parents: 11853
diff changeset
1240 pos = *vmotion (point, (int) XINT (lines), XWINDOW (window));
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1241
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1242 SET_PT (pos.bufpos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1243 return make_number (pos.vpos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1244 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1245
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1246 /* file's initialization. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1247
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1248 syms_of_indent ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1249 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1250 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1251 "*Indentation can insert tabs if this is non-nil.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252 Setting this variable automatically makes it local to the current buffer.");
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1253 indent_tabs_mode = 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1254
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1255 defsubr (&Scurrent_indentation);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1256 defsubr (&Sindent_to);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1257 defsubr (&Scurrent_column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1258 defsubr (&Smove_to_column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1259 defsubr (&Svertical_motion);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1260 defsubr (&Scompute_motion);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1261 }