|
165
|
1 /* Indentation functions.
|
|
59710
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001,
|
|
68651
|
3 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
165
|
4
|
|
|
5 This file is part of GNU Emacs.
|
|
|
6
|
|
|
7 GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
8 it under the terms of the GNU General Public License as published by
|
|
12244
|
9 the Free Software Foundation; either version 2, or (at your option)
|
|
165
|
10 any later version.
|
|
|
11
|
|
|
12 GNU Emacs is distributed in the hope that it will be useful,
|
|
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
15 GNU General Public License for more details.
|
|
|
16
|
|
|
17 You should have received a copy of the GNU General Public License
|
|
|
18 along with GNU Emacs; see the file COPYING. If not, write to
|
|
64084
|
19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
20 Boston, MA 02110-1301, USA. */
|
|
165
|
21
|
|
4696
|
22 #include <config.h>
|
|
165
|
23 #include "lisp.h"
|
|
|
24 #include "buffer.h"
|
|
17016
|
25 #include "charset.h"
|
|
20256
|
26 #include "category.h"
|
|
165
|
27 #include "indent.h"
|
|
31102
|
28 #include "keyboard.h"
|
|
764
|
29 #include "frame.h"
|
|
165
|
30 #include "window.h"
|
|
|
31 #include "termchar.h"
|
|
|
32 #include "termopts.h"
|
|
|
33 #include "disptab.h"
|
|
4385
|
34 #include "intervals.h"
|
|
9407
|
35 #include "region-cache.h"
|
|
165
|
36
|
|
|
37 /* Indentation can insert tabs if this is non-zero;
|
|
36846
|
38 otherwise always uses spaces. */
|
|
|
39
|
|
165
|
40 int indent_tabs_mode;
|
|
|
41
|
|
|
42 #define CR 015
|
|
|
43
|
|
39904
|
44 /* These three values memorize the current column to avoid recalculation. */
|
|
36846
|
45
|
|
|
46 /* Last value returned by current_column.
|
|
|
47 Some things in set last_known_column_point to -1
|
|
39904
|
48 to mark the memorized value as invalid. */
|
|
36846
|
49
|
|
46303
|
50 double last_known_column;
|
|
36846
|
51
|
|
|
52 /* Value of point when current_column was called. */
|
|
|
53
|
|
165
|
54 int last_known_column_point;
|
|
36846
|
55
|
|
|
56 /* Value of MODIFF when current_column was called. */
|
|
|
57
|
|
165
|
58 int last_known_column_modified;
|
|
|
59
|
|
46303
|
60 static double current_column_1 P_ ((void));
|
|
|
61 static double position_indentation P_ ((int));
|
|
15494
|
62
|
|
17016
|
63 /* Cache of beginning of line found by the last call of
|
|
|
64 current_column. */
|
|
36846
|
65
|
|
17016
|
66 int current_column_bol_cache;
|
|
|
67
|
|
165
|
68 /* Get the display table to use for the current buffer. */
|
|
|
69
|
|
13185
|
70 struct Lisp_Char_Table *
|
|
165
|
71 buffer_display_table ()
|
|
|
72 {
|
|
|
73 Lisp_Object thisbuf;
|
|
|
74
|
|
|
75 thisbuf = current_buffer->display_table;
|
|
13185
|
76 if (DISP_TABLE_P (thisbuf))
|
|
|
77 return XCHAR_TABLE (thisbuf);
|
|
|
78 if (DISP_TABLE_P (Vstandard_display_table))
|
|
|
79 return XCHAR_TABLE (Vstandard_display_table);
|
|
165
|
80 return 0;
|
|
|
81 }
|
|
|
82
|
|
9407
|
83 /* Width run cache considerations. */
|
|
|
84
|
|
|
85 /* Return the width of character C under display table DP. */
|
|
11037
|
86
|
|
9407
|
87 static int
|
|
|
88 character_width (c, dp)
|
|
|
89 int c;
|
|
13185
|
90 struct Lisp_Char_Table *dp;
|
|
9407
|
91 {
|
|
|
92 Lisp_Object elt;
|
|
|
93
|
|
|
94 /* These width computations were determined by examining the cases
|
|
|
95 in display_text_line. */
|
|
|
96
|
|
11037
|
97 /* Everything can be handled by the display table, if it's
|
|
|
98 present and the element is right. */
|
|
|
99 if (dp && (elt = DISP_CHAR_VECTOR (dp, c), VECTORP (elt)))
|
|
|
100 return XVECTOR (elt)->size;
|
|
|
101
|
|
|
102 /* Some characters are special. */
|
|
9407
|
103 if (c == '\n' || c == '\t' || c == '\015')
|
|
|
104 return 0;
|
|
|
105
|
|
11037
|
106 /* Printing characters have width 1. */
|
|
9407
|
107 else if (c >= 040 && c < 0177)
|
|
|
108 return 1;
|
|
|
109
|
|
|
110 /* Everybody else (control characters, metacharacters) has other
|
|
|
111 widths. We could return their actual widths here, but they
|
|
|
112 depend on things like ctl_arrow and crud like that, and they're
|
|
|
113 not very common at all. So we'll just claim we don't know their
|
|
|
114 widths. */
|
|
|
115 else
|
|
|
116 return 0;
|
|
|
117 }
|
|
|
118
|
|
|
119 /* Return true iff the display table DISPTAB specifies the same widths
|
|
|
120 for characters as WIDTHTAB. We use this to decide when to
|
|
|
121 invalidate the buffer's width_run_cache. */
|
|
36846
|
122
|
|
9407
|
123 int
|
|
|
124 disptab_matches_widthtab (disptab, widthtab)
|
|
13185
|
125 struct Lisp_Char_Table *disptab;
|
|
9407
|
126 struct Lisp_Vector *widthtab;
|
|
|
127 {
|
|
|
128 int i;
|
|
|
129
|
|
|
130 if (widthtab->size != 256)
|
|
|
131 abort ();
|
|
|
132
|
|
|
133 for (i = 0; i < 256; i++)
|
|
|
134 if (character_width (i, disptab)
|
|
|
135 != XFASTINT (widthtab->contents[i]))
|
|
|
136 return 0;
|
|
|
137
|
|
|
138 return 1;
|
|
10538
|
139 }
|
|
9407
|
140
|
|
|
141 /* Recompute BUF's width table, using the display table DISPTAB. */
|
|
36846
|
142
|
|
9407
|
143 void
|
|
|
144 recompute_width_table (buf, disptab)
|
|
|
145 struct buffer *buf;
|
|
13185
|
146 struct Lisp_Char_Table *disptab;
|
|
9407
|
147 {
|
|
|
148 int i;
|
10011
f4f2563057b8
(recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
149 struct Lisp_Vector *widthtab;
|
|
9407
|
150
|
10011
f4f2563057b8
(recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
151 if (!VECTORP (buf->width_table))
|
f4f2563057b8
(recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
152 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>
diff
changeset
|
153 widthtab = XVECTOR (buf->width_table);
|
|
9407
|
154 if (widthtab->size != 256)
|
|
|
155 abort ();
|
|
|
156
|
|
|
157 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>
diff
changeset
|
158 XSETFASTINT (widthtab->contents[i], character_width (i, disptab));
|
|
9407
|
159 }
|
|
|
160
|
|
|
161 /* Allocate or free the width run cache, as requested by the current
|
|
|
162 state of current_buffer's cache_long_line_scans variable. */
|
|
36846
|
163
|
|
9407
|
164 static void
|
|
|
165 width_run_cache_on_off ()
|
|
|
166 {
|
|
17016
|
167 if (NILP (current_buffer->cache_long_line_scans)
|
|
|
168 /* And, for the moment, this feature doesn't work on multibyte
|
|
|
169 characters. */
|
|
|
170 || !NILP (current_buffer->enable_multibyte_characters))
|
|
9407
|
171 {
|
|
|
172 /* It should be off. */
|
|
|
173 if (current_buffer->width_run_cache)
|
|
|
174 {
|
|
|
175 free_region_cache (current_buffer->width_run_cache);
|
|
|
176 current_buffer->width_run_cache = 0;
|
|
|
177 current_buffer->width_table = Qnil;
|
|
|
178 }
|
|
|
179 }
|
|
|
180 else
|
|
|
181 {
|
|
|
182 /* It should be on. */
|
|
|
183 if (current_buffer->width_run_cache == 0)
|
|
10538
|
184 {
|
|
9407
|
185 current_buffer->width_run_cache = new_region_cache ();
|
|
|
186 recompute_width_table (current_buffer, buffer_display_table ());
|
|
|
187 }
|
|
|
188 }
|
|
|
189 }
|
|
|
190
|
|
|
191
|
|
15493
|
192 /* Skip some invisible characters starting from POS.
|
|
|
193 This includes characters invisible because of text properties
|
|
|
194 and characters invisible because of overlays.
|
|
|
195
|
|
|
196 If position POS is followed by invisible characters,
|
|
|
197 skip some of them and return the position after them.
|
|
|
198 Otherwise return POS itself.
|
|
|
199
|
|
|
200 Set *NEXT_BOUNDARY_P to the next position at which
|
|
|
201 it will be necessary to call this function again.
|
|
|
202
|
|
|
203 Don't scan past TO, and don't set *NEXT_BOUNDARY_P
|
|
|
204 to a value greater than TO.
|
|
|
205
|
|
|
206 If WINDOW is non-nil, and this buffer is displayed in WINDOW,
|
|
|
207 take account of overlays that apply only in WINDOW.
|
|
|
208
|
|
|
209 We don't necessarily skip all the invisible characters after POS
|
|
|
210 because that could take a long time. We skip a reasonable number
|
|
|
211 which can be skipped quickly. If there might be more invisible
|
|
|
212 characters immediately following, then *NEXT_BOUNDARY_P
|
|
|
213 will equal the return value. */
|
|
|
214
|
|
25028
|
215 int
|
|
15493
|
216 skip_invisible (pos, next_boundary_p, to, window)
|
|
|
217 int pos;
|
|
|
218 int *next_boundary_p;
|
|
|
219 int to;
|
|
|
220 Lisp_Object window;
|
|
|
221 {
|
|
18613
|
222 Lisp_Object prop, position, overlay_limit, proplimit;
|
58451
4fcc66cf0b9c
(skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
223 Lisp_Object buffer, tmp;
|
|
43735
|
224 int end, inv_p;
|
|
15493
|
225
|
|
|
226 XSETFASTINT (position, pos);
|
|
|
227 XSETBUFFER (buffer, current_buffer);
|
|
|
228
|
|
|
229 /* Give faster response for overlay lookup near POS. */
|
|
|
230 recenter_overlay_lists (current_buffer, pos);
|
|
|
231
|
|
|
232 /* We must not advance farther than the next overlay change.
|
|
|
233 The overlay change might change the invisible property;
|
|
|
234 or there might be overlay strings to be displayed there. */
|
|
|
235 overlay_limit = Fnext_overlay_change (position);
|
|
|
236 /* As for text properties, this gives a lower bound
|
|
|
237 for where the invisible text property could change. */
|
|
|
238 proplimit = Fnext_property_change (position, buffer, Qt);
|
|
|
239 if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
|
|
|
240 proplimit = overlay_limit;
|
|
|
241 /* PROPLIMIT is now a lower bound for the next change
|
|
|
242 in invisible status. If that is plenty far away,
|
|
|
243 use that lower bound. */
|
|
|
244 if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to)
|
|
|
245 *next_boundary_p = XFASTINT (proplimit);
|
|
|
246 /* Otherwise, scan for the next `invisible' property change. */
|
|
|
247 else
|
|
|
248 {
|
|
|
249 /* Don't scan terribly far. */
|
|
|
250 XSETFASTINT (proplimit, min (pos + 100, to));
|
|
|
251 /* No matter what. don't go past next overlay change. */
|
|
|
252 if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
|
|
|
253 proplimit = overlay_limit;
|
58451
4fcc66cf0b9c
(skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
254 tmp = Fnext_single_property_change (position, Qinvisible,
|
4fcc66cf0b9c
(skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
255 buffer, proplimit);
|
4fcc66cf0b9c
(skip_invisible): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
256 end = XFASTINT (tmp);
|
|
20571
|
257 #if 0
|
|
17016
|
258 /* Don't put the boundary in the middle of multibyte form if
|
|
|
259 there is no actual property change. */
|
|
|
260 if (end == pos + 100
|
|
|
261 && !NILP (current_buffer->enable_multibyte_characters)
|
|
|
262 && end < ZV)
|
|
|
263 while (pos < end && !CHAR_HEAD_P (POS_ADDR (end)))
|
|
|
264 end--;
|
|
20571
|
265 #endif
|
|
18613
|
266 *next_boundary_p = end;
|
|
15493
|
267 }
|
|
|
268 /* if the `invisible' property is set, we can skip to
|
|
|
269 the next property change */
|
|
43735
|
270 prop = Fget_char_property (position, Qinvisible,
|
|
|
271 (!NILP (window)
|
|
|
272 && EQ (XWINDOW (window)->buffer, buffer))
|
|
|
273 ? window : buffer);
|
|
|
274 inv_p = TEXT_PROP_MEANS_INVISIBLE (prop);
|
|
|
275 /* When counting columns (window == nil), don't skip over ellipsis text. */
|
|
|
276 if (NILP (window) ? inv_p == 1 : inv_p)
|
|
15493
|
277 return *next_boundary_p;
|
|
|
278 return pos;
|
|
|
279 }
|
|
|
280
|
|
26859
|
281 /* If a composition starts at POS/POS_BYTE and it doesn't stride over
|
|
29405
|
282 POINT, set *LEN / *LEN_BYTE to the character and byte lengths, *WIDTH
|
|
26859
|
283 to the width, and return 1. Otherwise, return 0. */
|
|
|
284
|
|
|
285 static int
|
|
|
286 check_composition (pos, pos_byte, point, len, len_byte, width)
|
|
|
287 int pos, pos_byte, point;
|
|
|
288 int *len, *len_byte, *width;
|
|
|
289 {
|
|
|
290 Lisp_Object prop;
|
|
|
291 int start, end;
|
|
|
292 int id;
|
|
|
293
|
|
|
294 if (! find_composition (pos, -1, &start, &end, &prop, Qnil)
|
|
35405
|
295 || pos != start || point < end
|
|
|
296 || !COMPOSITION_VALID_P (start, end, prop))
|
|
26859
|
297 return 0;
|
|
|
298 if ((id = get_composition_id (pos, pos_byte, end - pos, prop, Qnil)) < 0)
|
|
|
299 return 0;
|
|
|
300
|
|
|
301 *len = COMPOSITION_LENGTH (prop);
|
|
|
302 *len_byte = CHAR_TO_BYTE (end) - pos_byte;
|
|
|
303 *width = composition_table[id]->width;
|
|
|
304 return 1;
|
|
|
305 }
|
|
|
306
|
|
20938
|
307 /* Set variables WIDTH and BYTES for a multibyte sequence starting at P.
|
|
|
308
|
|
|
309 DP is a display table or NULL.
|
|
|
310
|
|
|
311 This macro is used in current_column_1, Fmove_to_column, and
|
|
|
312 compute_motion. */
|
|
|
313
|
|
26859
|
314 #define MULTIBYTE_BYTES_WIDTH(p, dp) \
|
|
|
315 do { \
|
|
|
316 int c; \
|
|
|
317 \
|
|
|
318 wide_column = 0; \
|
|
|
319 c = STRING_CHAR_AND_LENGTH (p, MAX_MULTIBYTE_LENGTH, bytes); \
|
|
|
320 if (BYTES_BY_CHAR_HEAD (*p) != bytes) \
|
|
|
321 width = bytes * 4; \
|
|
|
322 else \
|
|
|
323 { \
|
|
|
324 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) \
|
|
|
325 width = XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; \
|
|
|
326 else \
|
|
|
327 width = WIDTH_BY_CHAR_HEAD (*p); \
|
|
|
328 if (width > 1) \
|
|
|
329 wide_column = width; \
|
|
|
330 } \
|
|
20938
|
331 } while (0)
|
|
|
332
|
|
45622
|
333
|
|
165
|
334 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
|
|
40123
|
335 doc: /* Return the horizontal position of point. Beginning of line is column 0.
|
|
|
336 This is calculated by adding together the widths of all the displayed
|
|
|
337 representations of the character between the start of the previous line
|
|
|
338 and point. (eg control characters will have a width of 2 or 4, tabs
|
|
|
339 will have a variable width)
|
|
|
340 Ignores finite width of frame, which means that this function may return
|
|
|
341 values greater than (frame-width).
|
|
|
342 Whether the line is visible (if `selective-display' is t) has no effect;
|
|
59710
|
343 however, ^M is treated as end of line when `selective-display' is t.
|
|
|
344 Text that has an invisible property is considered as having width 0, unless
|
|
|
345 `buffer-invisibility-spec' specifies that it is replaced by an ellipsis. */)
|
|
40123
|
346 ()
|
|
165
|
347 {
|
|
|
348 Lisp_Object temp;
|
|
45622
|
349 XSETFASTINT (temp, (int) current_column ()); /* iftc */
|
|
165
|
350 return temp;
|
|
|
351 }
|
|
|
352
|
|
327
|
353 /* Cancel any recorded value of the horizontal position. */
|
|
|
354
|
|
20371
|
355 void
|
|
327
|
356 invalidate_current_column ()
|
|
|
357 {
|
|
|
358 last_known_column_point = 0;
|
|
|
359 }
|
|
|
360
|
|
46303
|
361 double
|
|
165
|
362 current_column ()
|
|
|
363 {
|
|
|
364 register int col;
|
|
|
365 register unsigned char *ptr, *stop;
|
|
|
366 register int tab_seen;
|
|
|
367 int post_tab;
|
|
|
368 register int c;
|
|
|
369 register int tab_width = XINT (current_buffer->tab_width);
|
|
488
|
370 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
|
|
13185
|
371 register struct Lisp_Char_Table *dp = buffer_display_table ();
|
|
165
|
372
|
|
16039
|
373 if (PT == last_known_column_point
|
|
165
|
374 && MODIFF == last_known_column_modified)
|
|
|
375 return last_known_column;
|
|
|
376
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
377 /* If the buffer has overlays, text properties,
|
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
378 or multibyte characters, use a more general algorithm. */
|
|
15493
|
379 if (BUF_INTERVALS (current_buffer)
|
51838
d0e8a670d28d
(current_column): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
380 || current_buffer->overlays_before
|
d0e8a670d28d
(current_column): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
381 || current_buffer->overlays_after
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
382 || Z != Z_BYTE)
|
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
383 return current_column_1 ();
|
|
15493
|
384
|
|
|
385 /* Scan backwards from point to the previous newline,
|
|
|
386 counting width. Tab characters are the only complicated case. */
|
|
|
387
|
|
165
|
388 /* Make a pointer for decrementing through the chars before point. */
|
|
20571
|
389 ptr = BYTE_POS_ADDR (PT_BYTE - 1) + 1;
|
|
165
|
390 /* Make a pointer to where consecutive chars leave off,
|
|
|
391 going backwards from point. */
|
|
16039
|
392 if (PT == BEGV)
|
|
165
|
393 stop = ptr;
|
|
16039
|
394 else if (PT <= GPT || BEGV > GPT)
|
|
165
|
395 stop = BEGV_ADDR;
|
|
|
396 else
|
|
|
397 stop = GAP_END_ADDR;
|
|
|
398
|
|
36846
|
399 if (tab_width <= 0 || tab_width > 1000)
|
|
|
400 tab_width = 8;
|
|
165
|
401
|
|
|
402 col = 0, tab_seen = 0, post_tab = 0;
|
|
|
403
|
|
|
404 while (1)
|
|
|
405 {
|
|
36846
|
406 EMACS_INT i, n;
|
|
|
407 Lisp_Object charvec;
|
|
45622
|
408
|
|
165
|
409 if (ptr == stop)
|
|
|
410 {
|
|
|
411 /* We stopped either for the beginning of the buffer
|
|
|
412 or for the gap. */
|
|
|
413 if (ptr == BEGV_ADDR)
|
|
|
414 break;
|
|
45622
|
415
|
|
165
|
416 /* It was the gap. Jump back over it. */
|
|
|
417 stop = BEGV_ADDR;
|
|
|
418 ptr = GPT_ADDR;
|
|
45622
|
419
|
|
165
|
420 /* Check whether that brings us to beginning of buffer. */
|
|
36846
|
421 if (BEGV >= GPT)
|
|
|
422 break;
|
|
165
|
423 }
|
|
|
424
|
|
|
425 c = *--ptr;
|
|
45622
|
426
|
|
36846
|
427 if (dp && VECTORP (DISP_CHAR_VECTOR (dp, c)))
|
|
19208
|
428 {
|
|
36846
|
429 charvec = DISP_CHAR_VECTOR (dp, c);
|
|
|
430 n = ASIZE (charvec);
|
|
165
|
431 }
|
|
|
432 else
|
|
36846
|
433 {
|
|
|
434 charvec = Qnil;
|
|
|
435 n = 1;
|
|
|
436 }
|
|
45622
|
437
|
|
36846
|
438 for (i = n - 1; i >= 0; --i)
|
|
|
439 {
|
|
|
440 if (VECTORP (charvec))
|
|
|
441 {
|
|
|
442 /* This should be handled the same as
|
|
|
443 next_element_from_display_vector does it. */
|
|
|
444 Lisp_Object entry = AREF (charvec, i);
|
|
45622
|
445
|
|
36846
|
446 if (INTEGERP (entry)
|
|
|
447 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
|
|
|
448 c = FAST_GLYPH_CHAR (XFASTINT (entry));
|
|
|
449 else
|
|
|
450 c = ' ';
|
|
|
451 }
|
|
45622
|
452
|
|
36846
|
453 if (c >= 040 && c < 0177)
|
|
|
454 col++;
|
|
|
455 else if (c == '\n'
|
|
|
456 || (c == '\r'
|
|
|
457 && EQ (current_buffer->selective_display, Qt)))
|
|
|
458 {
|
|
|
459 ptr++;
|
|
|
460 goto start_of_line_found;
|
|
|
461 }
|
|
|
462 else if (c == '\t')
|
|
|
463 {
|
|
|
464 if (tab_seen)
|
|
|
465 col = ((col + tab_width) / tab_width) * tab_width;
|
|
45622
|
466
|
|
36846
|
467 post_tab += col;
|
|
|
468 col = 0;
|
|
|
469 tab_seen = 1;
|
|
|
470 }
|
|
38530
|
471 else if (VECTORP (charvec))
|
|
|
472 /* With a display table entry, C is displayed as is, and
|
|
|
473 not displayed as \NNN or as ^N. If C is a single-byte
|
|
|
474 character, it takes one column. If C is multi-byte in
|
|
|
475 an unibyte buffer, it's translated to unibyte, so it
|
|
|
476 also takes one column. */
|
|
|
477 ++col;
|
|
36846
|
478 else
|
|
|
479 col += (ctl_arrow && c < 0200) ? 2 : 4;
|
|
|
480 }
|
|
165
|
481 }
|
|
|
482
|
|
36846
|
483 start_of_line_found:
|
|
|
484
|
|
165
|
485 if (tab_seen)
|
|
|
486 {
|
|
|
487 col = ((col + tab_width) / tab_width) * tab_width;
|
|
|
488 col += post_tab;
|
|
|
489 }
|
|
|
490
|
|
17016
|
491 if (ptr == BEGV_ADDR)
|
|
|
492 current_column_bol_cache = BEGV;
|
|
|
493 else
|
|
20571
|
494 current_column_bol_cache = BYTE_TO_CHAR (PTR_BYTE_POS (ptr));
|
|
|
495
|
|
165
|
496 last_known_column = col;
|
|
16039
|
497 last_known_column_point = PT;
|
|
165
|
498 last_known_column_modified = MODIFF;
|
|
|
499
|
|
|
500 return col;
|
|
|
501 }
|
|
|
502
|
|
15493
|
503 /* Return the column number of position POS
|
|
|
504 by scanning forward from the beginning of the line.
|
|
|
505 This function handles characters that are invisible
|
|
|
506 due to text properties or overlays. */
|
|
|
507
|
|
46303
|
508 static double
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
509 current_column_1 ()
|
|
15493
|
510 {
|
|
|
511 register int tab_width = XINT (current_buffer->tab_width);
|
|
|
512 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
|
|
|
513 register struct Lisp_Char_Table *dp = buffer_display_table ();
|
|
20571
|
514 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
|
|
15493
|
515
|
|
|
516 /* Start the scan at the beginning of this line with column number 0. */
|
|
|
517 register int col = 0;
|
|
20571
|
518 int scan, scan_byte;
|
44701
2ea69a6d8885
(Fmove_to_column): Remove unused local variable `next_boundary_byte'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
519 int next_boundary;
|
|
20571
|
520 int opoint = PT, opoint_byte = PT_BYTE;
|
|
|
521
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
522 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
|
|
20571
|
523 current_column_bol_cache = PT;
|
|
|
524 scan = PT, scan_byte = PT_BYTE;
|
|
|
525 SET_PT_BOTH (opoint, opoint_byte);
|
|
|
526 next_boundary = scan;
|
|
15493
|
527
|
|
|
528 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
|
529
|
|
|
530 /* Scan forward to the target position. */
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
531 while (scan < opoint)
|
|
15493
|
532 {
|
|
|
533 int c;
|
|
|
534
|
|
|
535 /* Occasionally we may need to skip invisible text. */
|
|
|
536 while (scan == next_boundary)
|
|
|
537 {
|
|
20571
|
538 int old_scan = scan;
|
|
15493
|
539 /* This updates NEXT_BOUNDARY to the next place
|
|
|
540 where we might need to skip more invisible text. */
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
541 scan = skip_invisible (scan, &next_boundary, opoint, Qnil);
|
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
542 if (scan >= opoint)
|
|
15493
|
543 goto endloop;
|
|
20571
|
544 if (scan != old_scan)
|
|
|
545 scan_byte = CHAR_TO_BYTE (scan);
|
|
15493
|
546 }
|
|
|
547
|
|
26859
|
548 /* Check composition sequence. */
|
|
|
549 {
|
|
|
550 int len, len_byte, width;
|
|
|
551
|
|
|
552 if (check_composition (scan, scan_byte, opoint,
|
|
|
553 &len, &len_byte, &width))
|
|
|
554 {
|
|
|
555 scan += len;
|
|
|
556 scan_byte += len_byte;
|
|
|
557 if (scan <= opoint)
|
|
|
558 col += width;
|
|
|
559 continue;
|
|
|
560 }
|
|
|
561 }
|
|
|
562
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
563 c = FETCH_BYTE (scan_byte);
|
|
36846
|
564
|
|
20938
|
565 if (dp != 0
|
|
|
566 && ! (multibyte && BASE_LEADING_CODE_P (c))
|
|
|
567 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
|
|
15493
|
568 {
|
|
40720
|
569 Lisp_Object charvec;
|
|
|
570 EMACS_INT i, n;
|
|
|
571
|
|
|
572 /* This character is displayed using a vector of glyphs.
|
|
|
573 Update the column based on those glyphs. */
|
|
|
574
|
|
36846
|
575 charvec = DISP_CHAR_VECTOR (dp, c);
|
|
|
576 n = ASIZE (charvec);
|
|
|
577
|
|
40720
|
578 for (i = 0; i < n; i++)
|
|
36846
|
579 {
|
|
|
580 /* This should be handled the same as
|
|
|
581 next_element_from_display_vector does it. */
|
|
40720
|
582 Lisp_Object entry;
|
|
|
583 entry = AREF (charvec, i);
|
|
|
584
|
|
36846
|
585 if (INTEGERP (entry)
|
|
|
586 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
|
|
|
587 c = FAST_GLYPH_CHAR (XFASTINT (entry));
|
|
|
588 else
|
|
|
589 c = ' ';
|
|
40720
|
590
|
|
|
591 if (c == '\n')
|
|
|
592 goto endloop;
|
|
|
593 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
|
|
|
594 goto endloop;
|
|
|
595 if (c == '\t')
|
|
|
596 {
|
|
|
597 col += tab_width;
|
|
|
598 col = col / tab_width * tab_width;
|
|
|
599 }
|
|
|
600 else
|
|
|
601 ++col;
|
|
36846
|
602 }
|
|
40720
|
603 }
|
|
|
604 else
|
|
|
605 {
|
|
|
606 /* The display table says nothing for this character.
|
|
|
607 Display it as itself. */
|
|
|
608
|
|
36846
|
609 if (c == '\n')
|
|
|
610 goto endloop;
|
|
|
611 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
|
|
|
612 goto endloop;
|
|
|
613 if (c == '\t')
|
|
|
614 {
|
|
|
615 col += tab_width;
|
|
|
616 col = col / tab_width * tab_width;
|
|
|
617 }
|
|
|
618 else if (multibyte && BASE_LEADING_CODE_P (c))
|
|
|
619 {
|
|
|
620 unsigned char *ptr;
|
|
|
621 int bytes, width, wide_column;
|
|
45622
|
622
|
|
36846
|
623 ptr = BYTE_POS_ADDR (scan_byte);
|
|
|
624 MULTIBYTE_BYTES_WIDTH (ptr, dp);
|
|
|
625 scan_byte += bytes;
|
|
41258
|
626 /* Subtract one to compensate for the increment
|
|
|
627 that is going to happen below. */
|
|
|
628 scan_byte--;
|
|
36846
|
629 col += width;
|
|
|
630 }
|
|
|
631 else if (ctl_arrow && (c < 040 || c == 0177))
|
|
|
632 col += 2;
|
|
|
633 else if (c < 040 || c >= 0177)
|
|
|
634 col += 4;
|
|
|
635 else
|
|
|
636 col++;
|
|
15493
|
637 }
|
|
40720
|
638 scan++;
|
|
|
639 scan_byte++;
|
|
|
640
|
|
15493
|
641 }
|
|
|
642 endloop:
|
|
|
643
|
|
|
644 last_known_column = col;
|
|
16039
|
645 last_known_column_point = PT;
|
|
15493
|
646 last_known_column_modified = MODIFF;
|
|
|
647
|
|
|
648 return col;
|
|
|
649 }
|
|
|
650
|
|
37917
|
651
|
|
|
652 #if 0 /* Not used. */
|
|
|
653
|
|
11300
|
654 /* Return the width in columns of the part of STRING from BEG to END.
|
|
|
655 If BEG is nil, that stands for the beginning of STRING.
|
|
|
656 If END is nil, that stands for the end of STRING. */
|
|
|
657
|
|
46303
|
658 static double
|
|
11704
|
659 string_display_width (string, beg, end)
|
|
11300
|
660 Lisp_Object string, beg, end;
|
|
|
661 {
|
|
|
662 register int col;
|
|
|
663 register unsigned char *ptr, *stop;
|
|
|
664 register int tab_seen;
|
|
|
665 int post_tab;
|
|
|
666 register int c;
|
|
|
667 register int tab_width = XINT (current_buffer->tab_width);
|
|
|
668 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
|
|
13185
|
669 register struct Lisp_Char_Table *dp = buffer_display_table ();
|
|
11300
|
670 int b, e;
|
|
|
671
|
|
|
672 if (NILP (end))
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
673 e = SCHARS (string);
|
|
11300
|
674 else
|
|
|
675 {
|
|
40656
|
676 CHECK_NUMBER (end);
|
|
11300
|
677 e = XINT (end);
|
|
|
678 }
|
|
|
679
|
|
|
680 if (NILP (beg))
|
|
|
681 b = 0;
|
|
|
682 else
|
|
|
683 {
|
|
40656
|
684 CHECK_NUMBER (beg);
|
|
11300
|
685 b = XINT (beg);
|
|
|
686 }
|
|
|
687
|
|
|
688 /* Make a pointer for decrementing through the chars before point. */
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
689 ptr = SDATA (string) + e;
|
|
11300
|
690 /* Make a pointer to where consecutive chars leave off,
|
|
|
691 going backwards from point. */
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
692 stop = SDATA (string) + b;
|
|
11300
|
693
|
|
|
694 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
|
695
|
|
|
696 col = 0, tab_seen = 0, post_tab = 0;
|
|
|
697
|
|
|
698 while (1)
|
|
|
699 {
|
|
|
700 if (ptr == stop)
|
|
|
701 break;
|
|
|
702
|
|
|
703 c = *--ptr;
|
|
|
704 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
|
|
|
705 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
|
|
|
706 else if (c >= 040 && c < 0177)
|
|
|
707 col++;
|
|
|
708 else if (c == '\n')
|
|
|
709 break;
|
|
|
710 else if (c == '\t')
|
|
|
711 {
|
|
|
712 if (tab_seen)
|
|
|
713 col = ((col + tab_width) / tab_width) * tab_width;
|
|
|
714
|
|
|
715 post_tab += col;
|
|
|
716 col = 0;
|
|
|
717 tab_seen = 1;
|
|
|
718 }
|
|
|
719 else
|
|
|
720 col += (ctl_arrow && c < 0200) ? 2 : 4;
|
|
|
721 }
|
|
|
722
|
|
|
723 if (tab_seen)
|
|
|
724 {
|
|
|
725 col = ((col + tab_width) / tab_width) * tab_width;
|
|
|
726 col += post_tab;
|
|
|
727 }
|
|
|
728
|
|
|
729 return col;
|
|
|
730 }
|
|
37917
|
731
|
|
|
732 #endif /* 0 */
|
|
|
733
|
|
11300
|
734
|
|
165
|
735 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ",
|
|
40123
|
736 doc: /* Indent from point with tabs and spaces until COLUMN is reached.
|
|
|
737 Optional second argument MININUM says always do at least MININUM spaces
|
|
|
738 even if that goes past COLUMN; by default, MININUM is zero. */)
|
|
|
739 (column, minimum)
|
|
14078
|
740 Lisp_Object column, minimum;
|
|
165
|
741 {
|
|
|
742 int mincol;
|
|
|
743 register int fromcol;
|
|
|
744 register int tab_width = XINT (current_buffer->tab_width);
|
|
|
745
|
|
40656
|
746 CHECK_NUMBER (column);
|
|
488
|
747 if (NILP (minimum))
|
|
9310
|
748 XSETFASTINT (minimum, 0);
|
|
40656
|
749 CHECK_NUMBER (minimum);
|
|
165
|
750
|
|
|
751 fromcol = current_column ();
|
|
|
752 mincol = fromcol + XINT (minimum);
|
|
14078
|
753 if (mincol < XINT (column)) mincol = XINT (column);
|
|
165
|
754
|
|
|
755 if (fromcol == mincol)
|
|
|
756 return make_number (mincol);
|
|
|
757
|
|
2325
|
758 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
165
|
759
|
|
|
760 if (indent_tabs_mode)
|
|
|
761 {
|
|
|
762 Lisp_Object n;
|
|
9310
|
763 XSETFASTINT (n, mincol / tab_width - fromcol / tab_width);
|
|
165
|
764 if (XFASTINT (n) != 0)
|
|
|
765 {
|
|
8648
|
766 Finsert_char (make_number ('\t'), n, Qt);
|
|
165
|
767
|
|
|
768 fromcol = (mincol / tab_width) * tab_width;
|
|
|
769 }
|
|
|
770 }
|
|
|
771
|
|
14078
|
772 XSETFASTINT (column, mincol - fromcol);
|
|
|
773 Finsert_char (make_number (' '), column, Qt);
|
|
165
|
774
|
|
|
775 last_known_column = mincol;
|
|
16039
|
776 last_known_column_point = PT;
|
|
165
|
777 last_known_column_modified = MODIFF;
|
|
|
778
|
|
14078
|
779 XSETINT (column, mincol);
|
|
|
780 return column;
|
|
165
|
781 }
|
|
9407
|
782
|
|
165
|
783
|
|
46303
|
784 static double position_indentation P_ ((int));
|
|
21514
|
785
|
|
165
|
786 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
|
|
40123
|
787 0, 0, 0,
|
|
|
788 doc: /* Return the indentation of the current line.
|
|
|
789 This is the horizontal position of the character
|
|
|
790 following any initial whitespace. */)
|
|
|
791 ()
|
|
165
|
792 {
|
|
|
793 Lisp_Object val;
|
|
20571
|
794 int opoint = PT, opoint_byte = PT_BYTE;
|
|
165
|
795
|
|
20571
|
796 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
|
|
|
797
|
|
45622
|
798 XSETFASTINT (val, (int) position_indentation (PT_BYTE)); /* iftc */
|
|
20571
|
799 SET_PT_BOTH (opoint, opoint_byte);
|
|
165
|
800 return val;
|
|
|
801 }
|
|
|
802
|
|
46303
|
803 static double
|
|
20571
|
804 position_indentation (pos_byte)
|
|
|
805 register int pos_byte;
|
|
165
|
806 {
|
|
|
807 register int column = 0;
|
|
|
808 register int tab_width = XINT (current_buffer->tab_width);
|
|
|
809 register unsigned char *p;
|
|
|
810 register unsigned char *stop;
|
|
15493
|
811 unsigned char *start;
|
|
20571
|
812 int next_boundary_byte = pos_byte;
|
|
|
813 int ceiling = next_boundary_byte;
|
|
10538
|
814
|
|
2325
|
815 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
10538
|
816
|
|
20571
|
817 p = BYTE_POS_ADDR (pos_byte);
|
|
15493
|
818 /* STOP records the value of P at which we will need
|
|
|
819 to think about the gap, or about invisible text,
|
|
|
820 or about the end of the buffer. */
|
|
|
821 stop = p;
|
|
|
822 /* START records the starting value of P. */
|
|
|
823 start = p;
|
|
165
|
824 while (1)
|
|
|
825 {
|
|
|
826 while (p == stop)
|
|
|
827 {
|
|
20571
|
828 int stop_pos_byte;
|
|
15493
|
829
|
|
20571
|
830 /* If we have updated P, set POS_BYTE to match.
|
|
|
831 The first time we enter the loop, POS_BYTE is already right. */
|
|
15493
|
832 if (p != start)
|
|
20571
|
833 pos_byte = PTR_BYTE_POS (p);
|
|
15493
|
834 /* Consider the various reasons STOP might have been set here. */
|
|
20571
|
835 if (pos_byte == ZV_BYTE)
|
|
165
|
836 return column;
|
|
20571
|
837 if (pos_byte == next_boundary_byte)
|
|
|
838 {
|
|
|
839 int next_boundary;
|
|
|
840 int pos = BYTE_TO_CHAR (pos_byte);
|
|
|
841 pos = skip_invisible (pos, &next_boundary, ZV, Qnil);
|
|
|
842 pos_byte = CHAR_TO_BYTE (pos);
|
|
|
843 next_boundary_byte = CHAR_TO_BYTE (next_boundary);
|
|
|
844 }
|
|
|
845 if (pos_byte >= ceiling)
|
|
|
846 ceiling = BUFFER_CEILING_OF (pos_byte) + 1;
|
|
15493
|
847 /* Compute the next place we need to stop and think,
|
|
|
848 and set STOP accordingly. */
|
|
20571
|
849 stop_pos_byte = min (ceiling, next_boundary_byte);
|
|
15493
|
850 /* The -1 and +1 arrange to point at the first byte of gap
|
|
20571
|
851 (if STOP_POS_BYTE is the position of the gap)
|
|
15493
|
852 rather than at the data after the gap. */
|
|
45622
|
853
|
|
20571
|
854 stop = BYTE_POS_ADDR (stop_pos_byte - 1) + 1;
|
|
|
855 p = BYTE_POS_ADDR (pos_byte);
|
|
165
|
856 }
|
|
|
857 switch (*p++)
|
|
|
858 {
|
|
20256
|
859 case 0240:
|
|
|
860 if (! NILP (current_buffer->enable_multibyte_characters))
|
|
|
861 return column;
|
|
165
|
862 case ' ':
|
|
|
863 column++;
|
|
|
864 break;
|
|
|
865 case '\t':
|
|
|
866 column += tab_width - column % tab_width;
|
|
|
867 break;
|
|
|
868 default:
|
|
20256
|
869 if (ASCII_BYTE_P (p[-1])
|
|
|
870 || NILP (current_buffer->enable_multibyte_characters))
|
|
|
871 return column;
|
|
|
872 {
|
|
20571
|
873 int c;
|
|
|
874 pos_byte = PTR_BYTE_POS (p - 1);
|
|
|
875 c = FETCH_MULTIBYTE_CHAR (pos_byte);
|
|
20256
|
876 if (CHAR_HAS_CATEGORY (c, ' '))
|
|
|
877 {
|
|
|
878 column++;
|
|
20571
|
879 INC_POS (pos_byte);
|
|
|
880 p = BYTE_POS_ADDR (pos_byte);
|
|
20256
|
881 }
|
|
|
882 else
|
|
|
883 return column;
|
|
|
884 }
|
|
165
|
885 }
|
|
|
886 }
|
|
|
887 }
|
|
5943
|
888
|
|
|
889 /* Test whether the line beginning at POS is indented beyond COLUMN.
|
|
|
890 Blank lines are treated as if they had the same indentation as the
|
|
|
891 preceding line. */
|
|
20571
|
892
|
|
5943
|
893 int
|
|
20571
|
894 indented_beyond_p (pos, pos_byte, column)
|
|
45622
|
895 int pos, pos_byte;
|
|
46303
|
896 double column;
|
|
5943
|
897 {
|
|
46303
|
898 double val;
|
|
20571
|
899 int opoint = PT, opoint_byte = PT_BYTE;
|
|
|
900
|
|
|
901 SET_PT_BOTH (pos, pos_byte);
|
|
|
902 while (PT > BEGV && FETCH_BYTE (PT_BYTE) == '\n')
|
|
|
903 scan_newline (PT - 1, PT_BYTE - 1, BEGV, BEGV_BYTE, -1, 0);
|
|
|
904
|
|
21525
|
905 val = position_indentation (PT_BYTE);
|
|
20571
|
906 SET_PT_BOTH (opoint, opoint_byte);
|
|
45622
|
907 return val >= column; /* hmm, float comparison */
|
|
5943
|
908 }
|
|
165
|
909
|
|
13124
|
910 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
|
|
40123
|
911 doc: /* Move point to column COLUMN in the current line.
|
|
|
912 The column of a character is calculated by adding together the widths
|
|
|
913 as displayed of the previous characters in the line.
|
|
|
914 This function ignores line-continuation;
|
|
|
915 there is no upper limit on the column number a character can have
|
|
|
916 and horizontal scrolling has no effect.
|
|
|
917
|
|
|
918 If specified column is within a character, point goes after that character.
|
|
|
919 If it's past end of line, point goes to end of line.
|
|
|
920
|
|
|
921 A non-nil second (optional) argument FORCE means,
|
|
|
922 if COLUMN is in the middle of a tab character, change it to spaces.
|
|
|
923 In addition, if FORCE is t, and the line is too short
|
|
|
924 to reach column COLUMN, add spaces/tabs to get there.
|
|
|
925
|
|
|
926 The return value is the current column. */)
|
|
|
927 (column, force)
|
|
165
|
928 Lisp_Object column, force;
|
|
|
929 {
|
|
|
930 register int pos;
|
|
|
931 register int col = current_column ();
|
|
|
932 register int goal;
|
|
|
933 register int end;
|
|
|
934 register int tab_width = XINT (current_buffer->tab_width);
|
|
488
|
935 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
|
|
13185
|
936 register struct Lisp_Char_Table *dp = buffer_display_table ();
|
|
17016
|
937 register int multibyte = !NILP (current_buffer->enable_multibyte_characters);
|
|
165
|
938
|
|
|
939 Lisp_Object val;
|
|
31829
|
940 int prev_col = 0;
|
|
|
941 int c = 0;
|
44701
2ea69a6d8885
(Fmove_to_column): Remove unused local variable `next_boundary_byte'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
942 int next_boundary, pos_byte;
|
|
15493
|
943
|
|
2325
|
944 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
40656
|
945 CHECK_NATNUM (column);
|
|
165
|
946 goal = XINT (column);
|
|
|
947
|
|
16039
|
948 pos = PT;
|
|
20571
|
949 pos_byte = PT_BYTE;
|
|
165
|
950 end = ZV;
|
|
15493
|
951 next_boundary = pos;
|
|
165
|
952
|
|
|
953 /* If we're starting past the desired column,
|
|
|
954 back up to beginning of line and scan from there. */
|
|
|
955 if (col > goal)
|
|
|
956 {
|
|
15493
|
957 end = pos;
|
|
17016
|
958 pos = current_column_bol_cache;
|
|
20571
|
959 pos_byte = CHAR_TO_BYTE (pos);
|
|
165
|
960 col = 0;
|
|
|
961 }
|
|
|
962
|
|
15554
|
963 while (pos < end)
|
|
165
|
964 {
|
|
15493
|
965 while (pos == next_boundary)
|
|
|
966 {
|
|
20571
|
967 int prev = pos;
|
|
15493
|
968 pos = skip_invisible (pos, &next_boundary, end, Qnil);
|
|
20571
|
969 if (pos != prev)
|
|
|
970 pos_byte = CHAR_TO_BYTE (pos);
|
|
15493
|
971 if (pos >= end)
|
|
|
972 goto endloop;
|
|
|
973 }
|
|
|
974
|
|
15554
|
975 /* Test reaching the goal column. We do this after skipping
|
|
|
976 invisible characters, so that we put point before the
|
|
|
977 character on which the cursor will appear. */
|
|
|
978 if (col >= goal)
|
|
|
979 break;
|
|
|
980
|
|
26859
|
981 /* Check composition sequence. */
|
|
|
982 {
|
|
|
983 int len, len_byte, width;
|
|
|
984
|
|
|
985 if (check_composition (pos, pos_byte, Z, &len, &len_byte, &width))
|
|
|
986 {
|
|
|
987 pos += len;
|
|
|
988 pos_byte += len_byte;
|
|
|
989 col += width;
|
|
|
990 continue;
|
|
|
991 }
|
|
|
992 }
|
|
|
993
|
|
20571
|
994 c = FETCH_BYTE (pos_byte);
|
|
36846
|
995
|
|
40720
|
996 /* See if there is a display table and it relates
|
|
|
997 to this character. */
|
|
|
998
|
|
20938
|
999 if (dp != 0
|
|
|
1000 && ! (multibyte && BASE_LEADING_CODE_P (c))
|
|
|
1001 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
|
|
11037
|
1002 {
|
|
40720
|
1003 Lisp_Object charvec;
|
|
|
1004 EMACS_INT i, n;
|
|
|
1005
|
|
|
1006 /* This character is displayed using a vector of glyphs.
|
|
|
1007 Update the position based on those glyphs. */
|
|
|
1008
|
|
36846
|
1009 charvec = DISP_CHAR_VECTOR (dp, c);
|
|
|
1010 n = ASIZE (charvec);
|
|
|
1011
|
|
40720
|
1012 for (i = 0; i < n; i++)
|
|
36846
|
1013 {
|
|
|
1014 /* This should be handled the same as
|
|
|
1015 next_element_from_display_vector does it. */
|
|
40720
|
1016
|
|
|
1017 Lisp_Object entry;
|
|
|
1018 entry = AREF (charvec, i);
|
|
|
1019
|
|
36846
|
1020 if (INTEGERP (entry)
|
|
|
1021 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
|
|
|
1022 c = FAST_GLYPH_CHAR (XFASTINT (entry));
|
|
|
1023 else
|
|
|
1024 c = ' ';
|
|
|
1025
|
|
40720
|
1026 if (c == '\n')
|
|
|
1027 goto endloop;
|
|
|
1028 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
|
|
|
1029 goto endloop;
|
|
|
1030 if (c == '\t')
|
|
|
1031 {
|
|
|
1032 prev_col = col;
|
|
|
1033 col += tab_width;
|
|
|
1034 col = col / tab_width * tab_width;
|
|
|
1035 }
|
|
|
1036 else
|
|
|
1037 ++col;
|
|
|
1038 }
|
|
|
1039 }
|
|
|
1040 else
|
|
|
1041 {
|
|
|
1042 /* The display table doesn't affect this character;
|
|
|
1043 it displays as itself. */
|
|
|
1044
|
|
36846
|
1045 if (c == '\n')
|
|
|
1046 goto endloop;
|
|
|
1047 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
|
|
|
1048 goto endloop;
|
|
|
1049 if (c == '\t')
|
|
|
1050 {
|
|
|
1051 prev_col = col;
|
|
|
1052 col += tab_width;
|
|
|
1053 col = col / tab_width * tab_width;
|
|
|
1054 }
|
|
|
1055 else if (ctl_arrow && (c < 040 || c == 0177))
|
|
|
1056 col += 2;
|
|
|
1057 else if (c < 040 || c == 0177)
|
|
|
1058 col += 4;
|
|
|
1059 else if (c < 0177)
|
|
|
1060 col++;
|
|
|
1061 else if (multibyte && BASE_LEADING_CODE_P (c))
|
|
|
1062 {
|
|
|
1063 /* Start of multi-byte form. */
|
|
|
1064 unsigned char *ptr;
|
|
|
1065 int bytes, width, wide_column;
|
|
|
1066
|
|
|
1067 ptr = BYTE_POS_ADDR (pos_byte);
|
|
|
1068 MULTIBYTE_BYTES_WIDTH (ptr, dp);
|
|
40720
|
1069 pos_byte += bytes - 1;
|
|
36846
|
1070 col += width;
|
|
|
1071 }
|
|
|
1072 else
|
|
|
1073 col += 4;
|
|
|
1074 }
|
|
40720
|
1075
|
|
|
1076 pos++;
|
|
|
1077 pos_byte++;
|
|
165
|
1078 }
|
|
15493
|
1079 endloop:
|
|
165
|
1080
|
|
20571
|
1081 SET_PT_BOTH (pos, pos_byte);
|
|
165
|
1082
|
|
|
1083 /* If a tab char made us overshoot, change it to spaces
|
|
|
1084 and scan through it again. */
|
|
488
|
1085 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
|
|
165
|
1086 {
|
|
28933
|
1087 int goal_pt, goal_pt_byte;
|
|
|
1088
|
|
|
1089 /* Insert spaces in front of the tab to reach GOAL. Do this
|
|
|
1090 first so that a marker at the end of the tab gets
|
|
|
1091 adjusted. */
|
|
|
1092 SET_PT_BOTH (PT - 1, PT_BYTE - 1);
|
|
|
1093 Finsert_char (make_number (' '), make_number (goal - prev_col), Qt);
|
|
573
|
1094
|
|
28933
|
1095 /* Now delete the tab, and indent to COL. */
|
|
|
1096 del_range (PT, PT + 1);
|
|
|
1097 goal_pt = PT;
|
|
|
1098 goal_pt_byte = PT_BYTE;
|
|
573
|
1099 Findent_to (make_number (col), Qnil);
|
|
28933
|
1100 SET_PT_BOTH (goal_pt, goal_pt_byte);
|
|
45622
|
1101
|
|
4385
|
1102 /* Set the last_known... vars consistently. */
|
|
|
1103 col = goal;
|
|
165
|
1104 }
|
|
|
1105
|
|
|
1106 /* If line ends prematurely, add space to the end. */
|
|
25073
|
1107 if (col < goal && EQ (force, Qt))
|
|
1208
|
1108 Findent_to (make_number (col = goal), Qnil);
|
|
165
|
1109
|
|
|
1110 last_known_column = col;
|
|
16039
|
1111 last_known_column_point = PT;
|
|
165
|
1112 last_known_column_modified = MODIFF;
|
|
|
1113
|
|
9310
|
1114 XSETFASTINT (val, col);
|
|
165
|
1115 return val;
|
|
|
1116 }
|
|
|
1117
|
|
9407
|
1118 /* compute_motion: compute buffer posn given screen posn and vice versa */
|
|
|
1119
|
|
165
|
1120 struct position val_compute_motion;
|
|
|
1121
|
|
|
1122 /* Scan the current buffer forward from offset FROM, pretending that
|
|
|
1123 this is at line FROMVPOS, column FROMHPOS, until reaching buffer
|
|
|
1124 offset TO or line TOVPOS, column TOHPOS (whichever comes first),
|
|
9407
|
1125 and return the ending buffer position and screen location. If we
|
|
|
1126 can't hit the requested column exactly (because of a tab or other
|
|
|
1127 multi-column character), overshoot.
|
|
165
|
1128
|
|
11853
|
1129 DID_MOTION is 1 if FROMHPOS has already accounted for overlay strings
|
|
|
1130 at FROM. This is the case if FROMVPOS and FROMVPOS came from an
|
|
|
1131 earlier call to compute_motion. The other common case is that FROMHPOS
|
|
|
1132 is zero and FROM is a position that "belongs" at column zero, but might
|
|
|
1133 be shifted by overlay strings; in this case DID_MOTION should be 0.
|
|
|
1134
|
|
165
|
1135 WIDTH is the number of columns available to display text;
|
|
|
1136 compute_motion uses this to handle continuation lines and such.
|
|
56584
|
1137 If WIDTH is -1, use width of window's text area adjusted for
|
|
|
1138 continuation glyph when needed.
|
|
|
1139
|
|
165
|
1140 HSCROLL is the number of columns not being displayed at the left
|
|
|
1141 margin; this is usually taken from a window's hscroll member.
|
|
543
|
1142 TAB_OFFSET is the number of columns of the first tab that aren't
|
|
|
1143 being displayed, perhaps because of a continuation line or
|
|
|
1144 something.
|
|
165
|
1145
|
|
|
1146 compute_motion returns a pointer to a struct position. The bufpos
|
|
|
1147 member gives the buffer position at the end of the scan, and hpos
|
|
9407
|
1148 and vpos give its cartesian location. prevhpos is the column at
|
|
|
1149 which the character before bufpos started, and contin is non-zero
|
|
|
1150 if we reached the current line by continuing the previous.
|
|
|
1151
|
|
|
1152 Note that FROMHPOS and TOHPOS should be expressed in real screen
|
|
|
1153 columns, taking HSCROLL and the truncation glyph at the left margin
|
|
|
1154 into account. That is, beginning-of-line moves you to the hpos
|
|
|
1155 -HSCROLL + (HSCROLL > 0).
|
|
165
|
1156
|
|
|
1157 For example, to find the buffer position of column COL of line LINE
|
|
|
1158 of a certain window, pass the window's starting location as FROM
|
|
|
1159 and the window's upper-left coordinates as FROMVPOS and FROMHPOS.
|
|
|
1160 Pass the buffer's ZV as TO, to limit the scan to the end of the
|
|
|
1161 visible section of the buffer, and pass LINE and COL as TOVPOS and
|
|
10538
|
1162 TOHPOS.
|
|
165
|
1163
|
|
|
1164 When displaying in window w, a typical formula for WIDTH is:
|
|
|
1165
|
|
|
1166 window_width - 1
|
|
1994
|
1167 - (has_vertical_scroll_bars
|
|
51206
|
1168 ? WINDOW_CONFIG_SCROLL_BAR_COLS (window)
|
|
|
1169 : (window_width + window_left != frame_cols))
|
|
165
|
1170
|
|
|
1171 where
|
|
51206
|
1172 window_width is XFASTINT (w->total_cols),
|
|
|
1173 window_left is XFASTINT (w->left_col),
|
|
1994
|
1174 has_vertical_scroll_bars is
|
|
51206
|
1175 WINDOW_HAS_VERTICAL_SCROLL_BAR (window)
|
|
|
1176 and frame_cols = FRAME_COLS (XFRAME (window->frame))
|
|
165
|
1177
|
|
51206
|
1178 Or you can let window_box_text_cols do this all for you, and write:
|
|
|
1179 window_box_text_cols (w) - 1
|
|
1777
|
1180
|
|
|
1181 The `-1' accounts for the continuation-line backslashes; the rest
|
|
5941
|
1182 accounts for window borders if the window is split horizontally, and
|
|
6400
|
1183 the scroll bars if they are turned on. */
|
|
165
|
1184
|
|
|
1185 struct position *
|
|
11853
|
1186 compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win)
|
|
165
|
1187 int from, fromvpos, fromhpos, to, tovpos, tohpos;
|
|
11853
|
1188 int did_motion;
|
|
165
|
1189 register int width;
|
|
|
1190 int hscroll, tab_offset;
|
|
6691
|
1191 struct window *win;
|
|
165
|
1192 {
|
|
526
|
1193 register int hpos = fromhpos;
|
|
|
1194 register int vpos = fromvpos;
|
|
165
|
1195
|
|
|
1196 register int pos;
|
|
20571
|
1197 int pos_byte;
|
|
31829
|
1198 register int c = 0;
|
|
165
|
1199 register int tab_width = XFASTINT (current_buffer->tab_width);
|
|
488
|
1200 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
|
|
13185
|
1201 register struct Lisp_Char_Table *dp = window_display_table (win);
|
|
165
|
1202 int selective
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1203 = (INTEGERP (current_buffer->selective_display)
|
6846
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1204 ? XINT (current_buffer->selective_display)
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1205 : !NILP (current_buffer->selective_display) ? -1 : 0);
|
|
165
|
1206 int selective_rlen
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1207 = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
|
|
2017
|
1208 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
|
|
11853
|
1209 /* The next location where the `invisible' property changes, or an
|
|
|
1210 overlay starts or ends. */
|
|
|
1211 int next_boundary = from;
|
|
165
|
1212
|
|
9407
|
1213 /* For computing runs of characters with similar widths.
|
|
|
1214 Invariant: width_run_width is zero, or all the characters
|
|
10538
|
1215 from width_run_start to width_run_end have a fixed width of
|
|
9407
|
1216 width_run_width. */
|
|
|
1217 int width_run_start = from;
|
|
|
1218 int width_run_end = from;
|
|
|
1219 int width_run_width = 0;
|
|
|
1220 Lisp_Object *width_table;
|
|
10964
|
1221 Lisp_Object buffer;
|
|
9407
|
1222
|
|
|
1223 /* The next buffer pos where we should consult the width run cache. */
|
|
|
1224 int next_width_run = from;
|
|
15059
|
1225 Lisp_Object window;
|
|
9407
|
1226
|
|
17016
|
1227 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
|
|
21996
|
1228 /* If previous char scanned was a wide character,
|
|
|
1229 this is the column where it ended. Otherwise, this is 0. */
|
|
|
1230 int wide_column_end_hpos = 0;
|
|
17016
|
1231 int prev_pos; /* Previous buffer position. */
|
|
20571
|
1232 int prev_pos_byte; /* Previous buffer position. */
|
|
54240
|
1233 int prev_hpos = 0;
|
|
|
1234 int prev_vpos = 0;
|
|
17016
|
1235 int contin_hpos; /* HPOS of last column of continued line. */
|
|
|
1236 int prev_tab_offset; /* Previous tab offset. */
|
|
56593
|
1237 int continuation_glyph_width;
|
|
17016
|
1238
|
|
10964
|
1239 XSETBUFFER (buffer, current_buffer);
|
|
15059
|
1240 XSETWINDOW (window, win);
|
|
10964
|
1241
|
|
9407
|
1242 width_run_cache_on_off ();
|
|
|
1243 if (dp == buffer_display_table ())
|
|
|
1244 width_table = (VECTORP (current_buffer->width_table)
|
|
|
1245 ? XVECTOR (current_buffer->width_table)->contents
|
|
|
1246 : 0);
|
|
|
1247 else
|
|
|
1248 /* If the window has its own display table, we can't use the width
|
|
|
1249 run cache, because that's based on the buffer's display table. */
|
|
|
1250 width_table = 0;
|
|
|
1251
|
|
28537
|
1252 if (tab_width <= 0 || tab_width > 1000)
|
|
|
1253 tab_width = 8;
|
|
|
1254
|
|
56584
|
1255 /* Negative width means use all available text columns. */
|
|
|
1256 if (width < 0)
|
|
|
1257 {
|
|
|
1258 width = window_box_text_cols (win);
|
|
|
1259 /* We must make room for continuation marks if we don't have fringes. */
|
|
|
1260 #ifdef HAVE_WINDOW_SYSTEM
|
|
|
1261 if (!FRAME_WINDOW_P (XFRAME (win->frame)))
|
|
|
1262 #endif
|
|
|
1263 width -= 1;
|
|
|
1264 }
|
|
|
1265
|
|
56594
|
1266 continuation_glyph_width = 1;
|
|
56593
|
1267 #ifdef HAVE_WINDOW_SYSTEM
|
|
56594
|
1268 if (FRAME_WINDOW_P (XFRAME (win->frame)))
|
|
|
1269 continuation_glyph_width = 0; /* In the fringe. */
|
|
56593
|
1270 #endif
|
|
|
1271
|
|
28537
|
1272 immediate_quit = 1;
|
|
|
1273 QUIT;
|
|
526
|
1274
|
|
17016
|
1275 pos = prev_pos = from;
|
|
20571
|
1276 pos_byte = prev_pos_byte = CHAR_TO_BYTE (from);
|
|
17016
|
1277 contin_hpos = 0;
|
|
|
1278 prev_tab_offset = tab_offset;
|
|
11853
|
1279 while (1)
|
|
|
1280 {
|
|
|
1281 while (pos == next_boundary)
|
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1282 {
|
|
20571
|
1283 int pos_here = pos;
|
|
17966
|
1284 int newpos;
|
|
|
1285
|
|
22245
|
1286 /* Don't skip invisible if we are already at the margin. */
|
|
41900
|
1287 if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
|
|
22245
|
1288 {
|
|
|
1289 if (contin_hpos && prev_hpos == 0
|
|
|
1290 && hpos > tohpos
|
|
|
1291 && (contin_hpos == width || wide_column_end_hpos > width))
|
|
|
1292 { /* Line breaks because we can't put the character at the
|
|
|
1293 previous line any more. It is not the multi-column
|
|
|
1294 character continued in middle. Go back to previous
|
|
|
1295 buffer position, screen position, and set tab offset
|
|
|
1296 to previous value. It's the beginning of the
|
|
|
1297 line. */
|
|
|
1298 pos = prev_pos;
|
|
|
1299 pos_byte = prev_pos_byte;
|
|
|
1300 hpos = prev_hpos;
|
|
54240
|
1301 vpos = prev_vpos;
|
|
22245
|
1302 tab_offset = prev_tab_offset;
|
|
|
1303 }
|
|
|
1304 break;
|
|
|
1305 }
|
|
|
1306
|
|
11853
|
1307 /* If the caller says that the screen position came from an earlier
|
|
|
1308 call to compute_motion, then we've already accounted for the
|
|
|
1309 overlay strings at point. This is only true the first time
|
|
|
1310 through, so clear the flag after testing it. */
|
|
|
1311 if (!did_motion)
|
|
|
1312 /* We need to skip past the overlay strings. Currently those
|
|
17016
|
1313 strings must not contain TAB;
|
|
11853
|
1314 if we want to relax that restriction, something will have
|
|
|
1315 to be changed here. */
|
|
17016
|
1316 {
|
|
|
1317 unsigned char *ovstr;
|
|
|
1318 int ovlen = overlay_strings (pos, win, &ovstr);
|
|
21283
|
1319 hpos += ((multibyte && ovlen > 0)
|
|
|
1320 ? strwidth (ovstr, ovlen) : ovlen);
|
|
17016
|
1321 }
|
|
11853
|
1322 did_motion = 0;
|
|
10964
|
1323
|
|
11853
|
1324 if (pos >= to)
|
|
|
1325 break;
|
|
10964
|
1326
|
|
15493
|
1327 /* Advance POS past invisible characters
|
|
|
1328 (but not necessarily all that there are here),
|
|
|
1329 and store in next_boundary the next position where
|
|
|
1330 we need to call skip_invisible. */
|
|
17966
|
1331 newpos = skip_invisible (pos, &next_boundary, to, window);
|
|
|
1332
|
|
|
1333 if (newpos >= to)
|
|
21919
|
1334 {
|
|
|
1335 pos = min (to, newpos);
|
|
33871
|
1336 pos_byte = CHAR_TO_BYTE (pos);
|
|
21919
|
1337 goto after_loop;
|
|
|
1338 }
|
|
17966
|
1339
|
|
20571
|
1340 if (newpos != pos_here)
|
|
|
1341 {
|
|
|
1342 pos = newpos;
|
|
|
1343 pos_byte = CHAR_TO_BYTE (pos);
|
|
|
1344 }
|
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1345 }
|
|
11853
|
1346
|
|
|
1347 /* Handle right margin. */
|
|
17016
|
1348 /* Note on a wide-column character.
|
|
|
1349
|
|
|
1350 Characters are classified into the following three categories
|
|
|
1351 according to the width (columns occupied on screen).
|
|
|
1352
|
|
|
1353 (1) single-column character: ex. `a'
|
|
|
1354 (2) multi-column character: ex. `^A', TAB, `\033'
|
|
|
1355 (3) wide-column character: ex. Japanese character, Chinese character
|
|
|
1356 (In the following example, `W_' stands for them.)
|
|
|
1357
|
|
|
1358 Multi-column characters can be divided around the right margin,
|
|
|
1359 but wide-column characters cannot.
|
|
|
1360
|
|
|
1361 NOTE:
|
|
|
1362
|
|
|
1363 (*) The cursor is placed on the next character after the point.
|
|
|
1364
|
|
|
1365 ----------
|
|
|
1366 abcdefghi\
|
|
|
1367 j ^---- next after the point
|
|
|
1368 ^--- next char. after the point.
|
|
|
1369 ----------
|
|
|
1370 In case of sigle-column character
|
|
|
1371
|
|
|
1372 ----------
|
|
|
1373 abcdefgh\\
|
|
|
1374 033 ^---- next after the point, next char. after the point.
|
|
|
1375 ----------
|
|
|
1376 In case of multi-column character
|
|
|
1377
|
|
|
1378 ----------
|
|
|
1379 abcdefgh\\
|
|
|
1380 W_ ^---- next after the point
|
|
|
1381 ^---- next char. after the point.
|
|
|
1382 ----------
|
|
45622
|
1383 In case of wide-column character
|
|
17016
|
1384
|
|
|
1385 The problem here is continuation at a wide-column character.
|
|
|
1386 In this case, the line may shorter less than WIDTH.
|
|
|
1387 And we find the continuation AFTER it occurs.
|
|
|
1388
|
|
|
1389 */
|
|
|
1390
|
|
|
1391 if (hpos > width)
|
|
11853
|
1392 {
|
|
|
1393 if (hscroll
|
|
|
1394 || (truncate_partial_width_windows
|
|
56593
|
1395 && ((width + continuation_glyph_width)
|
|
|
1396 < FRAME_COLS (XFRAME (WINDOW_FRAME (win)))))
|
|
11853
|
1397 || !NILP (current_buffer->truncate_lines))
|
|
|
1398 {
|
|
20876
|
1399 /* Truncating: skip to newline, unless we are already past
|
|
|
1400 TO (we need to go back below). */
|
|
|
1401 if (pos <= to)
|
|
20571
|
1402 {
|
|
|
1403 pos = find_before_next_newline (pos, to, 1);
|
|
|
1404 pos_byte = CHAR_TO_BYTE (pos);
|
|
20876
|
1405 hpos = width;
|
|
|
1406 /* If we just skipped next_boundary,
|
|
|
1407 loop around in the main while
|
|
|
1408 and handle it. */
|
|
|
1409 if (pos >= next_boundary)
|
|
|
1410 next_boundary = pos + 1;
|
|
|
1411 prev_hpos = width;
|
|
54240
|
1412 prev_vpos = vpos;
|
|
20876
|
1413 prev_tab_offset = tab_offset;
|
|
20571
|
1414 }
|
|
11853
|
1415 }
|
|
|
1416 else
|
|
|
1417 {
|
|
|
1418 /* Continuing. */
|
|
17016
|
1419 /* Remember the previous value. */
|
|
|
1420 prev_tab_offset = tab_offset;
|
|
|
1421
|
|
20938
|
1422 if (wide_column_end_hpos > width)
|
|
17016
|
1423 {
|
|
|
1424 hpos -= prev_hpos;
|
|
|
1425 tab_offset += prev_hpos;
|
|
|
1426 }
|
|
|
1427 else
|
|
|
1428 {
|
|
|
1429 tab_offset += width;
|
|
|
1430 hpos -= width;
|
|
|
1431 }
|
|
|
1432 vpos++;
|
|
|
1433 contin_hpos = prev_hpos;
|
|
|
1434 prev_hpos = 0;
|
|
55311
|
1435 prev_vpos = vpos;
|
|
11853
|
1436 }
|
|
|
1437 }
|
|
|
1438
|
|
|
1439 /* Stop if past the target buffer position or screen position. */
|
|
21994
|
1440 if (pos > to)
|
|
17016
|
1441 {
|
|
|
1442 /* Go back to the previous position. */
|
|
|
1443 pos = prev_pos;
|
|
20571
|
1444 pos_byte = prev_pos_byte;
|
|
17016
|
1445 hpos = prev_hpos;
|
|
54240
|
1446 vpos = prev_vpos;
|
|
17016
|
1447 tab_offset = prev_tab_offset;
|
|
|
1448
|
|
|
1449 /* NOTE on contin_hpos, hpos, and prev_hpos.
|
|
|
1450
|
|
|
1451 ----------
|
|
|
1452 abcdefgh\\
|
|
|
1453 W_ ^---- contin_hpos
|
|
|
1454 | ^----- hpos
|
|
|
1455 \---- prev_hpos
|
|
|
1456 ----------
|
|
|
1457 */
|
|
|
1458
|
|
|
1459 if (contin_hpos && prev_hpos == 0
|
|
20938
|
1460 && contin_hpos < width && !wide_column_end_hpos)
|
|
17016
|
1461 {
|
|
|
1462 /* Line breaking occurs in the middle of multi-column
|
|
|
1463 character. Go back to previous line. */
|
|
|
1464 hpos = contin_hpos;
|
|
|
1465 vpos = vpos - 1;
|
|
|
1466 }
|
|
|
1467 break;
|
|
|
1468 }
|
|
|
1469
|
|
41900
|
1470 if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos))
|
|
21994
|
1471 {
|
|
|
1472 if (contin_hpos && prev_hpos == 0
|
|
22000
|
1473 && hpos > tohpos
|
|
|
1474 && (contin_hpos == width || wide_column_end_hpos > width))
|
|
21994
|
1475 { /* Line breaks because we can't put the character at the
|
|
|
1476 previous line any more. It is not the multi-column
|
|
|
1477 character continued in middle. Go back to previous
|
|
|
1478 buffer position, screen position, and set tab offset
|
|
|
1479 to previous value. It's the beginning of the
|
|
|
1480 line. */
|
|
|
1481 pos = prev_pos;
|
|
|
1482 pos_byte = prev_pos_byte;
|
|
|
1483 hpos = prev_hpos;
|
|
54240
|
1484 vpos = prev_vpos;
|
|
21994
|
1485 tab_offset = prev_tab_offset;
|
|
|
1486 }
|
|
|
1487 break;
|
|
|
1488 }
|
|
17016
|
1489 if (pos == ZV) /* We cannot go beyond ZV. Stop here. */
|
|
11853
|
1490 break;
|
|
|
1491
|
|
|
1492 prev_hpos = hpos;
|
|
54240
|
1493 prev_vpos = vpos;
|
|
17016
|
1494 prev_pos = pos;
|
|
20571
|
1495 prev_pos_byte = pos_byte;
|
|
20938
|
1496 wide_column_end_hpos = 0;
|
|
9407
|
1497
|
|
|
1498 /* Consult the width run cache to see if we can avoid inspecting
|
|
|
1499 the text character-by-character. */
|
|
|
1500 if (current_buffer->width_run_cache && pos >= next_width_run)
|
|
|
1501 {
|
|
|
1502 int run_end;
|
|
|
1503 int common_width
|
|
|
1504 = region_cache_forward (current_buffer,
|
|
|
1505 current_buffer->width_run_cache,
|
|
|
1506 pos, &run_end);
|
|
|
1507
|
|
|
1508 /* A width of zero means the character's width varies (like
|
|
|
1509 a tab), is meaningless (like a newline), or we just don't
|
|
|
1510 want to skip over it for some other reason. */
|
|
|
1511 if (common_width != 0)
|
|
|
1512 {
|
|
|
1513 int run_end_hpos;
|
|
|
1514
|
|
|
1515 /* Don't go past the final buffer posn the user
|
|
|
1516 requested. */
|
|
|
1517 if (run_end > to)
|
|
|
1518 run_end = to;
|
|
|
1519
|
|
|
1520 run_end_hpos = hpos + (run_end - pos) * common_width;
|
|
|
1521
|
|
|
1522 /* Don't go past the final horizontal position the user
|
|
|
1523 requested. */
|
|
|
1524 if (vpos == tovpos && run_end_hpos > tohpos)
|
|
|
1525 {
|
|
|
1526 run_end = pos + (tohpos - hpos) / common_width;
|
|
|
1527 run_end_hpos = hpos + (run_end - pos) * common_width;
|
|
|
1528 }
|
|
10538
|
1529
|
|
9407
|
1530 /* Don't go past the margin. */
|
|
|
1531 if (run_end_hpos >= width)
|
|
|
1532 {
|
|
|
1533 run_end = pos + (width - hpos) / common_width;
|
|
|
1534 run_end_hpos = hpos + (run_end - pos) * common_width;
|
|
|
1535 }
|
|
|
1536
|
|
|
1537 hpos = run_end_hpos;
|
|
|
1538 if (run_end > pos)
|
|
|
1539 prev_hpos = hpos - common_width;
|
|
20571
|
1540 if (pos != run_end)
|
|
|
1541 {
|
|
|
1542 pos = run_end;
|
|
|
1543 pos_byte = CHAR_TO_BYTE (pos);
|
|
|
1544 }
|
|
9407
|
1545 }
|
|
|
1546
|
|
|
1547 next_width_run = run_end + 1;
|
|
|
1548 }
|
|
|
1549
|
|
|
1550 /* We have to scan the text character-by-character. */
|
|
165
|
1551 else
|
|
11853
|
1552 {
|
|
36846
|
1553 EMACS_INT i, n;
|
|
|
1554 Lisp_Object charvec;
|
|
45622
|
1555
|
|
20571
|
1556 c = FETCH_BYTE (pos_byte);
|
|
26859
|
1557
|
|
|
1558 /* Check composition sequence. */
|
|
|
1559 {
|
|
|
1560 int len, len_byte, width;
|
|
|
1561
|
|
|
1562 if (check_composition (pos, pos_byte, to, &len, &len_byte, &width))
|
|
|
1563 {
|
|
|
1564 pos += len;
|
|
|
1565 pos_byte += len_byte;
|
|
|
1566 hpos += width;
|
|
|
1567 continue;
|
|
|
1568 }
|
|
|
1569 }
|
|
|
1570
|
|
20571
|
1571 pos++, pos_byte++;
|
|
9407
|
1572
|
|
11853
|
1573 /* Perhaps add some info to the width_run_cache. */
|
|
|
1574 if (current_buffer->width_run_cache)
|
|
|
1575 {
|
|
|
1576 /* Is this character part of the current run? If so, extend
|
|
|
1577 the run. */
|
|
|
1578 if (pos - 1 == width_run_end
|
|
18109
|
1579 && XFASTINT (width_table[c]) == width_run_width)
|
|
11853
|
1580 width_run_end = pos;
|
|
9407
|
1581
|
|
11853
|
1582 /* The previous run is over, since this is a character at a
|
|
|
1583 different position, or a different width. */
|
|
|
1584 else
|
|
|
1585 {
|
|
|
1586 /* Have we accumulated a run to put in the cache?
|
|
|
1587 (Currently, we only cache runs of width == 1). */
|
|
|
1588 if (width_run_start < width_run_end
|
|
|
1589 && width_run_width == 1)
|
|
|
1590 know_region_cache (current_buffer,
|
|
|
1591 current_buffer->width_run_cache,
|
|
|
1592 width_run_start, width_run_end);
|
|
10538
|
1593
|
|
11853
|
1594 /* Start recording a new width run. */
|
|
18109
|
1595 width_run_width = XFASTINT (width_table[c]);
|
|
11853
|
1596 width_run_start = pos - 1;
|
|
|
1597 width_run_end = pos;
|
|
|
1598 }
|
|
|
1599 }
|
|
9407
|
1600
|
|
20938
|
1601 if (dp != 0
|
|
|
1602 && ! (multibyte && BASE_LEADING_CODE_P (c))
|
|
|
1603 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
|
|
36846
|
1604 {
|
|
|
1605 charvec = DISP_CHAR_VECTOR (dp, c);
|
|
|
1606 n = ASIZE (charvec);
|
|
|
1607 }
|
|
|
1608 else
|
|
|
1609 {
|
|
|
1610 charvec = Qnil;
|
|
|
1611 n = 1;
|
|
|
1612 }
|
|
|
1613
|
|
|
1614 for (i = n - 1; i >= 0; --i)
|
|
11853
|
1615 {
|
|
36846
|
1616 if (VECTORP (charvec))
|
|
|
1617 {
|
|
|
1618 /* This should be handled the same as
|
|
|
1619 next_element_from_display_vector does it. */
|
|
|
1620 Lisp_Object entry = AREF (charvec, i);
|
|
45622
|
1621
|
|
36846
|
1622 if (INTEGERP (entry)
|
|
|
1623 && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
|
|
|
1624 c = FAST_GLYPH_CHAR (XFASTINT (entry));
|
|
|
1625 else
|
|
|
1626 c = ' ';
|
|
|
1627 }
|
|
45622
|
1628
|
|
36846
|
1629 if (c >= 040 && c < 0177)
|
|
|
1630 hpos++;
|
|
|
1631 else if (c == '\t')
|
|
|
1632 {
|
|
|
1633 int tem = ((hpos + tab_offset + hscroll - (hscroll > 0))
|
|
|
1634 % tab_width);
|
|
|
1635 if (tem < 0)
|
|
|
1636 tem += tab_width;
|
|
|
1637 hpos += tab_width - tem;
|
|
|
1638 }
|
|
|
1639 else if (c == '\n')
|
|
11853
|
1640 {
|
|
36846
|
1641 if (selective > 0
|
|
45622
|
1642 && indented_beyond_p (pos, pos_byte,
|
|
46303
|
1643 (double) selective)) /* iftc */
|
|
36846
|
1644 {
|
|
|
1645 /* If (pos == to), we don't have to take care of
|
|
|
1646 selective display. */
|
|
|
1647 if (pos < to)
|
|
|
1648 {
|
|
|
1649 /* Skip any number of invisible lines all at once */
|
|
|
1650 do
|
|
|
1651 {
|
|
|
1652 pos = find_before_next_newline (pos, to, 1);
|
|
|
1653 if (pos < to)
|
|
|
1654 pos++;
|
|
|
1655 pos_byte = CHAR_TO_BYTE (pos);
|
|
|
1656 }
|
|
|
1657 while (pos < to
|
|
45622
|
1658 && indented_beyond_p (pos, pos_byte,
|
|
46303
|
1659 (double) selective)); /* iftc */
|
|
36846
|
1660 /* Allow for the " ..." that is displayed for them. */
|
|
|
1661 if (selective_rlen)
|
|
|
1662 {
|
|
|
1663 hpos += selective_rlen;
|
|
|
1664 if (hpos >= width)
|
|
|
1665 hpos = width;
|
|
|
1666 }
|
|
|
1667 DEC_BOTH (pos, pos_byte);
|
|
|
1668 /* We have skipped the invis text, but not the
|
|
|
1669 newline after. */
|
|
|
1670 }
|
|
|
1671 }
|
|
|
1672 else
|
|
|
1673 {
|
|
|
1674 /* A visible line. */
|
|
|
1675 vpos++;
|
|
|
1676 hpos = 0;
|
|
|
1677 hpos -= hscroll;
|
|
|
1678 /* Count the truncation glyph on column 0 */
|
|
|
1679 if (hscroll > 0)
|
|
56593
|
1680 hpos += continuation_glyph_width;
|
|
36846
|
1681 tab_offset = 0;
|
|
|
1682 }
|
|
|
1683 contin_hpos = 0;
|
|
|
1684 }
|
|
|
1685 else if (c == CR && selective < 0)
|
|
|
1686 {
|
|
|
1687 /* In selective display mode,
|
|
|
1688 everything from a ^M to the end of the line is invisible.
|
|
|
1689 Stop *before* the real newline. */
|
|
17136
|
1690 if (pos < to)
|
|
11853
|
1691 {
|
|
36846
|
1692 pos = find_before_next_newline (pos, to, 1);
|
|
|
1693 pos_byte = CHAR_TO_BYTE (pos);
|
|
|
1694 }
|
|
|
1695 /* If we just skipped next_boundary,
|
|
|
1696 loop around in the main while
|
|
|
1697 and handle it. */
|
|
|
1698 if (pos > next_boundary)
|
|
|
1699 next_boundary = pos;
|
|
|
1700 /* Allow for the " ..." that is displayed for them. */
|
|
|
1701 if (selective_rlen)
|
|
|
1702 {
|
|
|
1703 hpos += selective_rlen;
|
|
|
1704 if (hpos >= width)
|
|
|
1705 hpos = width;
|
|
11853
|
1706 }
|
|
|
1707 }
|
|
36846
|
1708 else if (multibyte && BASE_LEADING_CODE_P (c))
|
|
|
1709 {
|
|
|
1710 /* Start of multi-byte form. */
|
|
|
1711 unsigned char *ptr;
|
|
|
1712 int bytes, width, wide_column;
|
|
|
1713
|
|
|
1714 pos_byte--; /* rewind POS_BYTE */
|
|
|
1715 ptr = BYTE_POS_ADDR (pos_byte);
|
|
|
1716 MULTIBYTE_BYTES_WIDTH (ptr, dp);
|
|
|
1717 pos_byte += bytes;
|
|
|
1718 if (wide_column)
|
|
|
1719 wide_column_end_hpos = hpos + wide_column;
|
|
|
1720 hpos += width;
|
|
|
1721 }
|
|
38530
|
1722 else if (VECTORP (charvec))
|
|
|
1723 ++hpos;
|
|
11853
|
1724 else
|
|
36846
|
1725 hpos += (ctl_arrow && c < 0200) ? 2 : 4;
|
|
11853
|
1726 }
|
|
165
|
1727 }
|
|
|
1728 }
|
|
|
1729
|
|
17966
|
1730 after_loop:
|
|
|
1731
|
|
9407
|
1732 /* Remember any final width run in the cache. */
|
|
|
1733 if (current_buffer->width_run_cache
|
|
|
1734 && width_run_width == 1
|
|
|
1735 && width_run_start < width_run_end)
|
|
|
1736 know_region_cache (current_buffer, current_buffer->width_run_cache,
|
|
|
1737 width_run_start, width_run_end);
|
|
|
1738
|
|
165
|
1739 val_compute_motion.bufpos = pos;
|
|
20571
|
1740 val_compute_motion.bytepos = pos_byte;
|
|
526
|
1741 val_compute_motion.hpos = hpos;
|
|
|
1742 val_compute_motion.vpos = vpos;
|
|
20985
|
1743 if (contin_hpos && prev_hpos == 0)
|
|
|
1744 val_compute_motion.prevhpos = contin_hpos;
|
|
|
1745 else
|
|
|
1746 val_compute_motion.prevhpos = prev_hpos;
|
16395
c6b901f809da
(vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1747 /* We alalways handle all of them here; none of them remain to do. */
|
c6b901f809da
(vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1748 val_compute_motion.ovstring_chars_done = 0;
|
|
165
|
1749
|
|
|
1750 /* Nonzero if have just continued a line */
|
|
17016
|
1751 val_compute_motion.contin = (contin_hpos && prev_hpos == 0);
|
|
165
|
1752
|
|
28537
|
1753 immediate_quit = 0;
|
|
165
|
1754 return &val_compute_motion;
|
|
|
1755 }
|
|
|
1756
|
|
25028
|
1757
|
|
40123
|
1758 DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0,
|
|
|
1759 doc: /* Scan through the current buffer, calculating screen position.
|
|
|
1760 Scan the current buffer forward from offset FROM,
|
|
|
1761 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--
|
|
|
1762 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--
|
|
|
1763 and return the ending buffer position and screen location.
|
|
|
1764
|
|
56584
|
1765 If TOPOS is nil, the actual width and height of the window's
|
|
|
1766 text area are used.
|
|
|
1767
|
|
40123
|
1768 There are three additional arguments:
|
|
|
1769
|
|
|
1770 WIDTH is the number of columns available to display text;
|
|
56584
|
1771 this affects handling of continuation lines. A value of nil
|
|
|
1772 corresponds to the actual number of available text columns.
|
|
40123
|
1773
|
|
|
1774 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).
|
|
|
1775 HSCROLL is the number of columns not being displayed at the left
|
|
|
1776 margin; this is usually taken from a window's hscroll member.
|
|
|
1777 TAB-OFFSET is the number of columns of the first tab that aren't
|
|
|
1778 being displayed, perhaps because the line was continued within it.
|
|
|
1779 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.
|
|
6587
|
1780
|
|
40123
|
1781 WINDOW is the window to operate on. It is used to choose the display table;
|
|
|
1782 if it is showing the current buffer, it is used also for
|
|
|
1783 deciding which overlay properties apply.
|
|
|
1784 Note that `compute-motion' always operates on the current buffer.
|
|
|
1785
|
|
|
1786 The value is a list of five elements:
|
|
|
1787 (POS HPOS VPOS PREVHPOS CONTIN)
|
|
|
1788 POS is the buffer position where the scan stopped.
|
|
|
1789 VPOS is the vertical position where the scan stopped.
|
|
|
1790 HPOS is the horizontal position where the scan stopped.
|
|
|
1791
|
|
|
1792 PREVHPOS is the horizontal position one character back from POS.
|
|
|
1793 CONTIN is t if a line was continued after (or within) the previous character.
|
|
|
1794
|
|
|
1795 For example, to find the buffer position of column COL of line LINE
|
|
|
1796 of a certain window, pass the window's starting location as FROM
|
|
|
1797 and the window's upper-left coordinates as FROMPOS.
|
|
|
1798 Pass the buffer's (point-max) as TO, to limit the scan to the end of the
|
|
|
1799 visible section of the buffer, and pass LINE and COL as TOPOS. */)
|
|
|
1800 (from, frompos, to, topos, width, offsets, window)
|
|
6296
|
1801 Lisp_Object from, frompos, to, topos;
|
|
6691
|
1802 Lisp_Object width, offsets, window;
|
|
6296
|
1803 {
|
|
56584
|
1804 struct window *w;
|
|
34967
|
1805 Lisp_Object bufpos, hpos, vpos, prevhpos;
|
|
6296
|
1806 struct position *pos;
|
|
|
1807 int hscroll, tab_offset;
|
|
|
1808
|
|
40656
|
1809 CHECK_NUMBER_COERCE_MARKER (from);
|
|
|
1810 CHECK_CONS (frompos);
|
|
|
1811 CHECK_NUMBER_CAR (frompos);
|
|
|
1812 CHECK_NUMBER_CDR (frompos);
|
|
|
1813 CHECK_NUMBER_COERCE_MARKER (to);
|
|
56584
|
1814 if (!NILP (topos))
|
|
|
1815 {
|
|
|
1816 CHECK_CONS (topos);
|
|
|
1817 CHECK_NUMBER_CAR (topos);
|
|
|
1818 CHECK_NUMBER_CDR (topos);
|
|
|
1819 }
|
|
|
1820 if (!NILP (width))
|
|
|
1821 CHECK_NUMBER (width);
|
|
|
1822
|
|
6296
|
1823 if (!NILP (offsets))
|
|
|
1824 {
|
|
40656
|
1825 CHECK_CONS (offsets);
|
|
|
1826 CHECK_NUMBER_CAR (offsets);
|
|
|
1827 CHECK_NUMBER_CDR (offsets);
|
|
25645
|
1828 hscroll = XINT (XCAR (offsets));
|
|
|
1829 tab_offset = XINT (XCDR (offsets));
|
|
6296
|
1830 }
|
|
|
1831 else
|
|
|
1832 hscroll = tab_offset = 0;
|
|
|
1833
|
|
6691
|
1834 if (NILP (window))
|
|
|
1835 window = Fselected_window ();
|
|
|
1836 else
|
|
40656
|
1837 CHECK_LIVE_WINDOW (window);
|
|
56584
|
1838 w = XWINDOW (window);
|
|
6691
|
1839
|
|
21496
|
1840 if (XINT (from) < BEGV || XINT (from) > ZV)
|
|
|
1841 args_out_of_range_3 (from, make_number (BEGV), make_number (ZV));
|
|
|
1842 if (XINT (to) < BEGV || XINT (to) > ZV)
|
|
|
1843 args_out_of_range_3 (to, make_number (BEGV), make_number (ZV));
|
|
|
1844
|
|
25645
|
1845 pos = compute_motion (XINT (from), XINT (XCDR (frompos)),
|
|
|
1846 XINT (XCAR (frompos)), 0,
|
|
56584
|
1847 XINT (to),
|
|
|
1848 (NILP (topos)
|
|
|
1849 ? window_internal_height (w)
|
|
|
1850 : XINT (XCDR (topos))),
|
|
|
1851 (NILP (topos)
|
|
|
1852 ? (window_box_text_cols (w)
|
|
|
1853 - (
|
|
|
1854 #ifdef HAVE_WINDOW_SYSTEM
|
|
|
1855 FRAME_WINDOW_P (XFRAME (w->frame)) ? 0 :
|
|
|
1856 #endif
|
|
|
1857 1))
|
|
|
1858 : XINT (XCAR (topos))),
|
|
|
1859 (NILP (width) ? -1 : XINT (width)),
|
|
|
1860 hscroll, tab_offset,
|
|
6691
|
1861 XWINDOW (window));
|
|
6296
|
1862
|
|
9310
|
1863 XSETFASTINT (bufpos, pos->bufpos);
|
9269
0f29bb3f784f
(Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1864 XSETINT (hpos, pos->hpos);
|
0f29bb3f784f
(Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1865 XSETINT (vpos, pos->vpos);
|
0f29bb3f784f
(Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1866 XSETINT (prevhpos, pos->prevhpos);
|
|
6296
|
1867
|
|
|
1868 return Fcons (bufpos,
|
|
|
1869 Fcons (hpos,
|
|
|
1870 Fcons (vpos,
|
|
|
1871 Fcons (prevhpos,
|
|
|
1872 Fcons (pos->contin ? Qt : Qnil, Qnil)))));
|
|
|
1873
|
|
|
1874 }
|
|
165
|
1875
|
|
9407
|
1876 /* Fvertical_motion and vmotion */
|
|
36846
|
1877
|
|
165
|
1878 struct position val_vmotion;
|
|
|
1879
|
|
|
1880 struct position *
|
|
11811
|
1881 vmotion (from, vtarget, w)
|
|
|
1882 register int from, vtarget;
|
|
|
1883 struct window *w;
|
|
165
|
1884 {
|
|
11811
|
1885 int hscroll = XINT (w->hscroll);
|
|
165
|
1886 struct position pos;
|
|
|
1887 /* vpos is cumulative vertical position, changed as from is changed */
|
|
|
1888 register int vpos = 0;
|
|
57734
|
1889 int prevline;
|
|
165
|
1890 register int first;
|
|
20571
|
1891 int from_byte;
|
|
165
|
1892 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
|
|
|
1893 int selective
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1894 = (INTEGERP (current_buffer->selective_display)
|
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1895 ? XINT (current_buffer->selective_display)
|
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1896 : !NILP (current_buffer->selective_display) ? -1 : 0);
|
|
11811
|
1897 Lisp_Object window;
|
|
|
1898 int start_hpos = 0;
|
|
11853
|
1899 int did_motion;
|
|
23039
|
1900 /* This is the object we use for fetching character properties. */
|
|
|
1901 Lisp_Object text_prop_object;
|
|
11811
|
1902
|
|
|
1903 XSETWINDOW (window, w);
|
|
|
1904
|
|
23039
|
1905 /* If the window contains this buffer, use it for getting text properties.
|
|
|
1906 Otherwise use the current buffer as arg for doing that. */
|
|
|
1907 if (EQ (w->buffer, Fcurrent_buffer ()))
|
|
|
1908 text_prop_object = window;
|
|
|
1909 else
|
|
|
1910 text_prop_object = Fcurrent_buffer ();
|
|
|
1911
|
|
11811
|
1912 if (vpos >= vtarget)
|
|
165
|
1913 {
|
|
11811
|
1914 /* To move upward, go a line at a time until
|
|
20571
|
1915 we have gone at least far enough. */
|
|
11811
|
1916
|
|
|
1917 first = 1;
|
|
|
1918
|
|
|
1919 while ((vpos > vtarget || first) && from > BEGV)
|
|
165
|
1920 {
|
|
10964
|
1921 Lisp_Object propval;
|
|
|
1922
|
|
57734
|
1923 prevline = find_next_newline_no_quit (from - 1, -1);
|
|
|
1924 while (prevline > BEGV
|
|
4385
|
1925 && ((selective > 0
|
|
57734
|
1926 && indented_beyond_p (prevline,
|
|
|
1927 CHAR_TO_BYTE (prevline),
|
|
46303
|
1928 (double) selective)) /* iftc */
|
|
57734
|
1929 /* Watch out for newlines with `invisible' property.
|
|
|
1930 When moving upward, check the newline before. */
|
|
|
1931 || (propval = Fget_char_property (make_number (prevline - 1),
|
|
10964
|
1932 Qinvisible,
|
|
23039
|
1933 text_prop_object),
|
|
26404
|
1934 TEXT_PROP_MEANS_INVISIBLE (propval))))
|
|
57734
|
1935 prevline = find_next_newline_no_quit (prevline - 1, -1);
|
|
|
1936 pos = *compute_motion (prevline, 0,
|
|
|
1937 lmargin + (prevline == BEG ? start_hpos : 0),
|
|
11853
|
1938 0,
|
|
45622
|
1939 from,
|
|
17016
|
1940 /* Don't care for VPOS... */
|
|
|
1941 1 << (BITS_PER_SHORT - 1),
|
|
|
1942 /* ... nor HPOS. */
|
|
|
1943 1 << (BITS_PER_SHORT - 1),
|
|
56584
|
1944 -1, hscroll,
|
16926
3baea3418dec
(pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1945 /* This compensates for start_hpos
|
3baea3418dec
(pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1946 so that a tab as first character
|
3baea3418dec
(pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1947 still occupies 8 columns. */
|
|
57734
|
1948 (prevline == BEG ? -start_hpos : 0),
|
16926
3baea3418dec
(pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1949 w);
|
|
11811
|
1950 vpos -= pos.vpos;
|
|
|
1951 first = 0;
|
|
57734
|
1952 from = prevline;
|
|
165
|
1953 }
|
|
|
1954
|
|
11811
|
1955 /* If we made exactly the desired vertical distance,
|
|
|
1956 or if we hit beginning of buffer,
|
|
|
1957 return point found */
|
|
|
1958 if (vpos >= vtarget)
|
|
|
1959 {
|
|
|
1960 val_vmotion.bufpos = from;
|
|
20571
|
1961 val_vmotion.bytepos = CHAR_TO_BYTE (from);
|
|
11811
|
1962 val_vmotion.vpos = vpos;
|
|
|
1963 val_vmotion.hpos = lmargin;
|
|
|
1964 val_vmotion.contin = 0;
|
|
|
1965 val_vmotion.prevhpos = 0;
|
16395
c6b901f809da
(vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1966 val_vmotion.ovstring_chars_done = 0;
|
|
17016
|
1967 val_vmotion.tab_offset = 0; /* For accumulating tab offset. */
|
|
11811
|
1968 return &val_vmotion;
|
|
|
1969 }
|
|
165
|
1970
|
|
11811
|
1971 /* Otherwise find the correct spot by moving down */
|
|
|
1972 }
|
|
|
1973 /* Moving downward is simple, but must calculate from beg of line
|
|
|
1974 to determine hpos of starting point */
|
|
20571
|
1975 from_byte = CHAR_TO_BYTE (from);
|
|
|
1976 if (from > BEGV && FETCH_BYTE (from_byte - 1) != '\n')
|
|
165
|
1977 {
|
|
11853
|
1978 Lisp_Object propval;
|
|
10964
|
1979
|
|
57734
|
1980 prevline = find_next_newline_no_quit (from, -1);
|
|
|
1981 while (prevline > BEGV
|
|
11811
|
1982 && ((selective > 0
|
|
57734
|
1983 && indented_beyond_p (prevline,
|
|
|
1984 CHAR_TO_BYTE (prevline),
|
|
46303
|
1985 (double) selective)) /* iftc */
|
|
57734
|
1986 /* Watch out for newlines with `invisible' property.
|
|
|
1987 When moving downward, check the newline after. */
|
|
|
1988 || (propval = Fget_char_property (make_number (prevline),
|
|
|
1989 Qinvisible,
|
|
23039
|
1990 text_prop_object),
|
|
26404
|
1991 TEXT_PROP_MEANS_INVISIBLE (propval))))
|
|
57734
|
1992 prevline = find_next_newline_no_quit (prevline - 1, -1);
|
|
|
1993 pos = *compute_motion (prevline, 0,
|
|
|
1994 lmargin + (prevline == BEG
|
|
8905
|
1995 ? start_hpos : 0),
|
|
11853
|
1996 0,
|
|
45622
|
1997 from,
|
|
17016
|
1998 /* Don't care for VPOS... */
|
|
|
1999 1 << (BITS_PER_SHORT - 1),
|
|
|
2000 /* ... nor HPOS. */
|
|
|
2001 1 << (BITS_PER_SHORT - 1),
|
|
56584
|
2002 -1, hscroll,
|
|
57734
|
2003 (prevline == BEG ? -start_hpos : 0),
|
16926
3baea3418dec
(pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2004 w);
|
|
11853
|
2005 did_motion = 1;
|
|
165
|
2006 }
|
|
11811
|
2007 else
|
|
165
|
2008 {
|
|
11811
|
2009 pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
|
|
|
2010 pos.vpos = 0;
|
|
17016
|
2011 pos.tab_offset = 0;
|
|
11853
|
2012 did_motion = 0;
|
|
165
|
2013 }
|
|
11853
|
2014 return compute_motion (from, vpos, pos.hpos, did_motion,
|
|
17016
|
2015 ZV, vtarget, - (1 << (BITS_PER_SHORT - 1)),
|
|
56584
|
2016 -1, hscroll,
|
|
17016
|
2017 pos.tab_offset - (from == BEG ? start_hpos : 0),
|
16926
3baea3418dec
(pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2018 w);
|
|
165
|
2019 }
|
|
|
2020
|
|
6327
|
2021 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
|
|
40123
|
2022 doc: /* Move point to start of the screen line LINES lines down.
|
|
|
2023 If LINES is negative, this means moving up.
|
|
|
2024
|
|
|
2025 This function is an ordinary cursor motion function
|
|
|
2026 which calculates the new position based on how text would be displayed.
|
|
|
2027 The new position may be the start of a line,
|
|
|
2028 or just the start of a continuation line.
|
|
|
2029 The function returns number of screen lines moved over;
|
|
|
2030 that usually equals LINES, but may be closer to zero
|
|
|
2031 if beginning or end of buffer was reached.
|
|
|
2032
|
|
|
2033 The optional second argument WINDOW specifies the window to use for
|
|
|
2034 parameters such as width, horizontal scrolling, and so on.
|
|
|
2035 The default is to use the selected window's parameters.
|
|
|
2036
|
|
|
2037 `vertical-motion' always uses the current buffer,
|
|
|
2038 regardless of which buffer is displayed in WINDOW.
|
|
|
2039 This is consistent with other cursor motion functions
|
|
|
2040 and makes it possible to use `vertical-motion' in any buffer,
|
|
|
2041 whether or not it is currently displayed in some window. */)
|
|
|
2042 (lines, window)
|
|
6327
|
2043 Lisp_Object lines, window;
|
|
165
|
2044 {
|
|
25028
|
2045 struct it it;
|
|
|
2046 struct text_pos pt;
|
|
|
2047 struct window *w;
|
|
28293
|
2048 Lisp_Object old_buffer;
|
|
|
2049 struct gcpro gcpro1;
|
|
165
|
2050
|
|
40656
|
2051 CHECK_NUMBER (lines);
|
|
6327
|
2052 if (! NILP (window))
|
|
40656
|
2053 CHECK_WINDOW (window);
|
|
6327
|
2054 else
|
|
8905
|
2055 window = selected_window;
|
|
28293
|
2056 w = XWINDOW (window);
|
|
165
|
2057
|
|
28293
|
2058 old_buffer = Qnil;
|
|
|
2059 GCPRO1 (old_buffer);
|
|
|
2060 if (XBUFFER (w->buffer) != current_buffer)
|
|
25028
|
2061 {
|
|
28293
|
2062 /* Set the window's buffer temporarily to the current buffer. */
|
|
|
2063 old_buffer = w->buffer;
|
|
|
2064 XSETBUFFER (w->buffer, current_buffer);
|
|
25028
|
2065 }
|
|
45622
|
2066
|
|
58270
|
2067 if (noninteractive)
|
|
58260
|
2068 {
|
|
58270
|
2069 struct position pos;
|
|
|
2070 pos = *vmotion (PT, XINT (lines), w);
|
|
|
2071 SET_PT_BOTH (pos.bufpos, pos.bytepos);
|
|
58260
|
2072 }
|
|
|
2073 else
|
|
58270
|
2074 {
|
|
58396
|
2075 int it_start;
|
|
59647
|
2076 int oselective;
|
|
67421
|
2077 int start_on_image_or_stretch_p;
|
|
58396
|
2078
|
|
58270
|
2079 SET_TEXT_POS (pt, PT, PT_BYTE);
|
|
|
2080 start_display (&it, w, pt);
|
|
44837
|
2081
|
|
58270
|
2082 /* Scan from the start of the line containing PT. If we don't
|
|
|
2083 do this, we start moving with IT->current_x == 0, while PT is
|
|
|
2084 really at some x > 0. The effect is, in continuation lines, that
|
|
|
2085 we end up with the iterator placed at where it thinks X is 0,
|
|
|
2086 while the end position is really at some X > 0, the same X that
|
|
|
2087 PT had. */
|
|
58396
|
2088 it_start = IT_CHARPOS (it);
|
|
67421
|
2089 start_on_image_or_stretch_p = (it.method == GET_FROM_IMAGE
|
|
|
2090 || it.method == GET_FROM_STRETCH);
|
|
58308
|
2091 reseat_at_previous_visible_line_start (&it);
|
|
|
2092 it.current_x = it.hpos = 0;
|
|
59647
|
2093 /* Temporarily disable selective display so we don't move too far */
|
|
|
2094 oselective = it.selective;
|
|
|
2095 it.selective = 0;
|
|
58308
|
2096 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
|
|
59647
|
2097 it.selective = oselective;
|
|
45622
|
2098
|
|
58308
|
2099 /* Move back if we got too far. This may happen if
|
|
64282
|
2100 truncate-lines is on and PT is beyond right margin.
|
|
67421
|
2101 It may also happen if it_start is on an image or a stretch
|
|
|
2102 glyph -- in that case, don't go back. */
|
|
|
2103 if (IT_CHARPOS (it) > it_start && XINT (lines) > 0
|
|
|
2104 && !start_on_image_or_stretch_p)
|
|
58308
|
2105 move_it_by_lines (&it, -1, 0);
|
|
|
2106
|
|
|
2107 it.vpos = 0;
|
|
58909
|
2108 /* Do this even if LINES is 0, so that we move back
|
|
|
2109 to the beginning of the current line as we ought. */
|
|
|
2110 move_it_by_lines (&it, XINT (lines), 0);
|
|
58270
|
2111
|
|
|
2112 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
|
|
|
2113 }
|
|
165
|
2114
|
|
28293
|
2115 if (BUFFERP (old_buffer))
|
|
|
2116 w->buffer = old_buffer;
|
|
45622
|
2117
|
|
28293
|
2118 RETURN_UNGCPRO (make_number (it.vpos));
|
|
165
|
2119 }
|
|
25028
|
2120
|
|
|
2121
|
|
165
|
2122
|
|
36846
|
2123 /* File's initialization. */
|
|
9407
|
2124
|
|
21514
|
2125 void
|
|
165
|
2126 syms_of_indent ()
|
|
|
2127 {
|
|
|
2128 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode,
|
|
40123
|
2129 doc: /* *Indentation can insert tabs if this is non-nil.
|
|
|
2130 Setting this variable automatically makes it local to the current buffer. */);
|
|
165
|
2131 indent_tabs_mode = 1;
|
|
|
2132
|
|
|
2133 defsubr (&Scurrent_indentation);
|
|
|
2134 defsubr (&Sindent_to);
|
|
|
2135 defsubr (&Scurrent_column);
|
|
|
2136 defsubr (&Smove_to_column);
|
|
|
2137 defsubr (&Svertical_motion);
|
|
6296
|
2138 defsubr (&Scompute_motion);
|
|
165
|
2139 }
|
|
52401
|
2140
|
|
|
2141 /* arch-tag: 9adfea44-71f7-4988-8ee3-96da15c502cc
|
|
|
2142 (do not change this comment) */
|
