Mercurial > emacs
annotate src/indent.c @ 9402:87337d65aa17
* Makefile.in.in (obj) Add region-cache.o to the list of files.
(region-cache.o): New target.
(buffer.o, indent.o, search.o): Depend on region-cache.h.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Sat, 08 Oct 1994 22:11:16 +0000 |
parents | 1dfd9def3467 |
children | 4dcc0221b449 |
rev | line source |
---|---|
165 | 1 /* Indentation functions. |
7307 | 2 Copyright (C) 1985,86,87,88,93,94 Free Software Foundation, Inc. |
165 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation; either version 1, or (at your option) | |
9 any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4385
diff
changeset
|
21 #include <config.h> |
165 | 22 #include "lisp.h" |
23 #include "buffer.h" | |
24 #include "indent.h" | |
764 | 25 #include "frame.h" |
165 | 26 #include "window.h" |
27 #include "termchar.h" | |
28 #include "termopts.h" | |
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" |
165 | 31 |
32 /* Indentation can insert tabs if this is non-zero; | |
33 otherwise always uses spaces */ | |
34 int indent_tabs_mode; | |
35 | |
36 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
37 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
38 | |
39 #define CR 015 | |
40 | |
41 /* These three values memoize the current column to avoid recalculation */ | |
42 /* Some things in set last_known_column_point to -1 | |
43 to mark the memoized value as invalid */ | |
44 /* Last value returned by current_column */ | |
45 int last_known_column; | |
46 /* Value of point when current_column was called */ | |
47 int last_known_column_point; | |
48 /* Value of MODIFF when current_column was called */ | |
49 int last_known_column_modified; | |
50 | |
51 /* Get the display table to use for the current buffer. */ | |
52 | |
53 struct Lisp_Vector * | |
54 buffer_display_table () | |
55 { | |
56 Lisp_Object thisbuf; | |
57 | |
58 thisbuf = current_buffer->display_table; | |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
59 if (VECTORP (thisbuf) && XVECTOR (thisbuf)->size == DISP_TABLE_SIZE) |
165 | 60 return XVECTOR (thisbuf); |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
61 if (VECTORP (Vstandard_display_table) |
165 | 62 && XVECTOR (Vstandard_display_table)->size == DISP_TABLE_SIZE) |
63 return XVECTOR (Vstandard_display_table); | |
64 return 0; | |
65 } | |
66 | |
67 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0, | |
68 "Return the horizontal position of point. Beginning of line is column 0.\n\ | |
69 This is calculated by adding together the widths of all the displayed\n\ | |
70 representations of the character between the start of the previous line\n\ | |
71 and point. (eg control characters will have a width of 2 or 4, tabs\n\ | |
72 will have a variable width)\n\ | |
764 | 73 Ignores finite width of frame, which means that this function may return\n\ |
74 values greater than (frame-width).\n\ | |
165 | 75 Whether the line is visible (if `selective-display' is t) has no effect;\n\ |
76 however, ^M is treated as end of line when `selective-display' is t.") | |
77 () | |
78 { | |
79 Lisp_Object temp; | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
80 XSETFASTINT (temp, current_column ()); |
165 | 81 return temp; |
82 } | |
83 | |
327 | 84 /* Cancel any recorded value of the horizontal position. */ |
85 | |
86 invalidate_current_column () | |
87 { | |
88 last_known_column_point = 0; | |
89 } | |
90 | |
165 | 91 int |
92 current_column () | |
93 { | |
94 register int col; | |
95 register unsigned char *ptr, *stop; | |
96 register int tab_seen; | |
97 int post_tab; | |
98 register int c; | |
99 register int tab_width = XINT (current_buffer->tab_width); | |
488 | 100 int ctl_arrow = !NILP (current_buffer->ctl_arrow); |
165 | 101 register struct Lisp_Vector *dp = buffer_display_table (); |
102 int stopchar; | |
103 | |
104 if (point == last_known_column_point | |
105 && MODIFF == last_known_column_modified) | |
106 return last_known_column; | |
107 | |
108 /* Make a pointer for decrementing through the chars before point. */ | |
109 ptr = &FETCH_CHAR (point - 1) + 1; | |
110 /* Make a pointer to where consecutive chars leave off, | |
111 going backwards from point. */ | |
112 if (point == BEGV) | |
113 stop = ptr; | |
114 else if (point <= GPT || BEGV > GPT) | |
115 stop = BEGV_ADDR; | |
116 else | |
117 stop = GAP_END_ADDR; | |
118 | |
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
119 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
165 | 120 |
121 col = 0, tab_seen = 0, post_tab = 0; | |
122 | |
123 while (1) | |
124 { | |
125 if (ptr == stop) | |
126 { | |
127 /* We stopped either for the beginning of the buffer | |
128 or for the gap. */ | |
129 if (ptr == BEGV_ADDR) | |
130 break; | |
131 /* It was the gap. Jump back over it. */ | |
132 stop = BEGV_ADDR; | |
133 ptr = GPT_ADDR; | |
134 /* Check whether that brings us to beginning of buffer. */ | |
135 if (BEGV >= GPT) break; | |
136 } | |
137 | |
138 c = *--ptr; | |
139 if (c >= 040 && c < 0177 | |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
140 && (dp == 0 || !VECTORP (DISP_CHAR_VECTOR (dp, c)))) |
165 | 141 { |
142 col++; | |
143 } | |
144 else if (c == '\n') | |
145 break; | |
146 else if (c == '\r' && EQ (current_buffer->selective_display, Qt)) | |
147 break; | |
148 else if (c == '\t') | |
149 { | |
150 if (tab_seen) | |
151 col = ((col + tab_width) / tab_width) * tab_width; | |
152 | |
153 post_tab += col; | |
154 col = 0; | |
155 tab_seen = 1; | |
156 } | |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
157 else if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
2017
ffa43acb7de7
(current_column, Fmove_to_column, compute_motion):
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
158 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
165 | 159 else |
160 col += (ctl_arrow && c < 0200) ? 2 : 4; | |
161 } | |
162 | |
163 if (tab_seen) | |
164 { | |
165 col = ((col + tab_width) / tab_width) * tab_width; | |
166 col += post_tab; | |
167 } | |
168 | |
169 last_known_column = col; | |
170 last_known_column_point = point; | |
171 last_known_column_modified = MODIFF; | |
172 | |
173 return col; | |
174 } | |
175 | |
176 | |
177 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ", | |
178 "Indent from point with tabs and spaces until COLUMN is reached.\n\ | |
179 Optional second argument MIN says always do at least MIN spaces\n\ | |
180 even if that goes past COLUMN; by default, MIN is zero.") | |
181 (col, minimum) | |
182 Lisp_Object col, minimum; | |
183 { | |
184 int mincol; | |
185 register int fromcol; | |
186 register int tab_width = XINT (current_buffer->tab_width); | |
187 | |
188 CHECK_NUMBER (col, 0); | |
488 | 189 if (NILP (minimum)) |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
190 XSETFASTINT (minimum, 0); |
165 | 191 CHECK_NUMBER (minimum, 1); |
192 | |
193 fromcol = current_column (); | |
194 mincol = fromcol + XINT (minimum); | |
195 if (mincol < XINT (col)) mincol = XINT (col); | |
196 | |
197 if (fromcol == mincol) | |
198 return make_number (mincol); | |
199 | |
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
200 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
165 | 201 |
202 if (indent_tabs_mode) | |
203 { | |
204 Lisp_Object n; | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
205 XSETFASTINT (n, mincol / tab_width - fromcol / tab_width); |
165 | 206 if (XFASTINT (n) != 0) |
207 { | |
8648
f047d8c6db79
(Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents:
8601
diff
changeset
|
208 Finsert_char (make_number ('\t'), n, Qt); |
165 | 209 |
210 fromcol = (mincol / tab_width) * tab_width; | |
211 } | |
212 } | |
213 | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
214 XSETFASTINT (col, mincol - fromcol); |
8648
f047d8c6db79
(Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents:
8601
diff
changeset
|
215 Finsert_char (make_number (' '), col, Qt); |
165 | 216 |
217 last_known_column = mincol; | |
218 last_known_column_point = point; | |
219 last_known_column_modified = MODIFF; | |
220 | |
221 XSETINT (col, mincol); | |
222 return col; | |
223 } | |
224 | |
225 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation, | |
226 0, 0, 0, | |
227 "Return the indentation of the current line.\n\ | |
228 This is the horizontal position of the character\n\ | |
229 following any initial whitespace.") | |
230 () | |
231 { | |
232 Lisp_Object val; | |
233 | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
234 XSETFASTINT (val, position_indentation (find_next_newline (point, -1))); |
165 | 235 return val; |
236 } | |
237 | |
238 position_indentation (pos) | |
239 register int pos; | |
240 { | |
241 register int column = 0; | |
242 register int tab_width = XINT (current_buffer->tab_width); | |
243 register unsigned char *p; | |
244 register unsigned char *stop; | |
245 | |
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
246 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
165 | 247 |
248 stop = &FETCH_CHAR (BUFFER_CEILING_OF (pos)) + 1; | |
249 p = &FETCH_CHAR (pos); | |
250 while (1) | |
251 { | |
252 while (p == stop) | |
253 { | |
254 if (pos == ZV) | |
255 return column; | |
256 pos += p - &FETCH_CHAR (pos); | |
257 p = &FETCH_CHAR (pos); | |
258 stop = &FETCH_CHAR (BUFFER_CEILING_OF (pos)) + 1; | |
259 } | |
260 switch (*p++) | |
261 { | |
262 case ' ': | |
263 column++; | |
264 break; | |
265 case '\t': | |
266 column += tab_width - column % tab_width; | |
267 break; | |
268 default: | |
269 return column; | |
270 } | |
271 } | |
272 } | |
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
273 |
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
274 /* 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
|
275 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
|
276 preceding line. */ |
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
277 int |
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
278 indented_beyond_p (pos, column) |
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
279 int pos, column; |
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
280 { |
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
281 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
|
282 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
|
283 return (position_indentation (pos) >= column); |
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
284 } |
165 | 285 |
286 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, 0, | |
287 "Move point to column COLUMN in the current line.\n\ | |
288 The column of a character is calculated by adding together the widths\n\ | |
289 as displayed of the previous characters in the line.\n\ | |
290 This function ignores line-continuation;\n\ | |
291 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
|
292 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
|
293 \n\ |
165 | 294 If specified column is within a character, point goes after that character.\n\ |
295 If it's past end of line, point goes to end of line.\n\n\ | |
296 A non-nil second (optional) argument FORCE means, if the line\n\ | |
297 is too short to reach column COLUMN then add spaces/tabs to get there,\n\ | |
298 and if COLUMN is in the middle of a tab character, change it to spaces.") | |
299 (column, force) | |
300 Lisp_Object column, force; | |
301 { | |
302 register int pos; | |
303 register int col = current_column (); | |
304 register int goal; | |
305 register int end; | |
306 register int tab_width = XINT (current_buffer->tab_width); | |
488 | 307 register int ctl_arrow = !NILP (current_buffer->ctl_arrow); |
165 | 308 register struct Lisp_Vector *dp = buffer_display_table (); |
309 | |
310 Lisp_Object val; | |
311 int prev_col; | |
312 int c; | |
313 | |
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
314 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
165 | 315 CHECK_NATNUM (column, 0); |
316 goal = XINT (column); | |
317 | |
318 retry: | |
319 pos = point; | |
320 end = ZV; | |
321 | |
322 /* If we're starting past the desired column, | |
323 back up to beginning of line and scan from there. */ | |
324 if (col > goal) | |
325 { | |
326 pos = find_next_newline (pos, -1); | |
327 col = 0; | |
328 } | |
329 | |
330 while (col < goal && pos < end) | |
331 { | |
332 c = FETCH_CHAR (pos); | |
333 if (c == '\n') | |
334 break; | |
335 if (c == '\r' && EQ (current_buffer->selective_display, Qt)) | |
336 break; | |
337 pos++; | |
338 if (c == '\t') | |
339 { | |
340 prev_col = col; | |
341 col += tab_width; | |
342 col = col / tab_width * tab_width; | |
343 } | |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
344 else if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
2017
ffa43acb7de7
(current_column, Fmove_to_column, compute_motion):
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
345 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
165 | 346 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
|
347 col += 2; |
165 | 348 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
|
349 col += 4; |
165 | 350 else |
351 col++; | |
352 } | |
353 | |
354 SET_PT (pos); | |
355 | |
356 /* If a tab char made us overshoot, change it to spaces | |
357 and scan through it again. */ | |
488 | 358 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal) |
165 | 359 { |
573 | 360 int old_point; |
361 | |
165 | 362 del_range (point - 1, point); |
573 | 363 Findent_to (make_number (goal), Qnil); |
364 old_point = point; | |
365 Findent_to (make_number (col), Qnil); | |
366 SET_PT (old_point); | |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
367 /* Set the last_known... vars consistently. */ |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
368 col = goal; |
165 | 369 } |
370 | |
371 /* If line ends prematurely, add space to the end. */ | |
488 | 372 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
|
373 Findent_to (make_number (col = goal), Qnil); |
165 | 374 |
375 last_known_column = col; | |
376 last_known_column_point = point; | |
377 last_known_column_modified = MODIFF; | |
378 | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
379 XSETFASTINT (val, col); |
165 | 380 return val; |
381 } | |
382 | |
383 struct position val_compute_motion; | |
384 | |
385 /* Scan the current buffer forward from offset FROM, pretending that | |
386 this is at line FROMVPOS, column FROMHPOS, until reaching buffer | |
387 offset TO or line TOVPOS, column TOHPOS (whichever comes first), | |
388 and return the ending buffer position and screen location. | |
389 | |
390 WIDTH is the number of columns available to display text; | |
391 compute_motion uses this to handle continuation lines and such. | |
392 HSCROLL is the number of columns not being displayed at the left | |
393 margin; this is usually taken from a window's hscroll member. | |
543 | 394 TAB_OFFSET is the number of columns of the first tab that aren't |
395 being displayed, perhaps because of a continuation line or | |
396 something. | |
165 | 397 |
398 compute_motion returns a pointer to a struct position. The bufpos | |
399 member gives the buffer position at the end of the scan, and hpos | |
400 and vpos give its cartesian location. I'm not clear on what the | |
401 other members are. | |
402 | |
6400 | 403 Note that FROMHPOS and TOHPOS should be expressed in real screen |
404 columns, taking HSCROLL and the truncation glyph at the left margin | |
405 into account. That is, beginning-of-line moves you to the hpos | |
406 -HSCROLL + (HSCROLL > 0). | |
407 | |
165 | 408 For example, to find the buffer position of column COL of line LINE |
409 of a certain window, pass the window's starting location as FROM | |
410 and the window's upper-left coordinates as FROMVPOS and FROMHPOS. | |
411 Pass the buffer's ZV as TO, to limit the scan to the end of the | |
412 visible section of the buffer, and pass LINE and COL as TOVPOS and | |
413 TOHPOS. | |
414 | |
415 When displaying in window w, a typical formula for WIDTH is: | |
416 | |
417 window_width - 1 | |
1994
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1777
diff
changeset
|
418 - (has_vertical_scroll_bars |
8946 | 419 ? 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
|
420 : (window_width + window_left != frame_width)) |
165 | 421 |
422 where | |
423 window_width is XFASTINT (w->width), | |
424 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
|
425 has_vertical_scroll_bars is |
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1777
diff
changeset
|
426 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
|
427 and frame_width = FRAME_WIDTH (XFRAME (window->frame)) |
165 | 428 |
6400 | 429 Or you can let window_internal_width do this all for you, and write: |
430 window_internal_width (w) - 1 | |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
431 |
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
432 The `-1' accounts for the continuation-line backslashes; the rest |
5941 | 433 accounts for window borders if the window is split horizontally, and |
6400 | 434 the scroll bars if they are turned on. */ |
165 | 435 |
436 struct position * | |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
437 compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, tab_offset, win) |
165 | 438 int from, fromvpos, fromhpos, to, tovpos, tohpos; |
439 register int width; | |
440 int hscroll, tab_offset; | |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
441 struct window *win; |
165 | 442 { |
526 | 443 register int hpos = fromhpos; |
444 register int vpos = fromvpos; | |
165 | 445 |
446 register int pos; | |
447 register int c; | |
448 register int tab_width = XFASTINT (current_buffer->tab_width); | |
488 | 449 register int ctl_arrow = !NILP (current_buffer->ctl_arrow); |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
450 register struct Lisp_Vector *dp = window_display_table (win); |
165 | 451 int selective |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
452 = (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
|
453 ? 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
|
454 : !NILP (current_buffer->selective_display) ? -1 : 0); |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
455 int prev_vpos, prev_hpos = 0; |
165 | 456 int selective_rlen |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
457 = (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
|
458 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0); |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
459 #ifdef USE_TEXT_PROPERTIES |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
460 /* The next location where the `invisible' property changes */ |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
461 int next_invisible = from; |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
462 Lisp_Object prop, position; |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
463 #endif |
165 | 464 |
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
465 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
526 | 466 for (pos = from; pos < to; pos++) |
165 | 467 { |
526 | 468 /* Stop if past the target screen position. */ |
469 if (vpos > tovpos | |
470 || (vpos == tovpos && hpos >= tohpos)) | |
471 break; | |
472 | |
473 prev_vpos = vpos; | |
474 prev_hpos = hpos; | |
475 | |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
476 #ifdef USE_TEXT_PROPERTIES |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
477 /* if the `invisible' property is set, we can skip to |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
478 the next property change */ |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
479 while (pos == next_invisible && pos < to) |
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
480 { |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
481 XSETFASTINT (position, pos); |
6067
25c4f2fe81d1
(compute_motion, vmotion): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
5943
diff
changeset
|
482 prop = Fget_char_property (position, |
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
483 Qinvisible, |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
484 Fcurrent_buffer ()); |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
485 { |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
486 Lisp_Object end, limit; |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
487 |
7941
849b6e20bfd7
(compute_motion): Recenter overlays, for speed.
Karl Heuer <kwzh@gnu.org>
parents:
7892
diff
changeset
|
488 recenter_overlay_lists (current_buffer, pos); |
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
489 /* This is just an estimate to give reasonable |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
490 performance; nothing should go wrong if it is too small. */ |
6092
a3e4e8ac2a33
(compute_motion): Allow for invisible overlays in next_invisible lookahead.
Karl Heuer <kwzh@gnu.org>
parents:
6067
diff
changeset
|
491 limit = Fnext_overlay_change (position); |
a3e4e8ac2a33
(compute_motion): Allow for invisible overlays in next_invisible lookahead.
Karl Heuer <kwzh@gnu.org>
parents:
6067
diff
changeset
|
492 if (XFASTINT (limit) > pos + 100) |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
493 XSETFASTINT (limit, pos + 100); |
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
494 end = Fnext_single_property_change (position, Qinvisible, |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
495 Fcurrent_buffer (), limit); |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
496 if (INTEGERP (end)) |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
497 next_invisible = XINT (end); |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
498 else |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
499 next_invisible = to; |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
500 if (! NILP (prop)) |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
501 pos = next_invisible; |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
502 } |
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
503 } |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
504 if (pos >= to) |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
505 break; |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
506 #endif |
165 | 507 c = FETCH_CHAR (pos); |
508 if (c >= 040 && c < 0177 | |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
509 && (dp == 0 || !VECTORP (DISP_CHAR_VECTOR (dp, c)))) |
526 | 510 hpos++; |
165 | 511 else if (c == '\t') |
512 { | |
526 | 513 hpos += tab_width - ((hpos + tab_offset + hscroll - (hscroll > 0) |
514 /* Add tab_width here to make sure positive. | |
515 hpos can be negative after continuation | |
516 but can't be less than -tab_width. */ | |
517 + tab_width) | |
518 % tab_width); | |
165 | 519 } |
520 else if (c == '\n') | |
521 { | |
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
522 if (selective > 0 && indented_beyond_p (pos + 1, selective)) |
165 | 523 { |
524 /* Skip any number of invisible lines all at once */ | |
525 do | |
526 { | |
526 | 527 while (++pos < to && FETCH_CHAR (pos) != '\n'); |
165 | 528 } |
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
529 while (pos < to && indented_beyond_p (pos + 1, selective)); |
5941 | 530 pos--; /* Reread the newline on the next pass. */ |
165 | 531 /* Allow for the " ..." that is displayed for them. */ |
532 if (selective_rlen) | |
533 { | |
526 | 534 hpos += selective_rlen; |
535 if (hpos >= width) | |
536 hpos = width; | |
165 | 537 } |
614
0085dcbad4bd
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
573
diff
changeset
|
538 /* We have skipped the invis text, but not the newline after. */ |
165 | 539 } |
540 else | |
526 | 541 { |
542 /* A visible line. */ | |
543 vpos++; | |
544 hpos = 0; | |
5845
d35b4a1a044c
(compute_motion): Source code was improperly indented.
Karl Heuer <kwzh@gnu.org>
parents:
5162
diff
changeset
|
545 hpos -= hscroll; |
6400 | 546 if (hscroll > 0) hpos++; /* Truncation glyph on column 0 */ |
5845
d35b4a1a044c
(compute_motion): Source code was improperly indented.
Karl Heuer <kwzh@gnu.org>
parents:
5162
diff
changeset
|
547 tab_offset = 0; |
d35b4a1a044c
(compute_motion): Source code was improperly indented.
Karl Heuer <kwzh@gnu.org>
parents:
5162
diff
changeset
|
548 } |
165 | 549 } |
550 else if (c == CR && selective < 0) | |
551 { | |
552 /* In selective display mode, | |
553 everything from a ^M to the end of the line is invisible */ | |
526 | 554 while (pos < to && FETCH_CHAR (pos) != '\n') pos++; |
555 /* Stop *before* the real newline. */ | |
165 | 556 pos--; |
557 /* Allow for the " ..." that is displayed for them. */ | |
558 if (selective_rlen) | |
559 { | |
526 | 560 hpos += selective_rlen; |
561 if (hpos >= width) | |
562 hpos = width; | |
165 | 563 } |
564 } | |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
565 else if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
2017
ffa43acb7de7
(current_column, Fmove_to_column, compute_motion):
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
566 hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
165 | 567 else |
526 | 568 hpos += (ctl_arrow && c < 0200) ? 2 : 4; |
165 | 569 |
526 | 570 /* Handle right margin. */ |
571 if (hpos >= width | |
572 && (hpos > width | |
573 || (pos < ZV - 1 | |
165 | 574 && FETCH_CHAR (pos + 1) != '\n'))) |
575 { | |
526 | 576 if (vpos > tovpos |
577 || (vpos == tovpos && hpos >= tohpos)) | |
165 | 578 break; |
579 if (hscroll | |
580 || (truncate_partial_width_windows | |
8543
a03be411d008
(compute_motion): Use WIN's frame, not selected one.
Richard M. Stallman <rms@gnu.org>
parents:
7941
diff
changeset
|
581 && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win)))) |
488 | 582 || !NILP (current_buffer->truncate_lines)) |
165 | 583 { |
526 | 584 /* Truncating: skip to newline. */ |
585 while (pos < to && FETCH_CHAR (pos) != '\n') pos++; | |
165 | 586 pos--; |
614
0085dcbad4bd
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
573
diff
changeset
|
587 hpos = width; |
165 | 588 } |
589 else | |
590 { | |
526 | 591 /* Continuing. */ |
592 vpos++; | |
593 hpos -= width; | |
165 | 594 tab_offset += width; |
595 } | |
596 | |
597 } | |
598 } | |
599 | |
600 val_compute_motion.bufpos = pos; | |
526 | 601 val_compute_motion.hpos = hpos; |
602 val_compute_motion.vpos = vpos; | |
603 val_compute_motion.prevhpos = prev_hpos; | |
165 | 604 |
605 /* Nonzero if have just continued a line */ | |
606 val_compute_motion.contin | |
526 | 607 = (pos != from |
608 && (val_compute_motion.vpos != prev_vpos) | |
609 && c != '\n'); | |
165 | 610 |
611 return &val_compute_motion; | |
612 } | |
613 | |
6587 | 614 #if 0 /* The doc string is too long for some compilers, |
615 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
|
616 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
|
617 "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
|
618 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
|
619 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
|
620 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
|
621 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
|
622 \n\ |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
623 There are three additional arguments:\n\ |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
624 \n\ |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
625 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
|
626 this affects handling of continuation lines.\n\ |
6587 | 627 This is usually the value returned by `window-width', less one (to allow\n\ |
628 for the continuation glyph).\n\ | |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
629 \n\ |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
630 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
|
631 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
|
632 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
|
633 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
|
634 being displayed, perhaps because the line was continued within it.\n\ |
6585 | 635 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
|
636 \n\ |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
637 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
|
638 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
|
639 `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
|
640 \n\ |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
641 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
|
642 (POS HPOS VPOS PREVHPOS CONTIN)\n\ |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
643 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
|
644 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
|
645 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
|
646 \n\ |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
647 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
|
648 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
|
649 \n\ |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
650 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
|
651 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
|
652 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
|
653 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
|
654 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
|
655 (from, frompos, to, topos, width, offsets, window) |
6587 | 656 #endif |
657 | |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
658 DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0, |
6587 | 659 0) |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
660 (from, frompos, to, topos, width, offsets, window) |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
661 Lisp_Object from, frompos, to, topos; |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
662 Lisp_Object width, offsets, window; |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
663 { |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
664 Lisp_Object bufpos, hpos, vpos, prevhpos, contin; |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
665 struct position *pos; |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
666 int hscroll, tab_offset; |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
667 |
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
668 CHECK_NUMBER_COERCE_MARKER (from, 0); |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
669 CHECK_CONS (frompos, 0); |
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
670 CHECK_NUMBER (XCONS (frompos)->car, 0); |
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
671 CHECK_NUMBER (XCONS (frompos)->cdr, 0); |
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
672 CHECK_NUMBER_COERCE_MARKER (to, 0); |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
673 CHECK_CONS (topos, 0); |
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
674 CHECK_NUMBER (XCONS (topos)->car, 0); |
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
675 CHECK_NUMBER (XCONS (topos)->cdr, 0); |
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
676 CHECK_NUMBER (width, 0); |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
677 if (!NILP (offsets)) |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
678 { |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
679 CHECK_CONS (offsets, 0); |
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
680 CHECK_NUMBER (XCONS (offsets)->car, 0); |
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
681 CHECK_NUMBER (XCONS (offsets)->cdr, 0); |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
682 hscroll = XINT (XCONS (offsets)->car); |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
683 tab_offset = XINT (XCONS (offsets)->cdr); |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
684 } |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
685 else |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
686 hscroll = tab_offset = 0; |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
687 |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
688 if (NILP (window)) |
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
689 window = Fselected_window (); |
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
690 else |
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
691 CHECK_LIVE_WINDOW (window, 0); |
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
692 |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
693 pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr), |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
694 XINT (XCONS (frompos)->car), |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
695 XINT (to), XINT (XCONS (topos)->cdr), |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
696 XINT (XCONS (topos)->car), |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
697 XINT (width), hscroll, tab_offset, |
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
698 XWINDOW (window)); |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
699 |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
700 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
|
701 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
|
702 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
|
703 XSETINT (prevhpos, pos->prevhpos); |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
704 |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
705 return Fcons (bufpos, |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
706 Fcons (hpos, |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
707 Fcons (vpos, |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
708 Fcons (prevhpos, |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
709 Fcons (pos->contin ? Qt : Qnil, Qnil))))); |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
710 |
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
711 } |
165 | 712 |
713 /* Return the column of position POS in window W's buffer, | |
714 rounded down to a multiple of the internal width of W. | |
715 This is the amount of indentation of position POS | |
716 that is not visible in its horizontal position in the window. */ | |
717 | |
718 int | |
719 pos_tab_offset (w, pos) | |
720 struct window *w; | |
721 register int pos; | |
722 { | |
8601
c67a4530319e
(pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
8543
diff
changeset
|
723 int opoint = PT; |
165 | 724 int col; |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
725 int width = window_internal_width (w) - 1; |
165 | 726 |
727 if (pos == BEGV || FETCH_CHAR (pos - 1) == '\n') | |
728 return 0; | |
8601
c67a4530319e
(pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
8543
diff
changeset
|
729 TEMP_SET_PT (pos); |
165 | 730 col = current_column (); |
8601
c67a4530319e
(pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
8543
diff
changeset
|
731 TEMP_SET_PT (opoint); |
165 | 732 return col - (col % width); |
733 } | |
734 | |
735 /* start_hpos is the hpos of the first character of the buffer: | |
736 zero except for the minibuffer window, | |
737 where it is the width of the prompt. */ | |
738 | |
739 struct position val_vmotion; | |
740 | |
741 struct position * | |
742 vmotion (from, vtarget, width, hscroll, window) | |
743 register int from, vtarget, width; | |
744 int hscroll; | |
745 Lisp_Object window; | |
746 { | |
747 struct position pos; | |
748 /* vpos is cumulative vertical position, changed as from is changed */ | |
749 register int vpos = 0; | |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
750 Lisp_Object prevline; |
165 | 751 register int first; |
752 int lmargin = hscroll > 0 ? 1 - hscroll : 0; | |
753 int selective | |
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
754 = (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
|
755 ? 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
|
756 : !NILP (current_buffer->selective_display) ? -1 : 0); |
6811
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
757 /* The omission of the clause |
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
758 && marker_position (XWINDOW (window)->start) == BEG |
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
759 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
|
760 position even if the minibuffer window has scrolled. */ |
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
761 int start_hpos = (EQ (window, minibuf_window) ? minibuf_prompt_width : 0); |
165 | 762 |
763 retry: | |
764 if (vtarget > vpos) | |
765 { | |
766 /* Moving downward is simple, but must calculate from beg of line | |
767 to determine hpos of starting point */ | |
768 if (from > BEGV && FETCH_CHAR (from - 1) != '\n') | |
769 { | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
770 XSETFASTINT (prevline, find_next_newline_no_quit (from, -1)); |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
771 while (XFASTINT (prevline) > BEGV |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
772 && ((selective > 0 |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
773 && 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
|
774 #ifdef USE_TEXT_PROPERTIES |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
775 /* watch out for newlines with `invisible' property */ |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
776 || ! NILP (Fget_char_property (prevline, |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
777 Qinvisible, |
6067
25c4f2fe81d1
(compute_motion, vmotion): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
5943
diff
changeset
|
778 window)) |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
779 #endif |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
780 )) |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
781 XSETFASTINT (prevline, |
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
782 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
|
783 -1)); |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
784 pos = *compute_motion (XFASTINT (prevline), 0, |
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
785 lmargin + (XFASTINT (prevline) == 1 |
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
786 ? start_hpos : 0), |
526 | 787 from, 1 << (INTBITS - 2), 0, |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
788 width, hscroll, 0, XWINDOW (window)); |
165 | 789 } |
790 else | |
791 { | |
792 pos.hpos = lmargin + (from == 1 ? start_hpos : 0); | |
793 pos.vpos = 0; | |
794 } | |
795 return compute_motion (from, vpos, pos.hpos, | |
526 | 796 ZV, vtarget, - (1 << (INTBITS - 2)), |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
797 width, hscroll, pos.vpos * width, |
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
798 XWINDOW (window)); |
165 | 799 } |
800 | |
801 /* To move upward, go a line at a time until | |
802 we have gone at least far enough */ | |
803 | |
804 first = 1; | |
805 | |
806 while ((vpos > vtarget || first) && from > BEGV) | |
807 { | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
808 XSETFASTINT (prevline, from); |
165 | 809 while (1) |
810 { | |
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
811 XSETFASTINT (prevline, |
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
812 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
|
813 -1)); |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
814 if (XFASTINT (prevline) == BEGV |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
815 || ((selective <= 0 |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
816 || ! 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
|
817 #ifdef USE_TEXT_PROPERTIES |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
818 /* watch out for newlines with `invisible' property */ |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
819 && NILP (Fget_char_property (prevline, Qinvisible, window)) |
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
820 #endif |
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
821 )) |
165 | 822 break; |
823 } | |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
824 pos = *compute_motion (XFASTINT (prevline), 0, |
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
825 lmargin + (XFASTINT (prevline) == 1 |
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
826 ? start_hpos : 0), |
526 | 827 from, 1 << (INTBITS - 2), 0, |
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
828 width, hscroll, 0, XWINDOW (window)); |
165 | 829 vpos -= pos.vpos; |
830 first = 0; | |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
831 from = XFASTINT (prevline); |
165 | 832 } |
833 | |
834 /* If we made exactly the desired vertical distance, | |
835 or if we hit beginning of buffer, | |
836 return point found */ | |
837 if (vpos >= vtarget) | |
838 { | |
839 val_vmotion.bufpos = from; | |
840 val_vmotion.vpos = vpos; | |
841 val_vmotion.hpos = lmargin; | |
842 val_vmotion.contin = 0; | |
843 val_vmotion.prevhpos = 0; | |
844 return &val_vmotion; | |
845 } | |
846 | |
847 /* Otherwise find the correct spot by moving down */ | |
848 goto retry; | |
849 } | |
850 | |
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
851 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0, |
165 | 852 "Move to start of screen line LINES lines down.\n\ |
853 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
|
854 \n\ |
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
855 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
|
856 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
|
857 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
|
858 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
|
859 `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
|
860 \n\ |
165 | 861 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
|
862 or just the start of a continuation line.\n\ |
165 | 863 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
|
864 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
|
865 (lines, window) |
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
866 Lisp_Object lines, window; |
165 | 867 { |
868 struct position pos; | |
6763
51de9400bf88
(Fvertical_motion): Use window arg, not selected_window.
Karl Heuer <kwzh@gnu.org>
parents:
6703
diff
changeset
|
869 register struct window *w; |
165 | 870 |
871 CHECK_NUMBER (lines, 0); | |
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
872 if (! NILP (window)) |
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
873 CHECK_WINDOW (window, 0); |
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
874 else |
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
875 window = selected_window; |
165 | 876 |
6763
51de9400bf88
(Fvertical_motion): Use window arg, not selected_window.
Karl Heuer <kwzh@gnu.org>
parents:
6703
diff
changeset
|
877 w = XWINDOW (window); |
6846
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
878 |
6763
51de9400bf88
(Fvertical_motion): Use window arg, not selected_window.
Karl Heuer <kwzh@gnu.org>
parents:
6703
diff
changeset
|
879 pos = *vmotion (point, XINT (lines), window_internal_width (w) - 1, |
165 | 880 /* Not XFASTINT since perhaps could be negative */ |
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
881 XINT (w->hscroll), window); |
165 | 882 |
883 SET_PT (pos.bufpos); | |
884 return make_number (pos.vpos); | |
885 } | |
886 | |
887 syms_of_indent () | |
888 { | |
889 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode, | |
890 "*Indentation can insert tabs if this is non-nil.\n\ | |
891 Setting this variable automatically makes it local to the current buffer."); | |
892 indent_tabs_mode = 1; | |
893 | |
894 defsubr (&Scurrent_indentation); | |
895 defsubr (&Sindent_to); | |
896 defsubr (&Scurrent_column); | |
897 defsubr (&Smove_to_column); | |
898 defsubr (&Svertical_motion); | |
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
899 defsubr (&Scompute_motion); |
165 | 900 } |