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