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