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