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