mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0285: Still problems with cursor position for CTRL-D/U

Browse Source 
Problem:  Problems with cursor position when scrolling half a page.
Solution: Rework the cursor logic. (Luuk van Baal)

78c51500f1
This commit is contained in:
Luuk van Baal
2024-04-09 21:41:54 +02:00
parent 4946489e2e
commit 832857ae09
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/nvim/move.c
View File

@@ -2424,7 +2424,6 @@ static bool scroll_with_sms(Direction dir, int count)
if (labs(curwin->w_topline - prev_topline) > (dir == BACKWARD)) {
fixdir = dir * -1;
}
validate_cursor(curwin);
while (curwin->w_skipcol > 0
&& curwin->w_topline < curbuf->b_ml.ml_line_count) {
scroll_redraw(fixdir == FORWARD, 1);
@@ -2447,6 +2446,7 @@ int pagescroll(Direction dir, int count, bool half)
int nochange = true;
int buflen = curbuf->b_ml.ml_line_count;
colnr_T prev_col = curwin->w_cursor.col;
colnr_T prev_curswant = curwin->w_curswant;
linenr_T prev_lnum = curwin->w_cursor.lnum;
oparg_T oa = { 0 };
cmdarg_T ca = { 0 };
@@ -2471,32 +2471,24 @@ int pagescroll(Direction dir, int count, bool half)
}
}
// Scroll the window and determine number of lines to move the cursor.
// (Try to) scroll the window unless already at the end of the buffer.
if (count > 0) {
validate_cursor(curwin);
int prev_wrow = curwin->w_wrow;
nochange = scroll_with_sms(dir, count);
if (!nochange) {
validate_cursor(curwin);
curscount = abs(prev_wrow - curwin->w_wrow);
dir = prev_wrow > curwin->w_wrow ? FORWARD : BACKWARD;
}
curwin->w_cursor.lnum = prev_lnum;
curwin->w_cursor.col = prev_col;
curwin->w_curswant = prev_curswant;
}
int so = get_scrolloff_value(curwin);
// Move the cursor the same amount of screen lines except if
// 'scrolloff' is set and cursor was at start or end of buffer.
if (so == 0 || (prev_lnum != 1 && prev_lnum != buflen)) {
if (curwin->w_p_wrap) {
nv_screengo(&oa, dir, curscount);
} else if (dir == FORWARD) {
cursor_down_inner(curwin, curscount);
} else {
cursor_up_inner(curwin, curscount);
}
// Move the cursor the same amount of screen lines.
if (curwin->w_p_wrap) {
nv_screengo(&oa, dir, curscount);
} else if (dir == FORWARD) {
cursor_down_inner(curwin, curscount);
} else {
cursor_up_inner(curwin, curscount);
}
if (so > 0) {
if (get_scrolloff_value(curwin) > 0) {
cursor_correct(curwin);
}
// Move cursor to first line of closed fold.