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