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