vim: src/move.c annotate

annotate src/move.c @ 31515:7f3f8543611e v9.0.1090

patch 9.0.1090: FHIR Shorthand files are not recognized Commit: https://github.com/vim/vim/commit/c9207d5d79310bd4628ce46d8db588fac17878a0 Author: mgramigna <mgramigna@mitre.org> Date: Fri Dec 23 13:18:44 2022 +0000 patch 9.0.1090: FHIR Shorthand files are not recognized Problem: FHIR Shorthand files are not recognized. Solution: Add a pattern to detect FSH files. (Matthew Gramigna, closes #11738)

author	Bram Moolenaar <Bram@vim.org>
date	Fri, 23 Dec 2022 14:30:05 +0100
parents	0c0b78aa7ae3
children	3c21865e8068

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

Mercurial > vim

annotate src/move.c @ 31515:7f3f8543611e v9.0.1090