vim: src/move.c annotate

annotate src/move.c @ 31117:a5bf86083558 v9.0.0893

patch 9.0.0893: 'smoothscroll' cursor calculations wrong when 'number' is set Commit: https://github.com/vim/vim/commit/01ee52bab6041450095c53f9469b1b266a7e3d4d Author: Yee Cheng Chin <ychin.git@gmail.com> Date: Thu Nov 17 12:41:42 2022 +0000 patch 9.0.0893: 'smoothscroll' cursor calculations wrong when 'number' is set Problem: 'smoothscroll' cursor calculations wrong when 'number' is set. Solution: Correct the code that computes the width. (closes https://github.com/vim/vim/issues/11492)

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 17 Nov 2022 13:45:04 +0100
parents	b7834109fefe
children	8de082110e2d

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

Mercurial > vim

annotate src/move.c @ 31117:a5bf86083558 v9.0.0893