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