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