Mercurial > vim
annotate src/move.c @ 22852:84e4dedfa388 v8.2.1973
patch 8.2.1973: finding a patch number can be a bit slow
Commit: https://github.com/vim/vim/commit/232f4612e2b0a6a205ae385740078f6b8af05e75
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Nov 10 20:54:29 2020 +0100
patch 8.2.1973: finding a patch number can be a bit slow
Problem: Finding a patch number can be a bit slow.
Solution: Use binary search. (closes https://github.com/vim/vim/issues/7279)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 10 Nov 2020 21:00:04 +0100 |
parents | 53b996eb5e76 |
children | 38324d4f1c94 |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9852
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 /* | |
10 * move.c: Functions for moving the cursor and scrolling text. | |
11 * | |
12 * There are two ways to move the cursor: | |
13 * 1. Move the cursor directly, the text is scrolled to keep the cursor in the | |
14 * window. | |
15 * 2. Scroll the text, the cursor is moved into the text visible in the | |
16 * window. | |
17 * The 'scrolloff' option makes this a bit complicated. | |
18 */ | |
19 | |
20 #include "vim.h" | |
21 | |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7103
diff
changeset
|
22 static int scrolljump_value(void); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7103
diff
changeset
|
23 static int check_top_offset(void); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7103
diff
changeset
|
24 static void curs_rows(win_T *wp); |
7 | 25 |
26 typedef struct | |
27 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
28 linenr_T lnum; // line number |
7 | 29 #ifdef FEAT_DIFF |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
30 int fill; // filler lines |
7 | 31 #endif |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
32 int height; // height of added line |
7 | 33 } lineoff_T; |
34 | |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7103
diff
changeset
|
35 static void topline_back(lineoff_T *lp); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7103
diff
changeset
|
36 static void botline_forw(lineoff_T *lp); |
7 | 37 |
38 /* | |
39 * Compute wp->w_botline for the current wp->w_topline. Can be called after | |
40 * wp->w_topline changed. | |
41 */ | |
42 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
43 comp_botline(win_T *wp) |
7 | 44 { |
45 int n; | |
46 linenr_T lnum; | |
47 int done; | |
48 #ifdef FEAT_FOLDING | |
49 linenr_T last; | |
50 int folded; | |
51 #endif | |
52 | |
53 /* | |
54 * If w_cline_row is valid, start there. | |
55 * Otherwise have to start at w_topline. | |
56 */ | |
57 check_cursor_moved(wp); | |
58 if (wp->w_valid & VALID_CROW) | |
59 { | |
60 lnum = wp->w_cursor.lnum; | |
61 done = wp->w_cline_row; | |
62 } | |
63 else | |
64 { | |
65 lnum = wp->w_topline; | |
66 done = 0; | |
67 } | |
68 | |
69 for ( ; lnum <= wp->w_buffer->b_ml.ml_line_count; ++lnum) | |
70 { | |
71 #ifdef FEAT_FOLDING | |
72 last = lnum; | |
73 folded = FALSE; | |
74 if (hasFoldingWin(wp, lnum, NULL, &last, TRUE, NULL)) | |
75 { | |
76 n = 1; | |
77 folded = TRUE; | |
78 } | |
79 else | |
80 #endif | |
81 #ifdef FEAT_DIFF | |
82 if (lnum == wp->w_topline) | |
83 n = plines_win_nofill(wp, lnum, TRUE) + wp->w_topfill; | |
84 else | |
85 #endif | |
86 n = plines_win(wp, lnum, TRUE); | |
87 if ( | |
88 #ifdef FEAT_FOLDING | |
89 lnum <= wp->w_cursor.lnum && last >= wp->w_cursor.lnum | |
90 #else | |
91 lnum == wp->w_cursor.lnum | |
92 #endif | |
93 ) | |
94 { | |
95 wp->w_cline_row = done; | |
96 wp->w_cline_height = n; | |
97 #ifdef FEAT_FOLDING | |
98 wp->w_cline_folded = folded; | |
99 #endif | |
5764 | 100 redraw_for_cursorline(wp); |
7 | 101 wp->w_valid |= (VALID_CROW|VALID_CHEIGHT); |
102 } | |
103 if (done + n > wp->w_height) | |
104 break; | |
105 done += n; | |
106 #ifdef FEAT_FOLDING | |
107 lnum = last; | |
108 #endif | |
109 } | |
110 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
111 // wp->w_botline is the line that is just below the window |
7 | 112 wp->w_botline = lnum; |
113 wp->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; | |
114 | |
115 set_empty_rows(wp, done); | |
116 } | |
117 | |
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
118 #ifdef FEAT_SYN_HL |
14846
10107703b9b2
patch 8.1.0435: cursorline highlight not removed in some situation
Christian Brabandt <cb@256bit.org>
parents:
14724
diff
changeset
|
119 void |
10107703b9b2
patch 8.1.0435: cursorline highlight not removed in some situation
Christian Brabandt <cb@256bit.org>
parents:
14724
diff
changeset
|
120 reset_cursorline(void) |
10107703b9b2
patch 8.1.0435: cursorline highlight not removed in some situation
Christian Brabandt <cb@256bit.org>
parents:
14724
diff
changeset
|
121 { |
14873
a8ed1cb85859
patch 8.1.0448: cursorline not removed when using 'cursorbind'
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
122 curwin->w_last_cursorline = 0; |
14846
10107703b9b2
patch 8.1.0435: cursorline highlight not removed in some situation
Christian Brabandt <cb@256bit.org>
parents:
14724
diff
changeset
|
123 } |
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
124 #endif |
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
125 |
7 | 126 /* |
5764 | 127 * Redraw when w_cline_row changes and 'relativenumber' or 'cursorline' is |
128 * set. | |
129 */ | |
15697
b7a88676e81c
patch 8.1.0856: when scrolling a window the cursorline is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
130 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
131 redraw_for_cursorline(win_T *wp) |
5764 | 132 { |
133 if ((wp->w_p_rnu | |
134 #ifdef FEAT_SYN_HL | |
135 || wp->w_p_cul | |
136 #endif | |
137 ) | |
138 && (wp->w_valid & VALID_CROW) == 0 | |
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17292
diff
changeset
|
139 && !pum_visible()) |
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
140 { |
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
141 if (wp->w_p_rnu) |
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
142 // win_line() will redraw the number column only. |
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
143 redraw_win_later(wp, VALID); |
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
144 #ifdef FEAT_SYN_HL |
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
145 if (wp->w_p_cul) |
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
146 { |
14873
a8ed1cb85859
patch 8.1.0448: cursorline not removed when using 'cursorbind'
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
147 if (wp->w_redr_type <= VALID && wp->w_last_cursorline != 0) |
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
148 { |
14873
a8ed1cb85859
patch 8.1.0448: cursorline not removed when using 'cursorbind'
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
149 // "w_last_cursorline" may be outdated, worst case we redraw |
a8ed1cb85859
patch 8.1.0448: cursorline not removed when using 'cursorbind'
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
150 // too much. This is optimized for moving the cursor around in |
a8ed1cb85859
patch 8.1.0448: cursorline not removed when using 'cursorbind'
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
151 // the current window. |
15400
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15064
diff
changeset
|
152 redrawWinline(wp, wp->w_last_cursorline); |
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15064
diff
changeset
|
153 redrawWinline(wp, wp->w_cursor.lnum); |
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
154 } |
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
155 else |
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14722
diff
changeset
|
156 redraw_win_later(wp, SOME_VALID); |
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
157 } |
14722
9b150311eb9c
patch 8.1.0373: screen updating still slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
158 #endif |
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14317
diff
changeset
|
159 } |
5764 | 160 } |
161 | |
162 /* | |
7 | 163 * Update curwin->w_topline and redraw if necessary. |
164 * Used to update the screen before printing a message. | |
165 */ | |
166 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
167 update_topline_redraw(void) |
7 | 168 { |
169 update_topline(); | |
170 if (must_redraw) | |
171 update_screen(0); | |
172 } | |
173 | |
174 /* | |
175 * Update curwin->w_topline to move the cursor onto the screen. | |
176 */ | |
177 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
178 update_topline(void) |
7 | 179 { |
180 long line_count; | |
181 int halfheight; | |
182 int n; | |
183 linenr_T old_topline; | |
184 #ifdef FEAT_DIFF | |
185 int old_topfill; | |
186 #endif | |
187 #ifdef FEAT_FOLDING | |
188 linenr_T lnum; | |
189 #endif | |
190 int check_topline = FALSE; | |
191 int check_botline = FALSE; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
192 long *so_ptr = curwin->w_p_so >= 0 ? &curwin->w_p_so : &p_so; |
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
193 int save_so = *so_ptr; |
7 | 194 |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
195 // If there is no valid screen and when the window height is zero just use |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
196 // the cursor line. |
11258
84f71a8a5f2c
patch 8.0.0515: ml_get errors in silent Ex mode
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
197 if (!screen_valid(TRUE) || curwin->w_height == 0) |
6247 | 198 { |
22782
53b996eb5e76
patch 8.2.1939: invalid memory access in Ex mode with global command
Bram Moolenaar <Bram@vim.org>
parents:
22403
diff
changeset
|
199 check_cursor_lnum(); |
6247 | 200 curwin->w_topline = curwin->w_cursor.lnum; |
201 curwin->w_botline = curwin->w_topline; | |
202 curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; | |
203 curwin->w_scbind_pos = 1; | |
204 return; | |
205 } | |
206 | |
7 | 207 check_cursor_moved(curwin); |
208 if (curwin->w_valid & VALID_TOPLINE) | |
209 return; | |
210 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
211 // When dragging with the mouse, don't scroll that quickly |
1121 | 212 if (mouse_dragging > 0) |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
213 *so_ptr = mouse_dragging - 1; |
7 | 214 |
215 old_topline = curwin->w_topline; | |
216 #ifdef FEAT_DIFF | |
217 old_topfill = curwin->w_topfill; | |
218 #endif | |
219 | |
220 /* | |
221 * If the buffer is empty, always set topline to 1. | |
222 */ | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
223 if (BUFEMPTY()) // special case - file is empty |
7 | 224 { |
225 if (curwin->w_topline != 1) | |
226 redraw_later(NOT_VALID); | |
227 curwin->w_topline = 1; | |
228 curwin->w_botline = 2; | |
229 curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; | |
230 curwin->w_scbind_pos = 1; | |
231 } | |
232 | |
233 /* | |
234 * If the cursor is above or near the top of the window, scroll the window | |
235 * to show the line the cursor is in, with 'scrolloff' context. | |
236 */ | |
237 else | |
238 { | |
239 if (curwin->w_topline > 1) | |
240 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
241 // If the cursor is above topline, scrolling is always needed. |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
242 // If the cursor is far below topline and there is no folding, |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
243 // scrolling down is never needed. |
7 | 244 if (curwin->w_cursor.lnum < curwin->w_topline) |
245 check_topline = TRUE; | |
246 else if (check_top_offset()) | |
247 check_topline = TRUE; | |
248 } | |
249 #ifdef FEAT_DIFF | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
250 // Check if there are more filler lines than allowed. |
7 | 251 if (!check_topline && curwin->w_topfill > diff_check_fill(curwin, |
252 curwin->w_topline)) | |
253 check_topline = TRUE; | |
254 #endif | |
255 | |
256 if (check_topline) | |
257 { | |
258 halfheight = curwin->w_height / 2 - 1; | |
259 if (halfheight < 2) | |
260 halfheight = 2; | |
261 | |
262 #ifdef FEAT_FOLDING | |
263 if (hasAnyFolding(curwin)) | |
264 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
265 // Count the number of logical lines between the cursor and |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
266 // topline + scrolloff (approximation of how much will be |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
267 // scrolled). |
7 | 268 n = 0; |
269 for (lnum = curwin->w_cursor.lnum; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
270 lnum < curwin->w_topline + *so_ptr; ++lnum) |
7 | 271 { |
272 ++n; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
273 // stop at end of file or when we know we are far off |
7 | 274 if (lnum >= curbuf->b_ml.ml_line_count || n >= halfheight) |
275 break; | |
276 (void)hasFolding(lnum, NULL, &lnum); | |
277 } | |
278 } | |
279 else | |
280 #endif | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
281 n = curwin->w_topline + *so_ptr - curwin->w_cursor.lnum; |
7 | 282 |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
283 // If we weren't very close to begin with, we scroll to put the |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
284 // cursor in the middle of the window. Otherwise put the cursor |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
285 // near the top of the window. |
7 | 286 if (n >= halfheight) |
287 scroll_cursor_halfway(FALSE); | |
288 else | |
289 { | |
532 | 290 scroll_cursor_top(scrolljump_value(), FALSE); |
7 | 291 check_botline = TRUE; |
292 } | |
293 } | |
294 | |
295 else | |
296 { | |
297 #ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
298 // Make sure topline is the first line of a fold. |
7 | 299 (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL); |
300 #endif | |
301 check_botline = TRUE; | |
302 } | |
303 } | |
304 | |
305 /* | |
306 * If the cursor is below the bottom of the window, scroll the window | |
307 * to put the cursor on the window. | |
308 * When w_botline is invalid, recompute it first, to avoid a redraw later. | |
309 * If w_botline was approximated, we might need a redraw later in a few | |
310 * cases, but we don't want to spend (a lot of) time recomputing w_botline | |
311 * for every small change. | |
312 */ | |
313 if (check_botline) | |
314 { | |
315 if (!(curwin->w_valid & VALID_BOTLINE_AP)) | |
316 validate_botline(); | |
317 | |
318 if (curwin->w_botline <= curbuf->b_ml.ml_line_count) | |
319 { | |
1744 | 320 if (curwin->w_cursor.lnum < curwin->w_botline) |
321 { | |
322 if (((long)curwin->w_cursor.lnum | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
323 >= (long)curwin->w_botline - *so_ptr |
7 | 324 #ifdef FEAT_FOLDING |
325 || hasAnyFolding(curwin) | |
326 #endif | |
327 )) | |
1744 | 328 { |
7 | 329 lineoff_T loff; |
330 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
331 // Cursor is (a few lines) above botline, check if there are |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
332 // 'scrolloff' window lines below the cursor. If not, need to |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
333 // scroll. |
7 | 334 n = curwin->w_empty_rows; |
335 loff.lnum = curwin->w_cursor.lnum; | |
336 #ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
337 // In a fold go to its last line. |
7 | 338 (void)hasFolding(loff.lnum, NULL, &loff.lnum); |
339 #endif | |
340 #ifdef FEAT_DIFF | |
341 loff.fill = 0; | |
342 n += curwin->w_filler_rows; | |
343 #endif | |
344 loff.height = 0; | |
345 while (loff.lnum < curwin->w_botline | |
346 #ifdef FEAT_DIFF | |
347 && (loff.lnum + 1 < curwin->w_botline || loff.fill == 0) | |
348 #endif | |
349 ) | |
350 { | |
351 n += loff.height; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
352 if (n >= *so_ptr) |
7 | 353 break; |
354 botline_forw(&loff); | |
355 } | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
356 if (n >= *so_ptr) |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
357 // sufficient context, no need to scroll |
7 | 358 check_botline = FALSE; |
1744 | 359 } |
360 else | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
361 // sufficient context, no need to scroll |
1744 | 362 check_botline = FALSE; |
7 | 363 } |
364 if (check_botline) | |
365 { | |
366 #ifdef FEAT_FOLDING | |
367 if (hasAnyFolding(curwin)) | |
368 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
369 // Count the number of logical lines between the cursor and |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
370 // botline - scrolloff (approximation of how much will be |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
371 // scrolled). |
7 | 372 line_count = 0; |
373 for (lnum = curwin->w_cursor.lnum; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
374 lnum >= curwin->w_botline - *so_ptr; --lnum) |
7 | 375 { |
376 ++line_count; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
377 // stop at end of file or when we know we are far off |
7 | 378 if (lnum <= 0 || line_count > curwin->w_height + 1) |
379 break; | |
380 (void)hasFolding(lnum, &lnum, NULL); | |
381 } | |
382 } | |
383 else | |
384 #endif | |
385 line_count = curwin->w_cursor.lnum - curwin->w_botline | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
386 + 1 + *so_ptr; |
7 | 387 if (line_count <= curwin->w_height + 1) |
532 | 388 scroll_cursor_bot(scrolljump_value(), FALSE); |
7 | 389 else |
390 scroll_cursor_halfway(FALSE); | |
391 } | |
392 } | |
393 } | |
394 curwin->w_valid |= VALID_TOPLINE; | |
395 | |
396 /* | |
397 * Need to redraw when topline changed. | |
398 */ | |
399 if (curwin->w_topline != old_topline | |
400 #ifdef FEAT_DIFF | |
401 || curwin->w_topfill != old_topfill | |
402 #endif | |
403 ) | |
404 { | |
3318 | 405 dollar_vcol = -1; |
740 | 406 if (curwin->w_skipcol != 0) |
7 | 407 { |
408 curwin->w_skipcol = 0; | |
409 redraw_later(NOT_VALID); | |
410 } | |
411 else | |
412 redraw_later(VALID); | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
413 // May need to set w_skipcol when cursor in w_topline. |
7 | 414 if (curwin->w_cursor.lnum == curwin->w_topline) |
415 validate_cursor(); | |
416 } | |
417 | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
418 *so_ptr = save_so; |
7 | 419 } |
420 | |
421 /* | |
532 | 422 * Return the scrolljump value to use for the current window. |
423 * When 'scrolljump' is positive use it as-is. | |
424 * When 'scrolljump' is negative use it as a percentage of the window height. | |
425 */ | |
426 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
427 scrolljump_value(void) |
532 | 428 { |
429 if (p_sj >= 0) | |
430 return (int)p_sj; | |
431 return (curwin->w_height * -p_sj) / 100; | |
432 } | |
433 | |
434 /* | |
7 | 435 * Return TRUE when there are not 'scrolloff' lines above the cursor for the |
436 * current window. | |
437 */ | |
438 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
439 check_top_offset(void) |
7 | 440 { |
441 lineoff_T loff; | |
442 int n; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
443 long so = get_scrolloff_value(); |
7 | 444 |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
445 if (curwin->w_cursor.lnum < curwin->w_topline + so |
7 | 446 #ifdef FEAT_FOLDING |
447 || hasAnyFolding(curwin) | |
448 #endif | |
449 ) | |
450 { | |
451 loff.lnum = curwin->w_cursor.lnum; | |
452 #ifdef FEAT_DIFF | |
453 loff.fill = 0; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
454 n = curwin->w_topfill; // always have this context |
7 | 455 #else |
456 n = 0; | |
457 #endif | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
458 // Count the visible screen lines above the cursor line. |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
459 while (n < so) |
7 | 460 { |
461 topline_back(&loff); | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
462 // Stop when included a line above the window. |
7 | 463 if (loff.lnum < curwin->w_topline |
464 #ifdef FEAT_DIFF | |
465 || (loff.lnum == curwin->w_topline && loff.fill > 0) | |
466 #endif | |
467 ) | |
468 break; | |
469 n += loff.height; | |
470 } | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
471 if (n < so) |
7 | 472 return TRUE; |
473 } | |
474 return FALSE; | |
475 } | |
476 | |
477 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
478 update_curswant(void) |
7 | 479 { |
480 if (curwin->w_set_curswant) | |
481 { | |
482 validate_virtcol(); | |
483 curwin->w_curswant = curwin->w_virtcol; | |
484 curwin->w_set_curswant = FALSE; | |
485 } | |
486 } | |
487 | |
488 /* | |
489 * Check if the cursor has moved. Set the w_valid flag accordingly. | |
490 */ | |
491 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
492 check_cursor_moved(win_T *wp) |
7 | 493 { |
494 if (wp->w_cursor.lnum != wp->w_valid_cursor.lnum) | |
495 { | |
496 wp->w_valid &= ~(VALID_WROW|VALID_WCOL|VALID_VIRTCOL | |
497 |VALID_CHEIGHT|VALID_CROW|VALID_TOPLINE); | |
498 wp->w_valid_cursor = wp->w_cursor; | |
499 wp->w_valid_leftcol = wp->w_leftcol; | |
500 } | |
501 else if (wp->w_cursor.col != wp->w_valid_cursor.col | |
502 || wp->w_leftcol != wp->w_valid_leftcol | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
503 || wp->w_cursor.coladd != wp->w_valid_cursor.coladd) |
7 | 504 { |
505 wp->w_valid &= ~(VALID_WROW|VALID_WCOL|VALID_VIRTCOL); | |
506 wp->w_valid_cursor.col = wp->w_cursor.col; | |
507 wp->w_valid_leftcol = wp->w_leftcol; | |
508 wp->w_valid_cursor.coladd = wp->w_cursor.coladd; | |
509 } | |
510 } | |
511 | |
512 /* | |
513 * Call this function when some window settings have changed, which require | |
514 * the cursor position, botline and topline to be recomputed and the window to | |
515 * be redrawn. E.g, when changing the 'wrap' option or folding. | |
516 */ | |
517 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
518 changed_window_setting(void) |
7 | 519 { |
520 changed_window_setting_win(curwin); | |
521 } | |
522 | |
523 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
524 changed_window_setting_win(win_T *wp) |
7 | 525 { |
526 wp->w_lines_valid = 0; | |
527 changed_line_abv_curs_win(wp); | |
528 wp->w_valid &= ~(VALID_BOTLINE|VALID_BOTLINE_AP|VALID_TOPLINE); | |
529 redraw_win_later(wp, NOT_VALID); | |
530 } | |
531 | |
532 /* | |
533 * Set wp->w_topline to a certain number. | |
534 */ | |
535 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
536 set_topline(win_T *wp, linenr_T lnum) |
7 | 537 { |
538 #ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
539 // go to first of folded lines |
7 | 540 (void)hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL); |
541 #endif | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
542 // Approximate the value of w_botline |
7 | 543 wp->w_botline += lnum - wp->w_topline; |
544 wp->w_topline = lnum; | |
1744 | 545 wp->w_topline_was_set = TRUE; |
7 | 546 #ifdef FEAT_DIFF |
547 wp->w_topfill = 0; | |
548 #endif | |
549 wp->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_TOPLINE); | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
550 // Don't set VALID_TOPLINE here, 'scrolloff' needs to be checked. |
7 | 551 redraw_later(VALID); |
552 } | |
553 | |
554 /* | |
555 * Call this function when the length of the cursor line (in screen | |
556 * characters) has changed, and the change is before the cursor. | |
557 * Need to take care of w_botline separately! | |
558 */ | |
559 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
560 changed_cline_bef_curs(void) |
7 | 561 { |
562 curwin->w_valid &= ~(VALID_WROW|VALID_WCOL|VALID_VIRTCOL | |
563 |VALID_CHEIGHT|VALID_TOPLINE); | |
564 } | |
565 | |
566 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
567 changed_cline_bef_curs_win(win_T *wp) |
7 | 568 { |
569 wp->w_valid &= ~(VALID_WROW|VALID_WCOL|VALID_VIRTCOL | |
570 |VALID_CHEIGHT|VALID_TOPLINE); | |
571 } | |
572 | |
573 /* | |
574 * Call this function when the length of a line (in screen characters) above | |
575 * the cursor have changed. | |
576 * Need to take care of w_botline separately! | |
577 */ | |
578 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
579 changed_line_abv_curs(void) |
7 | 580 { |
581 curwin->w_valid &= ~(VALID_WROW|VALID_WCOL|VALID_VIRTCOL|VALID_CROW | |
582 |VALID_CHEIGHT|VALID_TOPLINE); | |
583 } | |
584 | |
585 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
586 changed_line_abv_curs_win(win_T *wp) |
7 | 587 { |
588 wp->w_valid &= ~(VALID_WROW|VALID_WCOL|VALID_VIRTCOL|VALID_CROW | |
589 |VALID_CHEIGHT|VALID_TOPLINE); | |
590 } | |
591 | |
592 /* | |
593 * Make sure the value of curwin->w_botline is valid. | |
594 */ | |
595 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
596 validate_botline(void) |
7 | 597 { |
598 if (!(curwin->w_valid & VALID_BOTLINE)) | |
599 comp_botline(curwin); | |
600 } | |
601 | |
602 /* | |
603 * Mark curwin->w_botline as invalid (because of some change in the buffer). | |
604 */ | |
605 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
606 invalidate_botline(void) |
7 | 607 { |
608 curwin->w_valid &= ~(VALID_BOTLINE|VALID_BOTLINE_AP); | |
609 } | |
610 | |
611 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
612 invalidate_botline_win(win_T *wp) |
7 | 613 { |
614 wp->w_valid &= ~(VALID_BOTLINE|VALID_BOTLINE_AP); | |
615 } | |
616 | |
617 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
618 approximate_botline_win( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
619 win_T *wp) |
7 | 620 { |
621 wp->w_valid &= ~VALID_BOTLINE; | |
622 } | |
623 | |
624 /* | |
625 * Return TRUE if curwin->w_wrow and curwin->w_wcol are valid. | |
626 */ | |
627 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
628 cursor_valid(void) |
7 | 629 { |
630 check_cursor_moved(curwin); | |
631 return ((curwin->w_valid & (VALID_WROW|VALID_WCOL)) == | |
632 (VALID_WROW|VALID_WCOL)); | |
633 } | |
634 | |
635 /* | |
636 * Validate cursor position. Makes sure w_wrow and w_wcol are valid. | |
637 * w_topline must be valid, you may need to call update_topline() first! | |
638 */ | |
639 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
640 validate_cursor(void) |
7 | 641 { |
642 check_cursor_moved(curwin); | |
643 if ((curwin->w_valid & (VALID_WCOL|VALID_WROW)) != (VALID_WCOL|VALID_WROW)) | |
644 curs_columns(TRUE); | |
645 } | |
646 | |
647 #if defined(FEAT_GUI) || defined(PROTO) | |
648 /* | |
649 * validate w_cline_row. | |
650 */ | |
651 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
652 validate_cline_row(void) |
7 | 653 { |
654 /* | |
655 * First make sure that w_topline is valid (after moving the cursor). | |
656 */ | |
657 update_topline(); | |
658 check_cursor_moved(curwin); | |
659 if (!(curwin->w_valid & VALID_CROW)) | |
6441 | 660 curs_rows(curwin); |
7 | 661 } |
662 #endif | |
663 | |
664 /* | |
665 * Compute wp->w_cline_row and wp->w_cline_height, based on the current value | |
2154
7c8c7c95a865
First step in the Vim 7.3 branch. Changed version numbers.
Bram Moolenaar <bram@zimbu.org>
parents:
2082
diff
changeset
|
666 * of wp->w_topline. |
7 | 667 */ |
668 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
669 curs_rows(win_T *wp) |
7 | 670 { |
671 linenr_T lnum; | |
672 int i; | |
673 int all_invalid; | |
674 int valid; | |
675 #ifdef FEAT_FOLDING | |
676 long fold_count; | |
677 #endif | |
678 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
679 // Check if wp->w_lines[].wl_size is invalid |
7 | 680 all_invalid = (!redrawing() |
681 || wp->w_lines_valid == 0 | |
682 || wp->w_lines[0].wl_lnum > wp->w_topline); | |
683 i = 0; | |
684 wp->w_cline_row = 0; | |
685 for (lnum = wp->w_topline; lnum < wp->w_cursor.lnum; ++i) | |
686 { | |
687 valid = FALSE; | |
688 if (!all_invalid && i < wp->w_lines_valid) | |
689 { | |
690 if (wp->w_lines[i].wl_lnum < lnum || !wp->w_lines[i].wl_valid) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
691 continue; // skip changed or deleted lines |
7 | 692 if (wp->w_lines[i].wl_lnum == lnum) |
693 { | |
694 #ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
695 // Check for newly inserted lines below this row, in which |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
696 // case we need to check for folded lines. |
7 | 697 if (!wp->w_buffer->b_mod_set |
698 || wp->w_lines[i].wl_lastlnum < wp->w_cursor.lnum | |
699 || wp->w_buffer->b_mod_top | |
700 > wp->w_lines[i].wl_lastlnum + 1) | |
701 #endif | |
702 valid = TRUE; | |
703 } | |
704 else if (wp->w_lines[i].wl_lnum > lnum) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
705 --i; // hold at inserted lines |
7 | 706 } |
707 if (valid | |
708 #ifdef FEAT_DIFF | |
709 && (lnum != wp->w_topline || !wp->w_p_diff) | |
710 #endif | |
711 ) | |
712 { | |
713 #ifdef FEAT_FOLDING | |
714 lnum = wp->w_lines[i].wl_lastlnum + 1; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
715 // Cursor inside folded lines, don't count this row |
7 | 716 if (lnum > wp->w_cursor.lnum) |
717 break; | |
718 #else | |
719 ++lnum; | |
720 #endif | |
721 wp->w_cline_row += wp->w_lines[i].wl_size; | |
722 } | |
723 else | |
724 { | |
725 #ifdef FEAT_FOLDING | |
726 fold_count = foldedCount(wp, lnum, NULL); | |
727 if (fold_count) | |
728 { | |
729 lnum += fold_count; | |
730 if (lnum > wp->w_cursor.lnum) | |
731 break; | |
732 ++wp->w_cline_row; | |
733 } | |
734 else | |
735 #endif | |
736 #ifdef FEAT_DIFF | |
737 if (lnum == wp->w_topline) | |
738 wp->w_cline_row += plines_win_nofill(wp, lnum++, TRUE) | |
739 + wp->w_topfill; | |
740 else | |
741 #endif | |
742 wp->w_cline_row += plines_win(wp, lnum++, TRUE); | |
743 } | |
744 } | |
745 | |
746 check_cursor_moved(wp); | |
747 if (!(wp->w_valid & VALID_CHEIGHT)) | |
748 { | |
749 if (all_invalid | |
750 || i == wp->w_lines_valid | |
751 || (i < wp->w_lines_valid | |
752 && (!wp->w_lines[i].wl_valid | |
753 || wp->w_lines[i].wl_lnum != wp->w_cursor.lnum))) | |
754 { | |
755 #ifdef FEAT_DIFF | |
756 if (wp->w_cursor.lnum == wp->w_topline) | |
757 wp->w_cline_height = plines_win_nofill(wp, wp->w_cursor.lnum, | |
758 TRUE) + wp->w_topfill; | |
759 else | |
760 #endif | |
761 wp->w_cline_height = plines_win(wp, wp->w_cursor.lnum, TRUE); | |
762 #ifdef FEAT_FOLDING | |
763 wp->w_cline_folded = hasFoldingWin(wp, wp->w_cursor.lnum, | |
764 NULL, NULL, TRUE, NULL); | |
765 #endif | |
766 } | |
767 else if (i > wp->w_lines_valid) | |
768 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
769 // a line that is too long to fit on the last screen line |
7 | 770 wp->w_cline_height = 0; |
771 #ifdef FEAT_FOLDING | |
772 wp->w_cline_folded = hasFoldingWin(wp, wp->w_cursor.lnum, | |
773 NULL, NULL, TRUE, NULL); | |
774 #endif | |
775 } | |
776 else | |
777 { | |
778 wp->w_cline_height = wp->w_lines[i].wl_size; | |
779 #ifdef FEAT_FOLDING | |
780 wp->w_cline_folded = wp->w_lines[i].wl_folded; | |
781 #endif | |
782 } | |
783 } | |
784 | |
5764 | 785 redraw_for_cursorline(curwin); |
7 | 786 wp->w_valid |= VALID_CROW|VALID_CHEIGHT; |
787 | |
788 } | |
789 | |
790 /* | |
791 * Validate curwin->w_virtcol only. | |
792 */ | |
793 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
794 validate_virtcol(void) |
7 | 795 { |
796 validate_virtcol_win(curwin); | |
797 } | |
798 | |
799 /* | |
800 * Validate wp->w_virtcol only. | |
801 */ | |
802 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
803 validate_virtcol_win(win_T *wp) |
7 | 804 { |
805 check_cursor_moved(wp); | |
806 if (!(wp->w_valid & VALID_VIRTCOL)) | |
807 { | |
808 getvvcol(wp, &wp->w_cursor, NULL, &(wp->w_virtcol), NULL); | |
809 wp->w_valid |= VALID_VIRTCOL; | |
740 | 810 #ifdef FEAT_SYN_HL |
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17292
diff
changeset
|
811 if (wp->w_p_cuc && !pum_visible()) |
740 | 812 redraw_win_later(wp, SOME_VALID); |
813 #endif | |
7 | 814 } |
815 } | |
816 | |
817 /* | |
818 * Validate curwin->w_cline_height only. | |
819 */ | |
18892
fb2d26bc8ca1
patch 8.2.0007: popup menu positioned wrong with folding in two tabs
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
820 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
821 validate_cheight(void) |
7 | 822 { |
823 check_cursor_moved(curwin); | |
824 if (!(curwin->w_valid & VALID_CHEIGHT)) | |
825 { | |
826 #ifdef FEAT_DIFF | |
827 if (curwin->w_cursor.lnum == curwin->w_topline) | |
828 curwin->w_cline_height = plines_nofill(curwin->w_cursor.lnum) | |
829 + curwin->w_topfill; | |
830 else | |
831 #endif | |
832 curwin->w_cline_height = plines(curwin->w_cursor.lnum); | |
833 #ifdef FEAT_FOLDING | |
834 curwin->w_cline_folded = hasFolding(curwin->w_cursor.lnum, NULL, NULL); | |
835 #endif | |
836 curwin->w_valid |= VALID_CHEIGHT; | |
837 } | |
838 } | |
839 | |
840 /* | |
1668 | 841 * Validate w_wcol and w_virtcol only. |
7 | 842 */ |
843 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
844 validate_cursor_col(void) |
7 | 845 { |
846 colnr_T off; | |
847 colnr_T col; | |
2070
4483ee552619
updated for version 7.2.355
Bram Moolenaar <bram@zimbu.org>
parents:
1980
diff
changeset
|
848 int width; |
7 | 849 |
850 validate_virtcol(); | |
851 if (!(curwin->w_valid & VALID_WCOL)) | |
852 { | |
853 col = curwin->w_virtcol; | |
854 off = curwin_col_off(); | |
855 col += off; | |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
856 width = curwin->w_width - off + curwin_col_off2(); |
7 | 857 |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
858 // long line wrapping, adjust curwin->w_wrow |
1668 | 859 if (curwin->w_p_wrap |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
860 && col >= (colnr_T)curwin->w_width |
2070
4483ee552619
updated for version 7.2.355
Bram Moolenaar <bram@zimbu.org>
parents:
1980
diff
changeset
|
861 && width > 0) |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
862 // use same formula as what is used in curs_columns() |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
863 col -= ((col - curwin->w_width) / width + 1) * width; |
1668 | 864 if (col > (int)curwin->w_leftcol) |
865 col -= curwin->w_leftcol; | |
866 else | |
867 col = 0; | |
7 | 868 curwin->w_wcol = col; |
1668 | 869 |
7 | 870 curwin->w_valid |= VALID_WCOL; |
871 } | |
872 } | |
873 | |
874 /* | |
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
875 * Compute offset of a window, occupied by absolute or relative line number, |
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
876 * fold column and sign column (these don't move when scrolling horizontally). |
7 | 877 */ |
878 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
879 win_col_off(win_T *wp) |
7 | 880 { |
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
881 return (((wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) + 1 : 0) |
7 | 882 #ifdef FEAT_CMDWIN |
883 + (cmdwin_type == 0 || wp != curwin ? 0 : 1) | |
884 #endif | |
885 #ifdef FEAT_FOLDING | |
886 + wp->w_p_fdc | |
887 #endif | |
888 #ifdef FEAT_SIGNS | |
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
889 + (signcolumn_on(wp) ? 2 : 0) |
7 | 890 #endif |
891 ); | |
892 } | |
893 | |
894 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
895 curwin_col_off(void) |
7 | 896 { |
897 return win_col_off(curwin); | |
898 } | |
899 | |
900 /* | |
901 * Return the difference in column offset for the second screen line of a | |
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
902 * wrapped line. It's 8 if 'number' or 'relativenumber' is on and 'n' is in |
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
903 * 'cpoptions'. |
7 | 904 */ |
905 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
906 win_col_off2(win_T *wp) |
7 | 907 { |
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
908 if ((wp->w_p_nu || wp->w_p_rnu) && vim_strchr(p_cpo, CPO_NUMCOL) != NULL) |
13 | 909 return number_width(wp) + 1; |
7 | 910 return 0; |
911 } | |
912 | |
913 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
914 curwin_col_off2(void) |
7 | 915 { |
916 return win_col_off2(curwin); | |
917 } | |
918 | |
919 /* | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15414
diff
changeset
|
920 * Compute curwin->w_wcol and curwin->w_virtcol. |
7 | 921 * Also updates curwin->w_wrow and curwin->w_cline_row. |
922 * Also updates curwin->w_leftcol. | |
923 */ | |
924 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
925 curs_columns( |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
926 int may_scroll) // when TRUE, may scroll horizontally |
7 | 927 { |
928 int diff; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
929 int extra; // offset for first screen line |
7 | 930 int off_left, off_right; |
931 int n; | |
932 int p_lines; | |
933 int width = 0; | |
934 int textwidth; | |
935 int new_leftcol; | |
936 colnr_T startcol; | |
937 colnr_T endcol; | |
938 colnr_T prev_skipcol; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
939 long so = get_scrolloff_value(); |
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
940 long siso = get_sidescrolloff_value(); |
7 | 941 |
942 /* | |
943 * First make sure that w_topline is valid (after moving the cursor). | |
944 */ | |
945 update_topline(); | |
946 | |
947 /* | |
948 * Next make sure that w_cline_row is valid. | |
949 */ | |
950 if (!(curwin->w_valid & VALID_CROW)) | |
6441 | 951 curs_rows(curwin); |
7 | 952 |
953 /* | |
954 * Compute the number of virtual columns. | |
955 */ | |
956 #ifdef FEAT_FOLDING | |
957 if (curwin->w_cline_folded) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
958 // In a folded line the cursor is always in the first column |
7 | 959 startcol = curwin->w_virtcol = endcol = curwin->w_leftcol; |
960 else | |
961 #endif | |
962 getvvcol(curwin, &curwin->w_cursor, | |
963 &startcol, &(curwin->w_virtcol), &endcol); | |
964 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
965 // remove '$' from change command when cursor moves onto it |
7 | 966 if (startcol > dollar_vcol) |
3318 | 967 dollar_vcol = -1; |
7 | 968 |
969 extra = curwin_col_off(); | |
970 curwin->w_wcol = curwin->w_virtcol + extra; | |
971 endcol += extra; | |
972 | |
973 /* | |
974 * Now compute w_wrow, counting screen lines from w_cline_row. | |
975 */ | |
976 curwin->w_wrow = curwin->w_cline_row; | |
977 | |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
978 textwidth = curwin->w_width - extra; |
7 | 979 if (textwidth <= 0) |
980 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
981 // No room for text, put cursor in last char of window. |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
982 curwin->w_wcol = curwin->w_width - 1; |
7 | 983 curwin->w_wrow = curwin->w_height - 1; |
984 } | |
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
985 else if (curwin->w_p_wrap && curwin->w_width != 0) |
7 | 986 { |
987 width = textwidth + curwin_col_off2(); | |
988 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
989 // long line wrapping, adjust curwin->w_wrow |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
990 if (curwin->w_wcol >= curwin->w_width) |
7 | 991 { |
18580
4ac042c8ed98
patch 8.1.2284: compiler warning for unused variable
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
992 #ifdef FEAT_LINEBREAK |
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18469
diff
changeset
|
993 char_u *sbr; |
18580
4ac042c8ed98
patch 8.1.2284: compiler warning for unused variable
Bram Moolenaar <Bram@vim.org>
parents:
18574
diff
changeset
|
994 #endif |
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18469
diff
changeset
|
995 |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
996 // this same formula is used in validate_cursor_col() |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
997 n = (curwin->w_wcol - curwin->w_width) / width + 1; |
7 | 998 curwin->w_wcol -= n * width; |
999 curwin->w_wrow += n; | |
1000 | |
1001 #ifdef FEAT_LINEBREAK | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1002 // When cursor wraps to first char of next line in Insert |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1003 // mode, the 'showbreak' string isn't shown, backup to first |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1004 // column |
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18469
diff
changeset
|
1005 sbr = get_showbreak_value(curwin); |
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18469
diff
changeset
|
1006 if (*sbr && *ml_get_cursor() == NUL |
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18469
diff
changeset
|
1007 && curwin->w_wcol == (int)vim_strsize(sbr)) |
7 | 1008 curwin->w_wcol = 0; |
1009 #endif | |
1010 } | |
1011 } | |
1012 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1013 // No line wrapping: compute curwin->w_leftcol if scrolling is on and line |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1014 // is not folded. |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1015 // If scrolling is off, curwin->w_leftcol is assumed to be 0 |
3263 | 1016 else if (may_scroll |
7 | 1017 #ifdef FEAT_FOLDING |
1018 && !curwin->w_cline_folded | |
1019 #endif | |
1020 ) | |
1021 { | |
1022 /* | |
1023 * If Cursor is left of the screen, scroll rightwards. | |
1024 * If Cursor is right of the screen, scroll leftwards | |
1025 * If we get closer to the edge than 'sidescrolloff', scroll a little | |
1026 * extra | |
1027 */ | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1028 off_left = (int)startcol - (int)curwin->w_leftcol - siso; |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1029 off_right = (int)endcol - (int)(curwin->w_leftcol + curwin->w_width |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1030 - siso) + 1; |
7 | 1031 if (off_left < 0 || off_right > 0) |
1032 { | |
1033 if (off_left < 0) | |
1034 diff = -off_left; | |
1035 else | |
1036 diff = off_right; | |
1037 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1038 // When far off or not enough room on either side, put cursor in |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1039 // middle of window. |
7 | 1040 if (p_ss == 0 || diff >= textwidth / 2 || off_right >= off_left) |
1041 new_leftcol = curwin->w_wcol - extra - textwidth / 2; | |
1042 else | |
1043 { | |
1044 if (diff < p_ss) | |
1045 diff = p_ss; | |
1046 if (off_left < 0) | |
1047 new_leftcol = curwin->w_leftcol - diff; | |
1048 else | |
1049 new_leftcol = curwin->w_leftcol + diff; | |
1050 } | |
1051 if (new_leftcol < 0) | |
1052 new_leftcol = 0; | |
1053 if (new_leftcol != (int)curwin->w_leftcol) | |
1054 { | |
1055 curwin->w_leftcol = new_leftcol; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1056 // screen has to be redrawn with new curwin->w_leftcol |
7 | 1057 redraw_later(NOT_VALID); |
1058 } | |
1059 } | |
1060 curwin->w_wcol -= curwin->w_leftcol; | |
1061 } | |
1062 else if (curwin->w_wcol > (int)curwin->w_leftcol) | |
1063 curwin->w_wcol -= curwin->w_leftcol; | |
1064 else | |
1065 curwin->w_wcol = 0; | |
1066 | |
1067 #ifdef FEAT_DIFF | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1068 // Skip over filler lines. At the top use w_topfill, there |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1069 // may be some filler lines above the window. |
7 | 1070 if (curwin->w_cursor.lnum == curwin->w_topline) |
1071 curwin->w_wrow += curwin->w_topfill; | |
1072 else | |
1073 curwin->w_wrow += diff_check_fill(curwin, curwin->w_cursor.lnum); | |
1074 #endif | |
1075 | |
1076 prev_skipcol = curwin->w_skipcol; | |
1077 | |
1078 p_lines = 0; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1079 |
7 | 1080 if ((curwin->w_wrow >= curwin->w_height |
1081 || ((prev_skipcol > 0 | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1082 || curwin->w_wrow + so >= curwin->w_height) |
7 | 1083 && (p_lines = |
1084 #ifdef FEAT_DIFF | |
1085 plines_win_nofill | |
1086 #else | |
1087 plines_win | |
1088 #endif | |
1089 (curwin, curwin->w_cursor.lnum, FALSE)) | |
1090 - 1 >= curwin->w_height)) | |
1091 && curwin->w_height != 0 | |
1092 && curwin->w_cursor.lnum == curwin->w_topline | |
1093 && width > 0 | |
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
1094 && curwin->w_width != 0) |
7 | 1095 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1096 // Cursor past end of screen. Happens with a single line that does |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1097 // not fit on screen. Find a skipcol to show the text around the |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1098 // cursor. Avoid scrolling all the time. compute value of "extra": |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1099 // 1: Less than 'scrolloff' lines above |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1100 // 2: Less than 'scrolloff' lines below |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1101 // 3: both of them |
7 | 1102 extra = 0; |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1103 if (curwin->w_skipcol + so * width > curwin->w_virtcol) |
7 | 1104 extra = 1; |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1105 // Compute last display line of the buffer line that we want at the |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1106 // bottom of the window. |
7 | 1107 if (p_lines == 0) |
1108 p_lines = plines_win(curwin, curwin->w_cursor.lnum, FALSE); | |
1109 --p_lines; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1110 if (p_lines > curwin->w_wrow + so) |
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1111 n = curwin->w_wrow + so; |
7 | 1112 else |
1113 n = p_lines; | |
1114 if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width) | |
1115 extra += 2; | |
1116 | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1117 if (extra == 3 || p_lines < so * 2) |
7 | 1118 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1119 // not enough room for 'scrolloff', put cursor in the middle |
7 | 1120 n = curwin->w_virtcol / width; |
1121 if (n > curwin->w_height / 2) | |
1122 n -= curwin->w_height / 2; | |
1123 else | |
1124 n = 0; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1125 // don't skip more than necessary |
7 | 1126 if (n > p_lines - curwin->w_height + 1) |
1127 n = p_lines - curwin->w_height + 1; | |
1128 curwin->w_skipcol = n * width; | |
1129 } | |
1130 else if (extra == 1) | |
1131 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1132 // less then 'scrolloff' lines above, decrease skipcol |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1133 extra = (curwin->w_skipcol + so * width - curwin->w_virtcol |
7 | 1134 + width - 1) / width; |
1135 if (extra > 0) | |
1136 { | |
1137 if ((colnr_T)(extra * width) > curwin->w_skipcol) | |
1138 extra = curwin->w_skipcol / width; | |
1139 curwin->w_skipcol -= extra * width; | |
1140 } | |
1141 } | |
1142 else if (extra == 2) | |
1143 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1144 // less then 'scrolloff' lines below, increase skipcol |
7 | 1145 endcol = (n - curwin->w_height + 1) * width; |
1146 while (endcol > curwin->w_virtcol) | |
1147 endcol -= width; | |
1148 if (endcol > curwin->w_skipcol) | |
1149 curwin->w_skipcol = endcol; | |
1150 } | |
1151 | |
1152 curwin->w_wrow -= curwin->w_skipcol / width; | |
1153 if (curwin->w_wrow >= curwin->w_height) | |
1154 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1155 // small window, make sure cursor is in it |
7 | 1156 extra = curwin->w_wrow - curwin->w_height + 1; |
1157 curwin->w_skipcol += extra * width; | |
1158 curwin->w_wrow -= extra; | |
1159 } | |
1160 | |
1161 extra = ((int)prev_skipcol - (int)curwin->w_skipcol) / width; | |
1162 if (extra > 0) | |
1163 win_ins_lines(curwin, 0, extra, FALSE, FALSE); | |
1164 else if (extra < 0) | |
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
11258
diff
changeset
|
1165 win_del_lines(curwin, 0, -extra, FALSE, FALSE, 0); |
7 | 1166 } |
1167 else | |
1168 curwin->w_skipcol = 0; | |
1169 if (prev_skipcol != curwin->w_skipcol) | |
1170 redraw_later(NOT_VALID); | |
1171 | |
740 | 1172 #ifdef FEAT_SYN_HL |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1173 // Redraw when w_virtcol changes and 'cursorcolumn' is set |
5749 | 1174 if (curwin->w_p_cuc && (curwin->w_valid & VALID_VIRTCOL) == 0 |
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17292
diff
changeset
|
1175 && !pum_visible()) |
5749 | 1176 redraw_later(SOME_VALID); |
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2154
diff
changeset
|
1177 #endif |
19542
9e428147e4ee
patch 8.2.0328: no redraw when leaving term-normal mode in popup terminal
Bram Moolenaar <Bram@vim.org>
parents:
18931
diff
changeset
|
1178 #if defined(FEAT_PROP_POPUP) && defined(FEAT_TERMINAL) |
9e428147e4ee
patch 8.2.0328: no redraw when leaving term-normal mode in popup terminal
Bram Moolenaar <Bram@vim.org>
parents:
18931
diff
changeset
|
1179 if (popup_is_popup(curwin) && curbuf->b_term != NULL) |
9e428147e4ee
patch 8.2.0328: no redraw when leaving term-normal mode in popup terminal
Bram Moolenaar <Bram@vim.org>
parents:
18931
diff
changeset
|
1180 { |
9e428147e4ee
patch 8.2.0328: no redraw when leaving term-normal mode in popup terminal
Bram Moolenaar <Bram@vim.org>
parents:
18931
diff
changeset
|
1181 curwin->w_wrow += popup_top_extra(curwin); |
9e428147e4ee
patch 8.2.0328: no redraw when leaving term-normal mode in popup terminal
Bram Moolenaar <Bram@vim.org>
parents:
18931
diff
changeset
|
1182 curwin->w_wcol += popup_left_extra(curwin); |
9e428147e4ee
patch 8.2.0328: no redraw when leaving term-normal mode in popup terminal
Bram Moolenaar <Bram@vim.org>
parents:
18931
diff
changeset
|
1183 } |
9e428147e4ee
patch 8.2.0328: no redraw when leaving term-normal mode in popup terminal
Bram Moolenaar <Bram@vim.org>
parents:
18931
diff
changeset
|
1184 #endif |
740 | 1185 |
18621
a9bfdc5ea1ec
patch 8.1.2303: cursor in wrong position after horizontal scroll
Bram Moolenaar <Bram@vim.org>
parents:
18580
diff
changeset
|
1186 // now w_leftcol is valid, avoid check_cursor_moved() thinking otherwise |
a9bfdc5ea1ec
patch 8.1.2303: cursor in wrong position after horizontal scroll
Bram Moolenaar <Bram@vim.org>
parents:
18580
diff
changeset
|
1187 curwin->w_valid_leftcol = curwin->w_leftcol; |
a9bfdc5ea1ec
patch 8.1.2303: cursor in wrong position after horizontal scroll
Bram Moolenaar <Bram@vim.org>
parents:
18580
diff
changeset
|
1188 |
7 | 1189 curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL; |
1190 } | |
1191 | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18621
diff
changeset
|
1192 #if (defined(FEAT_EVAL) || defined(FEAT_PROP_POPUP)) || defined(PROTO) |
17292
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1193 /* |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1194 * Compute the screen position of text character at "pos" in window "wp" |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1195 * The resulting values are one-based, zero when character is not visible. |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1196 */ |
17863
08f1dd29550e
patch 8.1.1928: popup windows don't move with the text when making changes
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1197 void |
17292
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1198 textpos2screenpos( |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1199 win_T *wp, |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1200 pos_T *pos, |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1201 int *rowp, // screen row |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1202 int *scolp, // start screen column |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1203 int *ccolp, // cursor screen column |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1204 int *ecolp) // end screen column |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1205 { |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1206 colnr_T scol = 0, ccol = 0, ecol = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1207 int row = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1208 int rowoff = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1209 colnr_T coloff = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1210 |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1211 if (pos->lnum >= wp->w_topline && pos->lnum < wp->w_botline) |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1212 { |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1213 colnr_T off; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1214 colnr_T col; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1215 int width; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1216 |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1217 row = plines_m_win(wp, wp->w_topline, pos->lnum - 1) + 1; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1218 getvcol(wp, pos, &scol, &ccol, &ecol); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1219 |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1220 // similar to what is done in validate_cursor_col() |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1221 col = scol; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1222 off = win_col_off(wp); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1223 col += off; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1224 width = wp->w_width - off + win_col_off2(wp); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1225 |
17863
08f1dd29550e
patch 8.1.1928: popup windows don't move with the text when making changes
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1226 // long line wrapping, adjust row |
17292
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1227 if (wp->w_p_wrap |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1228 && col >= (colnr_T)wp->w_width |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1229 && width > 0) |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1230 { |
17863
08f1dd29550e
patch 8.1.1928: popup windows don't move with the text when making changes
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1231 // use same formula as what is used in curs_columns() |
17292
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1232 rowoff = ((col - wp->w_width) / width + 1); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1233 col -= rowoff * width; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1234 } |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1235 col -= wp->w_leftcol; |
18469
66964658cc3c
patch 8.1.2228: screenpos() returns wrong values when 'number' is set
Bram Moolenaar <Bram@vim.org>
parents:
18354
diff
changeset
|
1236 if (col >= wp->w_width) |
17292
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1237 col = -1; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1238 if (col >= 0) |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1239 coloff = col - scol + wp->w_wincol + 1; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1240 else |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1241 // character is left or right of the window |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1242 row = scol = ccol = ecol = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1243 } |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1244 *rowp = wp->w_winrow + row + rowoff; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1245 *scolp = scol + coloff; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1246 *ccolp = ccol + coloff; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1247 *ecolp = ecol + coloff; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1248 } |
17863
08f1dd29550e
patch 8.1.1928: popup windows don't move with the text when making changes
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1249 #endif |
17292
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1250 |
17863
08f1dd29550e
patch 8.1.1928: popup windows don't move with the text when making changes
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1251 #if defined(FEAT_EVAL) || defined(PROTO) |
17292
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1252 /* |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1253 * "screenpos({winid}, {lnum}, {col})" function |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1254 */ |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1255 void |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1256 f_screenpos(typval_T *argvars UNUSED, typval_T *rettv) |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1257 { |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1258 dict_T *dict; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1259 win_T *wp; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1260 pos_T pos; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1261 int row = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1262 int scol = 0, ccol = 0, ecol = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1263 |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1264 if (rettv_dict_alloc(rettv) != OK) |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1265 return; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1266 dict = rettv->vval.v_dict; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1267 |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1268 wp = find_win_by_nr_or_id(&argvars[0]); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1269 if (wp == NULL) |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1270 return; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1271 |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1272 pos.lnum = tv_get_number(&argvars[1]); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1273 pos.col = tv_get_number(&argvars[2]) - 1; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1274 pos.coladd = 0; |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1275 textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1276 |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1277 dict_add_number(dict, "row", row); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1278 dict_add_number(dict, "col", scol); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1279 dict_add_number(dict, "curscol", ccol); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1280 dict_add_number(dict, "endcol", ecol); |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1281 } |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1282 #endif |
8a095d343c59
patch 8.1.1645: cannot use a popup window for a balloon
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
1283 |
7 | 1284 /* |
1285 * Scroll the current window down by "line_count" logical lines. "CTRL-Y" | |
1286 */ | |
1287 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1288 scrolldown( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1289 long line_count, |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1290 int byfold UNUSED) // TRUE: count a closed fold as one line |
7 | 1291 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1292 long done = 0; // total # of physical lines done |
7 | 1293 int wrow; |
1294 int moved = FALSE; | |
1295 | |
1296 #ifdef FEAT_FOLDING | |
1297 linenr_T first; | |
1298 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1299 // Make sure w_topline is at the first of a sequence of folded lines. |
7 | 1300 (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL); |
1301 #endif | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1302 validate_cursor(); // w_wrow needs to be valid |
7 | 1303 while (line_count-- > 0) |
1304 { | |
1305 #ifdef FEAT_DIFF | |
1980 | 1306 if (curwin->w_topfill < diff_check(curwin, curwin->w_topline) |
1307 && curwin->w_topfill < curwin->w_height - 1) | |
7 | 1308 { |
1309 ++curwin->w_topfill; | |
1310 ++done; | |
1311 } | |
1312 else | |
1313 #endif | |
1314 { | |
1315 if (curwin->w_topline == 1) | |
1316 break; | |
1317 --curwin->w_topline; | |
1318 #ifdef FEAT_DIFF | |
1319 curwin->w_topfill = 0; | |
1320 #endif | |
1321 #ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1322 // A sequence of folded lines only counts for one logical line |
7 | 1323 if (hasFolding(curwin->w_topline, &first, NULL)) |
1324 { | |
1325 ++done; | |
1326 if (!byfold) | |
1327 line_count -= curwin->w_topline - first - 1; | |
1328 curwin->w_botline -= curwin->w_topline - first; | |
1329 curwin->w_topline = first; | |
1330 } | |
1331 else | |
1332 #endif | |
7103
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
1333 done += PLINES_NOFILL(curwin->w_topline); |
7 | 1334 } |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1335 --curwin->w_botline; // approximate w_botline |
7 | 1336 invalidate_botline(); |
1337 } | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1338 curwin->w_wrow += done; // keep w_wrow updated |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1339 curwin->w_cline_row += done; // keep w_cline_row updated |
7 | 1340 |
1341 #ifdef FEAT_DIFF | |
1342 if (curwin->w_cursor.lnum == curwin->w_topline) | |
1343 curwin->w_cline_row = 0; | |
1344 check_topfill(curwin, TRUE); | |
1345 #endif | |
1346 | |
1347 /* | |
1348 * Compute the row number of the last row of the cursor line | |
1349 * and move the cursor onto the displayed part of the window. | |
1350 */ | |
1351 wrow = curwin->w_wrow; | |
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
1352 if (curwin->w_p_wrap && curwin->w_width != 0) |
7 | 1353 { |
1354 validate_virtcol(); | |
1355 validate_cheight(); | |
1356 wrow += curwin->w_cline_height - 1 - | |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1357 curwin->w_virtcol / curwin->w_width; |
7 | 1358 } |
1359 while (wrow >= curwin->w_height && curwin->w_cursor.lnum > 1) | |
1360 { | |
1361 #ifdef FEAT_FOLDING | |
1362 if (hasFolding(curwin->w_cursor.lnum, &first, NULL)) | |
1363 { | |
1364 --wrow; | |
1365 if (first == 1) | |
1366 curwin->w_cursor.lnum = 1; | |
1367 else | |
1368 curwin->w_cursor.lnum = first - 1; | |
1369 } | |
1370 else | |
1371 #endif | |
1372 wrow -= plines(curwin->w_cursor.lnum--); | |
1373 curwin->w_valid &= | |
1374 ~(VALID_WROW|VALID_WCOL|VALID_CHEIGHT|VALID_CROW|VALID_VIRTCOL); | |
1375 moved = TRUE; | |
1376 } | |
1377 if (moved) | |
1378 { | |
1379 #ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1380 // Move cursor to first line of closed fold. |
7 | 1381 foldAdjustCursor(); |
1382 #endif | |
1383 coladvance(curwin->w_curswant); | |
1384 } | |
1385 } | |
1386 | |
1387 /* | |
1388 * Scroll the current window up by "line_count" logical lines. "CTRL-E" | |
1389 */ | |
1390 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1391 scrollup( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1392 long line_count, |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1393 int byfold UNUSED) // TRUE: count a closed fold as one line |
7 | 1394 { |
1395 #if defined(FEAT_FOLDING) || defined(FEAT_DIFF) | |
1396 linenr_T lnum; | |
1397 | |
1398 if ( | |
1399 # ifdef FEAT_FOLDING | |
1400 (byfold && hasAnyFolding(curwin)) | |
1401 # ifdef FEAT_DIFF | |
1402 || | |
1403 # endif | |
1404 # endif | |
1405 # ifdef FEAT_DIFF | |
1406 curwin->w_p_diff | |
1407 # endif | |
1408 ) | |
1409 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1410 // count each sequence of folded lines as one logical line |
7 | 1411 lnum = curwin->w_topline; |
1412 while (line_count--) | |
1413 { | |
1414 # ifdef FEAT_DIFF | |
1415 if (curwin->w_topfill > 0) | |
1416 --curwin->w_topfill; | |
1417 else | |
1418 # endif | |
1419 { | |
1420 # ifdef FEAT_FOLDING | |
1421 if (byfold) | |
1422 (void)hasFolding(lnum, NULL, &lnum); | |
1423 # endif | |
1424 if (lnum >= curbuf->b_ml.ml_line_count) | |
1425 break; | |
1426 ++lnum; | |
1427 # ifdef FEAT_DIFF | |
1428 curwin->w_topfill = diff_check_fill(curwin, lnum); | |
1429 # endif | |
1430 } | |
1431 } | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1432 // approximate w_botline |
7 | 1433 curwin->w_botline += lnum - curwin->w_topline; |
1434 curwin->w_topline = lnum; | |
1435 } | |
1436 else | |
1437 #endif | |
1438 { | |
1439 curwin->w_topline += line_count; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1440 curwin->w_botline += line_count; // approximate w_botline |
7 | 1441 } |
1442 | |
1443 if (curwin->w_topline > curbuf->b_ml.ml_line_count) | |
1444 curwin->w_topline = curbuf->b_ml.ml_line_count; | |
1445 if (curwin->w_botline > curbuf->b_ml.ml_line_count + 1) | |
1446 curwin->w_botline = curbuf->b_ml.ml_line_count + 1; | |
1447 | |
1448 #ifdef FEAT_DIFF | |
1449 check_topfill(curwin, FALSE); | |
1450 #endif | |
1451 | |
1452 #ifdef FEAT_FOLDING | |
1453 if (hasAnyFolding(curwin)) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1454 // Make sure w_topline is at the first of a sequence of folded lines. |
7 | 1455 (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL); |
1456 #endif | |
1457 | |
1458 curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE); | |
1459 if (curwin->w_cursor.lnum < curwin->w_topline) | |
1460 { | |
1461 curwin->w_cursor.lnum = curwin->w_topline; | |
1462 curwin->w_valid &= | |
1463 ~(VALID_WROW|VALID_WCOL|VALID_CHEIGHT|VALID_CROW|VALID_VIRTCOL); | |
1464 coladvance(curwin->w_curswant); | |
1465 } | |
1466 } | |
1467 | |
1468 #ifdef FEAT_DIFF | |
1469 /* | |
1470 * Don't end up with too many filler lines in the window. | |
1471 */ | |
1472 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1473 check_topfill( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1474 win_T *wp, |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1475 int down) // when TRUE scroll down when not enough space |
7 | 1476 { |
1477 int n; | |
1478 | |
1479 if (wp->w_topfill > 0) | |
1480 { | |
1481 n = plines_win_nofill(wp, wp->w_topline, TRUE); | |
1482 if (wp->w_topfill + n > wp->w_height) | |
1483 { | |
1484 if (down && wp->w_topline > 1) | |
1485 { | |
1486 --wp->w_topline; | |
1487 wp->w_topfill = 0; | |
1488 } | |
1489 else | |
1490 { | |
1491 wp->w_topfill = wp->w_height - n; | |
1492 if (wp->w_topfill < 0) | |
1493 wp->w_topfill = 0; | |
1494 } | |
1495 } | |
1496 } | |
1497 } | |
1498 | |
1499 /* | |
1500 * Use as many filler lines as possible for w_topline. Make sure w_topline | |
1501 * is still visible. | |
1502 */ | |
1503 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1504 max_topfill(void) |
7 | 1505 { |
1506 int n; | |
1507 | |
1508 n = plines_nofill(curwin->w_topline); | |
1509 if (n >= curwin->w_height) | |
1510 curwin->w_topfill = 0; | |
1511 else | |
1512 { | |
1513 curwin->w_topfill = diff_check_fill(curwin, curwin->w_topline); | |
1514 if (curwin->w_topfill + n > curwin->w_height) | |
1515 curwin->w_topfill = curwin->w_height - n; | |
1516 } | |
1517 } | |
1518 #endif | |
1519 | |
1520 /* | |
1521 * Scroll the screen one line down, but don't do it if it would move the | |
1522 * cursor off the screen. | |
1523 */ | |
1524 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1525 scrolldown_clamp(void) |
7 | 1526 { |
1527 int end_row; | |
1528 #ifdef FEAT_DIFF | |
1529 int can_fill = (curwin->w_topfill | |
1530 < diff_check_fill(curwin, curwin->w_topline)); | |
1531 #endif | |
1532 | |
1533 if (curwin->w_topline <= 1 | |
1534 #ifdef FEAT_DIFF | |
1535 && !can_fill | |
1536 #endif | |
1537 ) | |
1538 return; | |
1539 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1540 validate_cursor(); // w_wrow needs to be valid |
7 | 1541 |
1542 /* | |
1543 * Compute the row number of the last row of the cursor line | |
1544 * and make sure it doesn't go off the screen. Make sure the cursor | |
1545 * doesn't go past 'scrolloff' lines from the screen end. | |
1546 */ | |
1547 end_row = curwin->w_wrow; | |
1548 #ifdef FEAT_DIFF | |
1549 if (can_fill) | |
1550 ++end_row; | |
1551 else | |
1552 end_row += plines_nofill(curwin->w_topline - 1); | |
1553 #else | |
1554 end_row += plines(curwin->w_topline - 1); | |
1555 #endif | |
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
1556 if (curwin->w_p_wrap && curwin->w_width != 0) |
7 | 1557 { |
1558 validate_cheight(); | |
1559 validate_virtcol(); | |
1560 end_row += curwin->w_cline_height - 1 - | |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1561 curwin->w_virtcol / curwin->w_width; |
7 | 1562 } |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1563 if (end_row < curwin->w_height - get_scrolloff_value()) |
7 | 1564 { |
1565 #ifdef FEAT_DIFF | |
1566 if (can_fill) | |
1567 { | |
1568 ++curwin->w_topfill; | |
1569 check_topfill(curwin, TRUE); | |
1570 } | |
1571 else | |
1572 { | |
1573 --curwin->w_topline; | |
1574 curwin->w_topfill = 0; | |
1575 } | |
1576 #else | |
1577 --curwin->w_topline; | |
1578 #endif | |
1579 #ifdef FEAT_FOLDING | |
7009 | 1580 (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL); |
7 | 1581 #endif |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1582 --curwin->w_botline; // approximate w_botline |
7 | 1583 curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE); |
1584 } | |
1585 } | |
1586 | |
1587 /* | |
1588 * Scroll the screen one line up, but don't do it if it would move the cursor | |
1589 * off the screen. | |
1590 */ | |
1591 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1592 scrollup_clamp(void) |
7 | 1593 { |
1594 int start_row; | |
1595 | |
1596 if (curwin->w_topline == curbuf->b_ml.ml_line_count | |
1597 #ifdef FEAT_DIFF | |
1598 && curwin->w_topfill == 0 | |
1599 #endif | |
1600 ) | |
1601 return; | |
1602 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1603 validate_cursor(); // w_wrow needs to be valid |
7 | 1604 |
1605 /* | |
1606 * Compute the row number of the first row of the cursor line | |
1607 * and make sure it doesn't go off the screen. Make sure the cursor | |
1608 * doesn't go before 'scrolloff' lines from the screen start. | |
1609 */ | |
1610 #ifdef FEAT_DIFF | |
1611 start_row = curwin->w_wrow - plines_nofill(curwin->w_topline) | |
1612 - curwin->w_topfill; | |
1613 #else | |
1614 start_row = curwin->w_wrow - plines(curwin->w_topline); | |
1615 #endif | |
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
1616 if (curwin->w_p_wrap && curwin->w_width != 0) |
7 | 1617 { |
1618 validate_virtcol(); | |
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1619 start_row -= curwin->w_virtcol / curwin->w_width; |
7 | 1620 } |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1621 if (start_row >= get_scrolloff_value()) |
7 | 1622 { |
1623 #ifdef FEAT_DIFF | |
1624 if (curwin->w_topfill > 0) | |
1625 --curwin->w_topfill; | |
1626 else | |
1627 #endif | |
36 | 1628 { |
1629 #ifdef FEAT_FOLDING | |
1630 (void)hasFolding(curwin->w_topline, NULL, &curwin->w_topline); | |
1631 #endif | |
7 | 1632 ++curwin->w_topline; |
36 | 1633 } |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1634 ++curwin->w_botline; // approximate w_botline |
7 | 1635 curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE); |
1636 } | |
1637 } | |
1638 | |
1639 /* | |
1640 * Add one line above "lp->lnum". This can be a filler line, a closed fold or | |
1641 * a (wrapped) text line. Uses and sets "lp->fill". | |
1642 * Returns the height of the added line in "lp->height". | |
2082
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
1643 * Lines above the first one are incredibly high: MAXCOL. |
7 | 1644 */ |
1645 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1646 topline_back(lineoff_T *lp) |
7 | 1647 { |
1648 #ifdef FEAT_DIFF | |
1649 if (lp->fill < diff_check_fill(curwin, lp->lnum)) | |
1650 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1651 // Add a filler line. |
7 | 1652 ++lp->fill; |
1653 lp->height = 1; | |
1654 } | |
1655 else | |
1656 #endif | |
1657 { | |
1658 --lp->lnum; | |
1659 #ifdef FEAT_DIFF | |
1660 lp->fill = 0; | |
1661 #endif | |
1662 if (lp->lnum < 1) | |
1663 lp->height = MAXCOL; | |
1664 else | |
1665 #ifdef FEAT_FOLDING | |
1666 if (hasFolding(lp->lnum, &lp->lnum, NULL)) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1667 // Add a closed fold |
7 | 1668 lp->height = 1; |
1669 else | |
1670 #endif | |
7103
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
1671 lp->height = PLINES_NOFILL(lp->lnum); |
7 | 1672 } |
1673 } | |
1674 | |
1675 /* | |
1676 * Add one line below "lp->lnum". This can be a filler line, a closed fold or | |
1677 * a (wrapped) text line. Uses and sets "lp->fill". | |
1678 * Returns the height of the added line in "lp->height". | |
1679 * Lines below the last one are incredibly high. | |
1680 */ | |
1681 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1682 botline_forw(lineoff_T *lp) |
7 | 1683 { |
1684 #ifdef FEAT_DIFF | |
1685 if (lp->fill < diff_check_fill(curwin, lp->lnum + 1)) | |
1686 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1687 // Add a filler line. |
7 | 1688 ++lp->fill; |
1689 lp->height = 1; | |
1690 } | |
1691 else | |
1692 #endif | |
1693 { | |
1694 ++lp->lnum; | |
1695 #ifdef FEAT_DIFF | |
1696 lp->fill = 0; | |
1697 #endif | |
1698 if (lp->lnum > curbuf->b_ml.ml_line_count) | |
1699 lp->height = MAXCOL; | |
1700 else | |
1701 #ifdef FEAT_FOLDING | |
1702 if (hasFolding(lp->lnum, NULL, &lp->lnum)) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1703 // Add a closed fold |
7 | 1704 lp->height = 1; |
1705 else | |
1706 #endif | |
7103
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
1707 lp->height = PLINES_NOFILL(lp->lnum); |
7 | 1708 } |
1709 } | |
1710 | |
1711 #ifdef FEAT_DIFF | |
1712 /* | |
1713 * Switch from including filler lines below lp->lnum to including filler | |
1714 * lines above loff.lnum + 1. This keeps pointing to the same line. | |
1715 * When there are no filler lines nothing changes. | |
1716 */ | |
1717 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1718 botline_topline(lineoff_T *lp) |
7 | 1719 { |
1720 if (lp->fill > 0) | |
1721 { | |
1722 ++lp->lnum; | |
1723 lp->fill = diff_check_fill(curwin, lp->lnum) - lp->fill + 1; | |
1724 } | |
1725 } | |
1726 | |
1727 /* | |
1728 * Switch from including filler lines above lp->lnum to including filler | |
1729 * lines below loff.lnum - 1. This keeps pointing to the same line. | |
1730 * When there are no filler lines nothing changes. | |
1731 */ | |
1732 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1733 topline_botline(lineoff_T *lp) |
7 | 1734 { |
1735 if (lp->fill > 0) | |
1736 { | |
1737 lp->fill = diff_check_fill(curwin, lp->lnum) - lp->fill + 1; | |
1738 --lp->lnum; | |
1739 } | |
1740 } | |
1741 #endif | |
1742 | |
1743 /* | |
1744 * Recompute topline to put the cursor at the top of the window. | |
1745 * Scroll at least "min_scroll" lines. | |
1746 * If "always" is TRUE, always set topline (for "zt"). | |
1747 */ | |
1748 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1749 scroll_cursor_top(int min_scroll, int always) |
7 | 1750 { |
1751 int scrolled = 0; | |
1752 int extra = 0; | |
1753 int used; | |
1754 int i; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1755 linenr_T top; // just above displayed lines |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1756 linenr_T bot; // just below displayed lines |
7 | 1757 linenr_T old_topline = curwin->w_topline; |
1758 #ifdef FEAT_DIFF | |
1759 linenr_T old_topfill = curwin->w_topfill; | |
1760 #endif | |
1761 linenr_T new_topline; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1762 int off = get_scrolloff_value(); |
7 | 1763 |
1764 if (mouse_dragging > 0) | |
1765 off = mouse_dragging - 1; | |
1766 | |
1767 /* | |
1768 * Decrease topline until: | |
1769 * - it has become 1 | |
1770 * - (part of) the cursor line is moved off the screen or | |
1771 * - moved at least 'scrolljump' lines and | |
1772 * - at least 'scrolloff' lines above and below the cursor | |
1773 */ | |
1774 validate_cheight(); | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1775 used = curwin->w_cline_height; // includes filler lines above |
7 | 1776 if (curwin->w_cursor.lnum < curwin->w_topline) |
1777 scrolled = used; | |
1778 | |
1779 #ifdef FEAT_FOLDING | |
1780 if (hasFolding(curwin->w_cursor.lnum, &top, &bot)) | |
1781 { | |
1782 --top; | |
1783 ++bot; | |
1784 } | |
1785 else | |
1786 #endif | |
1787 { | |
1788 top = curwin->w_cursor.lnum - 1; | |
1789 bot = curwin->w_cursor.lnum + 1; | |
1790 } | |
1791 new_topline = top + 1; | |
1792 | |
1793 #ifdef FEAT_DIFF | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1794 // "used" already contains the number of filler lines above, don't add it |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1795 // again. |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1796 // Hide filler lines above cursor line by adding them to "extra". |
7088
8a58dde655a8
commit https://github.com/vim/vim/commit/a09a2c5857ab854f0870573b5160da1964c905a2
Christian Brabandt <cb@256bit.org>
parents:
7082
diff
changeset
|
1797 extra += diff_check_fill(curwin, curwin->w_cursor.lnum); |
7 | 1798 #endif |
1799 | |
1800 /* | |
1801 * Check if the lines from "top" to "bot" fit in the window. If they do, | |
1802 * set new_topline and advance "top" and "bot" to include more lines. | |
1803 */ | |
1804 while (top > 0) | |
1805 { | |
1806 #ifdef FEAT_FOLDING | |
1807 if (hasFolding(top, &top, NULL)) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1808 // count one logical line for a sequence of folded lines |
7 | 1809 i = 1; |
1810 else | |
1811 #endif | |
7103
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
1812 i = PLINES_NOFILL(top); |
7 | 1813 used += i; |
1814 if (extra + i <= off && bot < curbuf->b_ml.ml_line_count) | |
1815 { | |
1816 #ifdef FEAT_FOLDING | |
1817 if (hasFolding(bot, NULL, &bot)) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1818 // count one logical line for a sequence of folded lines |
7 | 1819 ++used; |
1820 else | |
1821 #endif | |
1822 used += plines(bot); | |
1823 } | |
1824 if (used > curwin->w_height) | |
1825 break; | |
1826 if (top < curwin->w_topline) | |
1827 scrolled += i; | |
1828 | |
1829 /* | |
1830 * If scrolling is needed, scroll at least 'sj' lines. | |
1831 */ | |
1832 if ((new_topline >= curwin->w_topline || scrolled > min_scroll) | |
1833 && extra >= off) | |
1834 break; | |
1835 | |
1836 extra += i; | |
1837 new_topline = top; | |
1838 --top; | |
1839 ++bot; | |
1840 } | |
1841 | |
1842 /* | |
1843 * If we don't have enough space, put cursor in the middle. | |
1844 * This makes sure we get the same position when using "k" and "j" | |
1845 * in a small window. | |
1846 */ | |
1847 if (used > curwin->w_height) | |
1848 scroll_cursor_halfway(FALSE); | |
1849 else | |
1850 { | |
1851 /* | |
1852 * If "always" is FALSE, only adjust topline to a lower value, higher | |
1853 * value may happen with wrapping lines | |
1854 */ | |
1855 if (new_topline < curwin->w_topline || always) | |
1856 curwin->w_topline = new_topline; | |
1857 if (curwin->w_topline > curwin->w_cursor.lnum) | |
1858 curwin->w_topline = curwin->w_cursor.lnum; | |
1859 #ifdef FEAT_DIFF | |
1860 curwin->w_topfill = diff_check_fill(curwin, curwin->w_topline); | |
1861 if (curwin->w_topfill > 0 && extra > off) | |
1862 { | |
1863 curwin->w_topfill -= extra - off; | |
1864 if (curwin->w_topfill < 0) | |
1865 curwin->w_topfill = 0; | |
1866 } | |
1867 check_topfill(curwin, FALSE); | |
1868 #endif | |
1869 if (curwin->w_topline != old_topline | |
1870 #ifdef FEAT_DIFF | |
1871 || curwin->w_topfill != old_topfill | |
1872 #endif | |
1873 ) | |
1874 curwin->w_valid &= | |
1875 ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP); | |
1876 curwin->w_valid |= VALID_TOPLINE; | |
1877 } | |
1878 } | |
1879 | |
1880 /* | |
1881 * Set w_empty_rows and w_filler_rows for window "wp", having used up "used" | |
1882 * screen lines for text lines. | |
1883 */ | |
1884 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1885 set_empty_rows(win_T *wp, int used) |
7 | 1886 { |
1887 #ifdef FEAT_DIFF | |
1888 wp->w_filler_rows = 0; | |
1889 #endif | |
1890 if (used == 0) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1891 wp->w_empty_rows = 0; // single line that doesn't fit |
7 | 1892 else |
1893 { | |
1894 wp->w_empty_rows = wp->w_height - used; | |
1895 #ifdef FEAT_DIFF | |
1896 if (wp->w_botline <= wp->w_buffer->b_ml.ml_line_count) | |
1897 { | |
1898 wp->w_filler_rows = diff_check_fill(wp, wp->w_botline); | |
1899 if (wp->w_empty_rows > wp->w_filler_rows) | |
1900 wp->w_empty_rows -= wp->w_filler_rows; | |
1901 else | |
1902 { | |
1903 wp->w_filler_rows = wp->w_empty_rows; | |
1904 wp->w_empty_rows = 0; | |
1905 } | |
1906 } | |
1907 #endif | |
1908 } | |
1909 } | |
1910 | |
1911 /* | |
1912 * Recompute topline to put the cursor at the bottom of the window. | |
1913 * Scroll at least "min_scroll" lines. | |
1914 * If "set_topbot" is TRUE, set topline and botline first (for "zb"). | |
1915 * This is messy stuff!!! | |
1916 */ | |
1917 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1918 scroll_cursor_bot(int min_scroll, int set_topbot) |
7 | 1919 { |
1920 int used; | |
1921 int scrolled = 0; | |
1922 int extra = 0; | |
1923 int i; | |
1924 linenr_T line_count; | |
1925 linenr_T old_topline = curwin->w_topline; | |
1926 lineoff_T loff; | |
1927 lineoff_T boff; | |
1928 #ifdef FEAT_DIFF | |
1929 int old_topfill = curwin->w_topfill; | |
1930 int fill_below_window; | |
1931 #endif | |
1932 linenr_T old_botline = curwin->w_botline; | |
1933 linenr_T old_valid = curwin->w_valid; | |
1934 int old_empty_rows = curwin->w_empty_rows; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1935 linenr_T cln; // Cursor Line Number |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1936 long so = get_scrolloff_value(); |
7 | 1937 |
1938 cln = curwin->w_cursor.lnum; | |
1939 if (set_topbot) | |
1940 { | |
1941 used = 0; | |
1942 curwin->w_botline = cln + 1; | |
1943 #ifdef FEAT_DIFF | |
1944 loff.fill = 0; | |
1945 #endif | |
1946 for (curwin->w_topline = curwin->w_botline; | |
1947 curwin->w_topline > 1; | |
1948 curwin->w_topline = loff.lnum) | |
1949 { | |
1950 loff.lnum = curwin->w_topline; | |
1951 topline_back(&loff); | |
2082
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
1952 if (loff.height == MAXCOL || used + loff.height > curwin->w_height) |
7 | 1953 break; |
1954 used += loff.height; | |
1955 #ifdef FEAT_DIFF | |
1956 curwin->w_topfill = loff.fill; | |
1957 #endif | |
1958 } | |
1959 set_empty_rows(curwin, used); | |
1960 curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; | |
1961 if (curwin->w_topline != old_topline | |
1962 #ifdef FEAT_DIFF | |
1963 || curwin->w_topfill != old_topfill | |
1964 #endif | |
1965 ) | |
1966 curwin->w_valid &= ~(VALID_WROW|VALID_CROW); | |
1967 } | |
1968 else | |
1969 validate_botline(); | |
1970 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1971 // The lines of the cursor line itself are always used. |
7 | 1972 #ifdef FEAT_DIFF |
1973 used = plines_nofill(cln); | |
1974 #else | |
1975 validate_cheight(); | |
1976 used = curwin->w_cline_height; | |
1977 #endif | |
1978 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1979 // If the cursor is below botline, we will at least scroll by the height |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1980 // of the cursor line. Correct for empty lines, which are really part of |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
1981 // botline. |
7 | 1982 if (cln >= curwin->w_botline) |
1983 { | |
1984 scrolled = used; | |
1985 if (cln == curwin->w_botline) | |
1986 scrolled -= curwin->w_empty_rows; | |
1987 } | |
1988 | |
1989 /* | |
1990 * Stop counting lines to scroll when | |
1991 * - hitting start of the file | |
1992 * - scrolled nothing or at least 'sj' lines | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
1993 * - at least 'scrolloff' lines below the cursor |
7 | 1994 * - lines between botline and cursor have been counted |
1995 */ | |
1996 #ifdef FEAT_FOLDING | |
1997 if (!hasFolding(curwin->w_cursor.lnum, &loff.lnum, &boff.lnum)) | |
1998 #endif | |
1999 { | |
2000 loff.lnum = cln; | |
2001 boff.lnum = cln; | |
2002 } | |
2003 #ifdef FEAT_DIFF | |
2004 loff.fill = 0; | |
2005 boff.fill = 0; | |
2006 fill_below_window = diff_check_fill(curwin, curwin->w_botline) | |
2007 - curwin->w_filler_rows; | |
2008 #endif | |
2009 | |
2010 while (loff.lnum > 1) | |
2011 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2012 // Stop when scrolled nothing or at least "min_scroll", found "extra" |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2013 // context for 'scrolloff' and counted all lines below the window. |
7 | 2014 if ((((scrolled <= 0 || scrolled >= min_scroll) |
18354
9f51d0cef8da
patch 8.1.2171: mouse support not always available
Bram Moolenaar <Bram@vim.org>
parents:
17863
diff
changeset
|
2015 && extra >= (mouse_dragging > 0 ? mouse_dragging - 1 : so)) |
7 | 2016 || boff.lnum + 1 > curbuf->b_ml.ml_line_count) |
2017 && loff.lnum <= curwin->w_botline | |
2018 #ifdef FEAT_DIFF | |
2019 && (loff.lnum < curwin->w_botline | |
2020 || loff.fill >= fill_below_window) | |
2021 #endif | |
2022 ) | |
2023 break; | |
2024 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2025 // Add one line above |
7 | 2026 topline_back(&loff); |
2082
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2027 if (loff.height == MAXCOL) |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2028 used = MAXCOL; |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2029 else |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2030 used += loff.height; |
7 | 2031 if (used > curwin->w_height) |
2032 break; | |
2033 if (loff.lnum >= curwin->w_botline | |
2034 #ifdef FEAT_DIFF | |
2035 && (loff.lnum > curwin->w_botline | |
2036 || loff.fill <= fill_below_window) | |
2037 #endif | |
2038 ) | |
2039 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2040 // Count screen lines that are below the window. |
7 | 2041 scrolled += loff.height; |
2042 if (loff.lnum == curwin->w_botline | |
2043 #ifdef FEAT_DIFF | |
15064
7b2dcca9e0c1
patch 8.1.0543: Coverity warns for leaking memory and using wrong struct
Bram Moolenaar <Bram@vim.org>
parents:
14873
diff
changeset
|
2044 && loff.fill == 0 |
7 | 2045 #endif |
2046 ) | |
2047 scrolled -= curwin->w_empty_rows; | |
2048 } | |
2049 | |
2050 if (boff.lnum < curbuf->b_ml.ml_line_count) | |
2051 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2052 // Add one line below |
7 | 2053 botline_forw(&boff); |
2054 used += boff.height; | |
2055 if (used > curwin->w_height) | |
2056 break; | |
18354
9f51d0cef8da
patch 8.1.2171: mouse support not always available
Bram Moolenaar <Bram@vim.org>
parents:
17863
diff
changeset
|
2057 if (extra < ( mouse_dragging > 0 ? mouse_dragging - 1 : so) |
9f51d0cef8da
patch 8.1.2171: mouse support not always available
Bram Moolenaar <Bram@vim.org>
parents:
17863
diff
changeset
|
2058 || scrolled < min_scroll) |
7 | 2059 { |
2060 extra += boff.height; | |
2061 if (boff.lnum >= curwin->w_botline | |
2062 #ifdef FEAT_DIFF | |
2063 || (boff.lnum + 1 == curwin->w_botline | |
2064 && boff.fill > curwin->w_filler_rows) | |
2065 #endif | |
2066 ) | |
2067 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2068 // Count screen lines that are below the window. |
7 | 2069 scrolled += boff.height; |
2070 if (boff.lnum == curwin->w_botline | |
2071 #ifdef FEAT_DIFF | |
2072 && boff.fill == 0 | |
2073 #endif | |
2074 ) | |
2075 scrolled -= curwin->w_empty_rows; | |
2076 } | |
2077 } | |
2078 } | |
2079 } | |
2080 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2081 // curwin->w_empty_rows is larger, no need to scroll |
7 | 2082 if (scrolled <= 0) |
2083 line_count = 0; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2084 // more than a screenfull, don't scroll but redraw |
7 | 2085 else if (used > curwin->w_height) |
2086 line_count = used; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2087 // scroll minimal number of lines |
7 | 2088 else |
2089 { | |
2090 line_count = 0; | |
2091 #ifdef FEAT_DIFF | |
2092 boff.fill = curwin->w_topfill; | |
2093 #endif | |
2094 boff.lnum = curwin->w_topline - 1; | |
2095 for (i = 0; i < scrolled && boff.lnum < curwin->w_botline; ) | |
2096 { | |
2097 botline_forw(&boff); | |
2098 i += boff.height; | |
2099 ++line_count; | |
2100 } | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2101 if (i < scrolled) // below curwin->w_botline, don't scroll |
7 | 2102 line_count = 9999; |
2103 } | |
2104 | |
2105 /* | |
2106 * Scroll up if the cursor is off the bottom of the screen a bit. | |
2107 * Otherwise put it at 1/2 of the screen. | |
2108 */ | |
2109 if (line_count >= curwin->w_height && line_count > min_scroll) | |
2110 scroll_cursor_halfway(FALSE); | |
2111 else | |
2112 scrollup(line_count, TRUE); | |
2113 | |
2114 /* | |
2115 * If topline didn't change we need to restore w_botline and w_empty_rows | |
2116 * (we changed them). | |
2117 * If topline did change, update_screen() will set botline. | |
2118 */ | |
2119 if (curwin->w_topline == old_topline && set_topbot) | |
2120 { | |
2121 curwin->w_botline = old_botline; | |
2122 curwin->w_empty_rows = old_empty_rows; | |
2123 curwin->w_valid = old_valid; | |
2124 } | |
2125 curwin->w_valid |= VALID_TOPLINE; | |
2126 } | |
2127 | |
2128 /* | |
2129 * Recompute topline to put the cursor halfway the window | |
2130 * If "atend" is TRUE, also put it halfway at the end of the file. | |
2131 */ | |
2132 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2133 scroll_cursor_halfway(int atend) |
7 | 2134 { |
2135 int above = 0; | |
2136 linenr_T topline; | |
2137 #ifdef FEAT_DIFF | |
2138 int topfill = 0; | |
2139 #endif | |
2140 int below = 0; | |
2141 int used; | |
2142 lineoff_T loff; | |
2143 lineoff_T boff; | |
5661 | 2144 #ifdef FEAT_DIFF |
5653 | 2145 linenr_T old_topline = curwin->w_topline; |
5661 | 2146 #endif |
7 | 2147 |
22403
3351d2cd3f1f
patch 8.2.1750: popup_setoptions() setting firstline fails if cursorline set
Bram Moolenaar <Bram@vim.org>
parents:
21321
diff
changeset
|
2148 #ifdef FEAT_PROP_POPUP |
3351d2cd3f1f
patch 8.2.1750: popup_setoptions() setting firstline fails if cursorline set
Bram Moolenaar <Bram@vim.org>
parents:
21321
diff
changeset
|
2149 // if the width changed this needs to be updated first |
3351d2cd3f1f
patch 8.2.1750: popup_setoptions() setting firstline fails if cursorline set
Bram Moolenaar <Bram@vim.org>
parents:
21321
diff
changeset
|
2150 may_update_popup_position(); |
3351d2cd3f1f
patch 8.2.1750: popup_setoptions() setting firstline fails if cursorline set
Bram Moolenaar <Bram@vim.org>
parents:
21321
diff
changeset
|
2151 #endif |
7 | 2152 loff.lnum = boff.lnum = curwin->w_cursor.lnum; |
2153 #ifdef FEAT_FOLDING | |
2154 (void)hasFolding(loff.lnum, &loff.lnum, &boff.lnum); | |
2155 #endif | |
2156 #ifdef FEAT_DIFF | |
2157 used = plines_nofill(loff.lnum); | |
2158 loff.fill = 0; | |
2159 boff.fill = 0; | |
2160 #else | |
2161 used = plines(loff.lnum); | |
2162 #endif | |
2163 topline = loff.lnum; | |
2164 while (topline > 1) | |
2165 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2166 if (below <= above) // add a line below the cursor first |
7 | 2167 { |
2168 if (boff.lnum < curbuf->b_ml.ml_line_count) | |
2169 { | |
2170 botline_forw(&boff); | |
2171 used += boff.height; | |
2172 if (used > curwin->w_height) | |
2173 break; | |
2174 below += boff.height; | |
2175 } | |
2176 else | |
2177 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2178 ++below; // count a "~" line |
7 | 2179 if (atend) |
2180 ++used; | |
2181 } | |
2182 } | |
2183 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2184 if (below > above) // add a line above the cursor |
7 | 2185 { |
2186 topline_back(&loff); | |
2082
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2187 if (loff.height == MAXCOL) |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2188 used = MAXCOL; |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2189 else |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2190 used += loff.height; |
7 | 2191 if (used > curwin->w_height) |
2192 break; | |
2193 above += loff.height; | |
2194 topline = loff.lnum; | |
2195 #ifdef FEAT_DIFF | |
2196 topfill = loff.fill; | |
2197 #endif | |
2198 } | |
2199 } | |
2200 #ifdef FEAT_FOLDING | |
2201 if (!hasFolding(topline, &curwin->w_topline, NULL)) | |
2202 #endif | |
2203 curwin->w_topline = topline; | |
2204 #ifdef FEAT_DIFF | |
2205 curwin->w_topfill = topfill; | |
5653 | 2206 if (old_topline > curwin->w_topline + curwin->w_height) |
2207 curwin->w_botfill = FALSE; | |
7 | 2208 check_topfill(curwin, FALSE); |
2209 #endif | |
2210 curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP); | |
2211 curwin->w_valid |= VALID_TOPLINE; | |
2212 } | |
2213 | |
2214 /* | |
2215 * Correct the cursor position so that it is in a part of the screen at least | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
2216 * 'scrolloff' lines from the top and bottom, if possible. |
7 | 2217 * If not possible, put it at the same position as scroll_cursor_halfway(). |
2218 * When called topline must be valid! | |
2219 */ | |
2220 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2221 cursor_correct(void) |
7 | 2222 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2223 int above = 0; // screen lines above topline |
7 | 2224 linenr_T topline; |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2225 int below = 0; // screen lines below botline |
7 | 2226 linenr_T botline; |
2227 int above_wanted, below_wanted; | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2228 linenr_T cln; // Cursor Line Number |
7 | 2229 int max_off; |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
2230 long so = get_scrolloff_value(); |
7 | 2231 |
2232 /* | |
2233 * How many lines we would like to have above/below the cursor depends on | |
2234 * whether the first/last line of the file is on screen. | |
2235 */ | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
2236 above_wanted = so; |
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
2237 below_wanted = so; |
1121 | 2238 if (mouse_dragging > 0) |
7 | 2239 { |
2240 above_wanted = mouse_dragging - 1; | |
2241 below_wanted = mouse_dragging - 1; | |
2242 } | |
2243 if (curwin->w_topline == 1) | |
2244 { | |
2245 above_wanted = 0; | |
2246 max_off = curwin->w_height / 2; | |
2247 if (below_wanted > max_off) | |
2248 below_wanted = max_off; | |
2249 } | |
2250 validate_botline(); | |
2251 if (curwin->w_botline == curbuf->b_ml.ml_line_count + 1 | |
18354
9f51d0cef8da
patch 8.1.2171: mouse support not always available
Bram Moolenaar <Bram@vim.org>
parents:
17863
diff
changeset
|
2252 && mouse_dragging == 0) |
7 | 2253 { |
2254 below_wanted = 0; | |
2255 max_off = (curwin->w_height - 1) / 2; | |
2256 if (above_wanted > max_off) | |
2257 above_wanted = max_off; | |
2258 } | |
2259 | |
2260 /* | |
2261 * If there are sufficient file-lines above and below the cursor, we can | |
2262 * return now. | |
2263 */ | |
2264 cln = curwin->w_cursor.lnum; | |
2265 if (cln >= curwin->w_topline + above_wanted | |
2266 && cln < curwin->w_botline - below_wanted | |
2267 #ifdef FEAT_FOLDING | |
2268 && !hasAnyFolding(curwin) | |
2269 #endif | |
2270 ) | |
2271 return; | |
2272 | |
2273 /* | |
2274 * Narrow down the area where the cursor can be put by taking lines from | |
2275 * the top and the bottom until: | |
2276 * - the desired context lines are found | |
2277 * - the lines from the top is past the lines from the bottom | |
2278 */ | |
2279 topline = curwin->w_topline; | |
2280 botline = curwin->w_botline - 1; | |
2281 #ifdef FEAT_DIFF | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2282 // count filler lines as context |
7 | 2283 above = curwin->w_topfill; |
2284 below = curwin->w_filler_rows; | |
2285 #endif | |
2286 while ((above < above_wanted || below < below_wanted) && topline < botline) | |
2287 { | |
2288 if (below < below_wanted && (below <= above || above >= above_wanted)) | |
2289 { | |
2290 #ifdef FEAT_FOLDING | |
2291 if (hasFolding(botline, &botline, NULL)) | |
2292 ++below; | |
2293 else | |
2294 #endif | |
2295 below += plines(botline); | |
2296 --botline; | |
2297 } | |
2298 if (above < above_wanted && (above < below || below >= below_wanted)) | |
2299 { | |
2300 #ifdef FEAT_FOLDING | |
2301 if (hasFolding(topline, NULL, &topline)) | |
2302 ++above; | |
2303 else | |
2304 #endif | |
7103
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
2305 above += PLINES_NOFILL(topline); |
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
2306 #ifdef FEAT_DIFF |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2307 // Count filler lines below this line as context. |
7 | 2308 if (topline < botline) |
2309 above += diff_check_fill(curwin, topline + 1); | |
2310 #endif | |
2311 ++topline; | |
2312 } | |
2313 } | |
2314 if (topline == botline || botline == 0) | |
2315 curwin->w_cursor.lnum = topline; | |
2316 else if (topline > botline) | |
2317 curwin->w_cursor.lnum = botline; | |
2318 else | |
2319 { | |
2320 if (cln < topline && curwin->w_topline > 1) | |
2321 { | |
2322 curwin->w_cursor.lnum = topline; | |
2323 curwin->w_valid &= | |
2324 ~(VALID_WROW|VALID_WCOL|VALID_CHEIGHT|VALID_CROW); | |
2325 } | |
2326 if (cln > botline && curwin->w_botline <= curbuf->b_ml.ml_line_count) | |
2327 { | |
2328 curwin->w_cursor.lnum = botline; | |
2329 curwin->w_valid &= | |
2330 ~(VALID_WROW|VALID_WCOL|VALID_CHEIGHT|VALID_CROW); | |
2331 } | |
2332 } | |
2333 curwin->w_valid |= VALID_TOPLINE; | |
2334 } | |
2335 | |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7103
diff
changeset
|
2336 static void get_scroll_overlap(lineoff_T *lp, int dir); |
7 | 2337 |
2338 /* | |
2339 * move screen 'count' pages up or down and update screen | |
2340 * | |
2341 * return FAIL for failure, OK otherwise | |
2342 */ | |
2343 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2344 onepage(int dir, long count) |
7 | 2345 { |
2346 long n; | |
2347 int retval = OK; | |
2348 lineoff_T loff; | |
2349 linenr_T old_topline = curwin->w_topline; | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
2350 long so = get_scrolloff_value(); |
7 | 2351 |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2352 if (curbuf->b_ml.ml_line_count == 1) // nothing to do |
7 | 2353 { |
2354 beep_flush(); | |
2355 return FAIL; | |
2356 } | |
2357 | |
2358 for ( ; count > 0; --count) | |
2359 { | |
2360 validate_botline(); | |
2361 /* | |
2362 * It's an error to move a page up when the first line is already on | |
2363 * the screen. It's an error to move a page down when the last line | |
2364 * is on the screen and the topline is 'scrolloff' lines from the | |
2365 * last line. | |
2366 */ | |
2367 if (dir == FORWARD | |
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15697
diff
changeset
|
2368 ? ((curwin->w_topline >= curbuf->b_ml.ml_line_count - so) |
7 | 2369 && curwin->w_botline > curbuf->b_ml.ml_line_count) |
2370 : (curwin->w_topline == 1 | |
2371 #ifdef FEAT_DIFF | |
2372 && curwin->w_topfill == | |
2373 diff_check_fill(curwin, curwin->w_topline) | |
2374 #endif | |
2375 )) | |
2376 { | |
2377 beep_flush(); | |
2378 retval = FAIL; | |
2379 break; | |
2380 } | |
2381 | |
2382 #ifdef FEAT_DIFF | |
2383 loff.fill = 0; | |
2384 #endif | |
2385 if (dir == FORWARD) | |
2386 { | |
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
2387 if (ONE_WINDOW && p_window > 0 && p_window < Rows - 1) |
7 | 2388 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2389 // Vi compatible scrolling |
164 | 2390 if (p_window <= 2) |
2391 ++curwin->w_topline; | |
2392 else | |
2393 curwin->w_topline += p_window - 2; | |
2394 if (curwin->w_topline > curbuf->b_ml.ml_line_count) | |
2395 curwin->w_topline = curbuf->b_ml.ml_line_count; | |
2396 curwin->w_cursor.lnum = curwin->w_topline; | |
2397 } | |
2398 else if (curwin->w_botline > curbuf->b_ml.ml_line_count) | |
2399 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2400 // at end of file |
7 | 2401 curwin->w_topline = curbuf->b_ml.ml_line_count; |
2402 #ifdef FEAT_DIFF | |
2403 curwin->w_topfill = 0; | |
2404 #endif | |
2405 curwin->w_valid &= ~(VALID_WROW|VALID_CROW); | |
2406 } | |
2407 else | |
2408 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2409 // For the overlap, start with the line just below the window |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2410 // and go upwards. |
7 | 2411 loff.lnum = curwin->w_botline; |
2412 #ifdef FEAT_DIFF | |
2413 loff.fill = diff_check_fill(curwin, loff.lnum) | |
2414 - curwin->w_filler_rows; | |
2415 #endif | |
2416 get_scroll_overlap(&loff, -1); | |
2417 curwin->w_topline = loff.lnum; | |
2418 #ifdef FEAT_DIFF | |
2419 curwin->w_topfill = loff.fill; | |
2420 check_topfill(curwin, FALSE); | |
2421 #endif | |
2422 curwin->w_cursor.lnum = curwin->w_topline; | |
2423 curwin->w_valid &= ~(VALID_WCOL|VALID_CHEIGHT|VALID_WROW| | |
2424 VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP); | |
2425 } | |
2426 } | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2427 else // dir == BACKWARDS |
7 | 2428 { |
2429 #ifdef FEAT_DIFF | |
2430 if (curwin->w_topline == 1) | |
2431 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2432 // Include max number of filler lines |
7 | 2433 max_topfill(); |
2434 continue; | |
2435 } | |
2436 #endif | |
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10295
diff
changeset
|
2437 if (ONE_WINDOW && p_window > 0 && p_window < Rows - 1) |
164 | 2438 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2439 // Vi compatible scrolling (sort of) |
164 | 2440 if (p_window <= 2) |
2441 --curwin->w_topline; | |
2442 else | |
2443 curwin->w_topline -= p_window - 2; | |
2444 if (curwin->w_topline < 1) | |
2445 curwin->w_topline = 1; | |
2446 curwin->w_cursor.lnum = curwin->w_topline + p_window - 1; | |
2447 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
2448 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
2449 continue; | |
2450 } | |
2451 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2452 // Find the line at the top of the window that is going to be the |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2453 // line at the bottom of the window. Make sure this results in |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2454 // the same line as before doing CTRL-F. |
7 | 2455 loff.lnum = curwin->w_topline - 1; |
2456 #ifdef FEAT_DIFF | |
2457 loff.fill = diff_check_fill(curwin, loff.lnum + 1) | |
2458 - curwin->w_topfill; | |
2459 #endif | |
2460 get_scroll_overlap(&loff, 1); | |
2461 | |
2462 if (loff.lnum >= curbuf->b_ml.ml_line_count) | |
2463 { | |
2464 loff.lnum = curbuf->b_ml.ml_line_count; | |
2465 #ifdef FEAT_DIFF | |
2466 loff.fill = 0; | |
2467 } | |
2468 else | |
2469 { | |
2470 botline_topline(&loff); | |
2471 #endif | |
2472 } | |
2473 curwin->w_cursor.lnum = loff.lnum; | |
2474 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2475 // Find the line just above the new topline to get the right line |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2476 // at the bottom of the window. |
7 | 2477 n = 0; |
2478 while (n <= curwin->w_height && loff.lnum >= 1) | |
2479 { | |
2480 topline_back(&loff); | |
2082
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2481 if (loff.height == MAXCOL) |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2482 n = MAXCOL; |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2483 else |
8ca3c9ad0bee
updated for version 7.2.366
Bram Moolenaar <bram@zimbu.org>
parents:
2070
diff
changeset
|
2484 n += loff.height; |
7 | 2485 } |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2486 if (loff.lnum < 1) // at begin of file |
7 | 2487 { |
2488 curwin->w_topline = 1; | |
2489 #ifdef FEAT_DIFF | |
2490 max_topfill(); | |
2491 #endif | |
2492 curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE); | |
2493 } | |
2494 else | |
2495 { | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2496 // Go two lines forward again. |
7 | 2497 #ifdef FEAT_DIFF |
2498 topline_botline(&loff); | |
2499 #endif | |
2500 botline_forw(&loff); | |
2501 botline_forw(&loff); | |
2502 #ifdef FEAT_DIFF | |
2503 botline_topline(&loff); | |
2504 #endif | |
2505 #ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2506 // We're at the wrong end of a fold now. |
7 | 2507 (void)hasFolding(loff.lnum, &loff.lnum, NULL); |
2508 #endif | |
2509 | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2510 // Always scroll at least one line. Avoid getting stuck on |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2511 // very long lines. |
7 | 2512 if (loff.lnum >= curwin->w_topline |
2513 #ifdef FEAT_DIFF | |
2514 && (loff.lnum > curwin->w_topline | |
2515 || loff.fill >= curwin->w_topfill) | |
2516 #endif | |
2517 ) | |
2518 { | |
2519 #ifdef FEAT_DIFF | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2520 // First try using the maximum number of filler lines. If |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2521 // that's not enough, backup one line. |
7 | 2522 loff.fill = curwin->w_topfill; |
2523 if (curwin->w_topfill < diff_check_fill(curwin, | |
2524 curwin->w_topline)) | |
2525 max_topfill(); | |
2526 if (curwin->w_topfill == loff.fill) | |
2527 #endif | |
2528 { | |
2529 --curwin->w_topline; | |
2530 #ifdef FEAT_DIFF | |
2531 curwin->w_topfill = 0; | |
2532 #endif | |
2533 } | |
2534 comp_botline(curwin); | |
2535 curwin->w_cursor.lnum = curwin->w_botline - 1; | |
5764 | 2536 curwin->w_valid &= |
2537 ~(VALID_WCOL|VALID_CHEIGHT|VALID_WROW|VALID_CROW); | |
7 | 2538 } |
2539 else | |
2540 { | |
2541 curwin->w_topline = loff.lnum; | |
2542 #ifdef FEAT_DIFF | |
2543 curwin->w_topfill = loff.fill; | |
2544 check_topfill(curwin, FALSE); | |
2545 #endif | |
2546 curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE); | |
2547 } | |
2548 } | |
2549 } | |
2550 } | |
2551 #ifdef FEAT_FOLDING | |
2552 foldAdjustCursor(); | |
2553 #endif | |
2554 cursor_correct(); | |
10102
b80ad55d62d8
commit https://github.com/vim/vim/commit/bc54f3f3fed4dc3556df8c46cee6739d211b0eb2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
2555 check_cursor_col(); |
161 | 2556 if (retval == OK) |
2557 beginline(BL_SOL | BL_FIX); | |
7 | 2558 curwin->w_valid &= ~(VALID_WCOL|VALID_WROW|VALID_VIRTCOL); |
2559 | |
14317
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2560 if (retval == OK && dir == FORWARD) |
7 | 2561 { |
14317
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2562 // Avoid the screen jumping up and down when 'scrolloff' is non-zero. |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2563 // But make sure we scroll at least one line (happens with mix of long |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2564 // wrapping lines and non-wrapping line). |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2565 if (check_top_offset()) |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2566 { |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2567 scroll_cursor_top(1, FALSE); |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2568 if (curwin->w_topline <= old_topline |
7 | 2569 && old_topline < curbuf->b_ml.ml_line_count) |
14317
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2570 { |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2571 curwin->w_topline = old_topline + 1; |
7 | 2572 #ifdef FEAT_FOLDING |
14317
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2573 (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL); |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2574 #endif |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2575 } |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2576 } |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2577 #ifdef FEAT_FOLDING |
1bc96dbb5498
patch 8.1.0174: after paging up and down fold line is wrong
Christian Brabandt <cb@256bit.org>
parents:
13384
diff
changeset
|
2578 else if (curwin->w_botline > curbuf->b_ml.ml_line_count) |
7 | 2579 (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL); |
2580 #endif | |
2581 } | |
2582 | |
2583 redraw_later(VALID); | |
2584 return retval; | |
2585 } | |
2586 | |
2587 /* | |
2588 * Decide how much overlap to use for page-up or page-down scrolling. | |
2589 * This is symmetric, so that doing both keeps the same lines displayed. | |
2590 * Three lines are examined: | |
2591 * | |
2592 * before CTRL-F after CTRL-F / before CTRL-B | |
2593 * etc. l1 | |
2594 * l1 last but one line ------------ | |
2595 * l2 last text line l2 top text line | |
2596 * ------------- l3 second text line | |
2597 * l3 etc. | |
2598 */ | |
2599 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2600 get_scroll_overlap(lineoff_T *lp, int dir) |
7 | 2601 { |
2602 int h1, h2, h3, h4; | |
2603 int min_height = curwin->w_height - 2; | |
2604 lineoff_T loff0, loff1, loff2; | |
2605 | |
2606 #ifdef FEAT_DIFF | |
2607 if (lp->fill > 0) | |
2608 lp->height = 1; | |
2609 else | |
2610 lp->height = plines_nofill(lp->lnum); | |
2611 #else | |
2612 lp->height = plines(lp->lnum); | |
2613 #endif | |
2614 h1 = lp->height; | |
2615 if (h1 > min_height) | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2616 return; // no overlap |
7 | 2617 |
2618 loff0 = *lp; | |
2619 if (dir > 0) | |
2620 botline_forw(lp); | |
2621 else | |
2622 topline_back(lp); | |
2623 h2 = lp->height; | |
3968 | 2624 if (h2 == MAXCOL || h2 + h1 > min_height) |
7 | 2625 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2626 *lp = loff0; // no overlap |
7 | 2627 return; |
2628 } | |
2629 | |
2630 loff1 = *lp; | |
2631 if (dir > 0) | |
2632 botline_forw(lp); | |
2633 else | |
2634 topline_back(lp); | |
2635 h3 = lp->height; | |
3968 | 2636 if (h3 == MAXCOL || h3 + h2 > min_height) |
7 | 2637 { |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2638 *lp = loff0; // no overlap |
7 | 2639 return; |
2640 } | |
2641 | |
2642 loff2 = *lp; | |
2643 if (dir > 0) | |
2644 botline_forw(lp); | |
2645 else | |
2646 topline_back(lp); | |
2647 h4 = lp->height; | |
3968 | 2648 if (h4 == MAXCOL || h4 + h3 + h2 > min_height || h3 + h2 + h1 > min_height) |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2649 *lp = loff1; // 1 line overlap |
7 | 2650 else |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2651 *lp = loff2; // 2 lines overlap |
7 | 2652 return; |
2653 } | |
2654 | |
2655 /* | |
2656 * Scroll 'scroll' lines up or down. | |
2657 */ | |
2658 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2659 halfpage(int flag, linenr_T Prenum) |
7 | 2660 { |
2661 long scrolled = 0; | |
2662 int i; | |
2663 int n; | |
2664 int room; | |
2665 | |
2666 if (Prenum) | |
2667 curwin->w_p_scr = (Prenum > curwin->w_height) ? | |
2668 curwin->w_height : Prenum; | |
2669 n = (curwin->w_p_scr <= curwin->w_height) ? | |
2670 curwin->w_p_scr : curwin->w_height; | |
2671 | |
11258
84f71a8a5f2c
patch 8.0.0515: ml_get errors in silent Ex mode
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2672 update_topline(); |
7 | 2673 validate_botline(); |
2674 room = curwin->w_empty_rows; | |
2675 #ifdef FEAT_DIFF | |
2676 room += curwin->w_filler_rows; | |
2677 #endif | |
2678 if (flag) | |
2679 { | |
2680 /* | |
2681 * scroll the text up | |
2682 */ | |
2683 while (n > 0 && curwin->w_botline <= curbuf->b_ml.ml_line_count) | |
2684 { | |
2685 #ifdef FEAT_DIFF | |
2686 if (curwin->w_topfill > 0) | |
2687 { | |
2688 i = 1; | |
21321
1421eca61db9
patch 8.2.1211: removed more than dead code
Bram Moolenaar <Bram@vim.org>
parents:
21134
diff
changeset
|
2689 --n; |
7 | 2690 --curwin->w_topfill; |
2691 } | |
2692 else | |
2693 #endif | |
2694 { | |
7103
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
2695 i = PLINES_NOFILL(curwin->w_topline); |
7 | 2696 n -= i; |
2697 if (n < 0 && scrolled > 0) | |
2698 break; | |
2699 #ifdef FEAT_FOLDING | |
2700 (void)hasFolding(curwin->w_topline, NULL, &curwin->w_topline); | |
2701 #endif | |
2702 ++curwin->w_topline; | |
2703 #ifdef FEAT_DIFF | |
2704 curwin->w_topfill = diff_check_fill(curwin, curwin->w_topline); | |
2705 #endif | |
2706 | |
2707 if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
2708 { | |
2709 ++curwin->w_cursor.lnum; | |
2710 curwin->w_valid &= | |
2711 ~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL); | |
2712 } | |
2713 } | |
2714 curwin->w_valid &= ~(VALID_CROW|VALID_WROW); | |
2715 scrolled += i; | |
2716 | |
2717 /* | |
2718 * Correct w_botline for changed w_topline. | |
2719 * Won't work when there are filler lines. | |
2720 */ | |
2721 #ifdef FEAT_DIFF | |
2722 if (curwin->w_p_diff) | |
2723 curwin->w_valid &= ~(VALID_BOTLINE|VALID_BOTLINE_AP); | |
2724 else | |
2725 #endif | |
2726 { | |
2727 room += i; | |
2728 do | |
2729 { | |
2730 i = plines(curwin->w_botline); | |
2731 if (i > room) | |
2732 break; | |
2733 #ifdef FEAT_FOLDING | |
2734 (void)hasFolding(curwin->w_botline, NULL, | |
2735 &curwin->w_botline); | |
2736 #endif | |
2737 ++curwin->w_botline; | |
2738 room -= i; | |
2739 } while (curwin->w_botline <= curbuf->b_ml.ml_line_count); | |
2740 } | |
2741 } | |
2742 | |
2743 /* | |
2744 * When hit bottom of the file: move cursor down. | |
2745 */ | |
2746 if (n > 0) | |
2747 { | |
2748 # ifdef FEAT_FOLDING | |
2749 if (hasAnyFolding(curwin)) | |
2750 { | |
2751 while (--n >= 0 | |
2752 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
2753 { | |
2754 (void)hasFolding(curwin->w_cursor.lnum, NULL, | |
2755 &curwin->w_cursor.lnum); | |
2756 ++curwin->w_cursor.lnum; | |
2757 } | |
2758 } | |
2759 else | |
2760 # endif | |
2761 curwin->w_cursor.lnum += n; | |
2762 check_cursor_lnum(); | |
2763 } | |
2764 } | |
2765 else | |
2766 { | |
2767 /* | |
2768 * scroll the text down | |
2769 */ | |
2770 while (n > 0 && curwin->w_topline > 1) | |
2771 { | |
2772 #ifdef FEAT_DIFF | |
2773 if (curwin->w_topfill < diff_check_fill(curwin, curwin->w_topline)) | |
2774 { | |
2775 i = 1; | |
16042
7952be788a49
patch 8.1.1026: unused condition
Bram Moolenaar <Bram@vim.org>
parents:
15713
diff
changeset
|
2776 --n; |
7 | 2777 ++curwin->w_topfill; |
2778 } | |
2779 else | |
2780 #endif | |
2781 { | |
7103
84d318257a45
commit https://github.com/vim/vim/commit/43335ea394fe247132b9701c55cccf51e6c36425
Christian Brabandt <cb@256bit.org>
parents:
7088
diff
changeset
|
2782 i = PLINES_NOFILL(curwin->w_topline - 1); |
7 | 2783 n -= i; |
2784 if (n < 0 && scrolled > 0) | |
2785 break; | |
2786 --curwin->w_topline; | |
2787 #ifdef FEAT_FOLDING | |
2788 (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL); | |
2789 #endif | |
2790 #ifdef FEAT_DIFF | |
2791 curwin->w_topfill = 0; | |
2792 #endif | |
2793 } | |
2794 curwin->w_valid &= ~(VALID_CROW|VALID_WROW| | |
2795 VALID_BOTLINE|VALID_BOTLINE_AP); | |
2796 scrolled += i; | |
2797 if (curwin->w_cursor.lnum > 1) | |
2798 { | |
2799 --curwin->w_cursor.lnum; | |
2800 curwin->w_valid &= ~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL); | |
2801 } | |
2802 } | |
16042
7952be788a49
patch 8.1.1026: unused condition
Bram Moolenaar <Bram@vim.org>
parents:
15713
diff
changeset
|
2803 |
7 | 2804 /* |
2805 * When hit top of the file: move cursor up. | |
2806 */ | |
2807 if (n > 0) | |
2808 { | |
2809 if (curwin->w_cursor.lnum <= (linenr_T)n) | |
2810 curwin->w_cursor.lnum = 1; | |
2811 else | |
2812 # ifdef FEAT_FOLDING | |
2813 if (hasAnyFolding(curwin)) | |
2814 { | |
2815 while (--n >= 0 && curwin->w_cursor.lnum > 1) | |
2816 { | |
2817 --curwin->w_cursor.lnum; | |
2818 (void)hasFolding(curwin->w_cursor.lnum, | |
2819 &curwin->w_cursor.lnum, NULL); | |
2820 } | |
2821 } | |
2822 else | |
2823 # endif | |
2824 curwin->w_cursor.lnum -= n; | |
2825 } | |
2826 } | |
2827 # ifdef FEAT_FOLDING | |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2828 // Move cursor to first line of closed fold. |
7 | 2829 foldAdjustCursor(); |
2830 # endif | |
2831 #ifdef FEAT_DIFF | |
2832 check_topfill(curwin, !flag); | |
2833 #endif | |
2834 cursor_correct(); | |
2835 beginline(BL_SOL | BL_FIX); | |
2836 redraw_later(VALID); | |
2837 } | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2838 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2839 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2840 do_check_cursorbind(void) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2841 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2842 linenr_T line = curwin->w_cursor.lnum; |
3415 | 2843 colnr_T col = curwin->w_cursor.col; |
2844 colnr_T coladd = curwin->w_cursor.coladd; | |
3433 | 2845 colnr_T curswant = curwin->w_curswant; |
2846 int set_curswant = curwin->w_set_curswant; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2847 win_T *old_curwin = curwin; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2848 buf_T *old_curbuf = curbuf; |
2693 | 2849 int restart_edit_save; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2850 int old_VIsual_select = VIsual_select; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2851 int old_VIsual_active = VIsual_active; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2852 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2853 /* |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2854 * loop through the cursorbound windows |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2855 */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2856 VIsual_select = VIsual_active = 0; |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
2857 FOR_ALL_WINDOWS(curwin) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2858 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2859 curbuf = curwin->w_buffer; |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2860 // skip original window and windows with 'noscrollbind' |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2861 if (curwin != old_curwin && curwin->w_p_crb) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2862 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2863 # ifdef FEAT_DIFF |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2864 if (curwin->w_p_diff) |
10295
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10102
diff
changeset
|
2865 curwin->w_cursor.lnum = |
d0b74b18e4b5
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents:
10102
diff
changeset
|
2866 diff_get_corresponding_line(old_curbuf, line); |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2867 else |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2868 # endif |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2869 curwin->w_cursor.lnum = line; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2870 curwin->w_cursor.col = col; |
3415 | 2871 curwin->w_cursor.coladd = coladd; |
3433 | 2872 curwin->w_curswant = curswant; |
2873 curwin->w_set_curswant = set_curswant; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2874 |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2875 // Make sure the cursor is in a valid position. Temporarily set |
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2876 // "restart_edit" to allow the cursor to be beyond the EOL. |
2693 | 2877 restart_edit_save = restart_edit; |
2878 restart_edit = TRUE; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2879 check_cursor(); |
10607
e39300d3d2cf
patch 8.0.0193: accidentally removed #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10597
diff
changeset
|
2880 # ifdef FEAT_SYN_HL |
10597
472bff31a20a
patch 8.0.0188: redrawing for 'cursorbind' is inefficient
Christian Brabandt <cb@256bit.org>
parents:
10585
diff
changeset
|
2881 if (curwin->w_p_cul || curwin->w_p_cuc) |
10583
f91c0376f2c6
patch 8.0.0181: with cursorbind set cursor column highlighting is off
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
2882 validate_cursor(); |
10607
e39300d3d2cf
patch 8.0.0193: accidentally removed #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10597
diff
changeset
|
2883 # endif |
2693 | 2884 restart_edit = restart_edit_save; |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2885 // Correct cursor for multi-byte character. |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2886 if (has_mbyte) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2887 mb_adjust_cursor(); |
10597
472bff31a20a
patch 8.0.0188: redrawing for 'cursorbind' is inefficient
Christian Brabandt <cb@256bit.org>
parents:
10585
diff
changeset
|
2888 redraw_later(VALID); |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2889 |
18931
80b40bd5ec1a
patch 8.2.0026: still some /* */ comments
Bram Moolenaar <Bram@vim.org>
parents:
18892
diff
changeset
|
2890 // Only scroll when 'scrollbind' hasn't done this. |
2688 | 2891 if (!curwin->w_p_scb) |
2892 update_topline(); | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2893 curwin->w_redr_status = TRUE; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2894 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2895 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2896 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2897 /* |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2898 * reset current-window |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2899 */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2900 VIsual_select = old_VIsual_select; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2901 VIsual_active = old_VIsual_active; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2902 curwin = old_curwin; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2903 curbuf = old_curbuf; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
2904 } |