annotate src/move.c @ 24919:6349b9bc8db5

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