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