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