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