annotate src/move.c @ 14862:27b9a84395b5 v8.1.0443

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