mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 06:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0901: setting w_leftcol and handling side effects is confusing

Browse Source 
Problem:    Setting w_leftcol and handling side effects is confusing.
Solution:   Use a function to set w_leftcol() and handle side effects.

0c34d56264

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Luuk van Baal
2023-04-27 19:08:20 +02:00
parent 3621604029
commit 26a9f0e94e
3 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/cursor.c
View File

@@ -439,23 +439,27 @@ void adjust_cursor_col(void)
}
}
/// When curwin->w_leftcol has changed, adjust the cursor position.
/// Set "curwin->w_leftcol" to "leftcol".
/// Adjust the cursor position if needed.
///
/// @return true if the cursor was moved.
bool leftcol_changed(void)
bool set_leftcol(colnr_T leftcol)
{
// TODO(hinidu): I think it should be colnr_T or int, but p_siso is long.
// Perhaps we can change p_siso to int.
int64_t lastcol;
colnr_T s, e;
bool retval = false;
// Return quickly when there is no change.
if (curwin->w_leftcol == leftcol) {
return false;
}
curwin->w_leftcol = leftcol;
changed_cline_bef_curs();
lastcol = curwin->w_leftcol + curwin->w_width_inner - curwin_col_off() - 1;
// TODO(hinidu): I think it should be colnr_T or int, but p_siso is long.
// Perhaps we can change p_siso to int.
int64_t lastcol = curwin->w_leftcol + curwin->w_width_inner - curwin_col_off() - 1;
validate_virtcol();
bool retval = false;
// If the cursor is right or left of the screen, move it to last or first
// character.
// visible character.
long siso = get_sidescrolloff_value(curwin);
if (curwin->w_virtcol > (colnr_T)(lastcol - siso)) {
retval = true;
@@ -468,6 +472,7 @@ bool leftcol_changed(void)
// If the start of the character under the cursor is not on the screen,
// advance the cursor one more char. If this fails (last char of the
// line) adjust the scrolling.
colnr_T s, e;
getvvcol(curwin, &curwin->w_cursor, &s, NULL, &e);
if (e > (colnr_T)lastcol) {
retval = true;