vim: src/move.c annotate

annotate src/move.c @ 32460:45c426cebfcd v9.0.1561

patch 9.0.1561: display wrong when moving cursor to above the top line Commit: https://github.com/vim/vim/commit/798fa76dbf737f855e47b10bf326453866b429ab Author: Luuk van Baal <luukvbaal@gmail.com> Date: Mon May 15 18:17:43 2023 +0100 patch 9.0.1561: display wrong when moving cursor to above the top line Problem: Display wrong when moving cursor to above the top line and 'smoothscroll' is set. Solution: Call adjust_skipcol() in more places and make it work better. (Luuk van Baal, closes #12395)

author	Bram Moolenaar <Bram@vim.org>
date	Mon, 15 May 2023 19:30:05 +0200
parents	9d072cccc8fc
children	83074077c0b1

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

Mercurial > vim

annotate src/move.c @ 32460:45c426cebfcd v9.0.1561