annotate src/move.c @ 28809:d0241e74bfdb v8.2.4928

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