alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-03 11:01:30 +10:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0911: with 'smoothscroll' set mouse click position may be wrong

Browse Source 
Problem:    With 'smoothscroll' set mouse click position may be wrong.
Solution:   Adjust computations for w_skipcol. (Yee Cheng Chin, closes vim/vim#11514)

e6392b1021

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
This commit is contained in:
Luuk van Baal
2023-04-28 03:59:53 +02:00
parent 46646a9bb8
commit 5ba11087b6
2 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/mouse.c
View File

@@ -1410,9 +1410,22 @@ bool mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump)
} else {
row -= win_get_fill(win, lnum);
}
count = plines_win_nofill(win, lnum, true);
count = plines_win_nofill(win, lnum, false);
} else {
count = plines_win(win, lnum, true);
count = plines_win(win, lnum, false);
}
if (win->w_skipcol > 0 && lnum == win->w_topline) {
// Adjust for 'smoothscroll' clipping the top screen lines.
// A similar formula is used in curs_columns().
int width1 = win->w_width - win_col_off(win);
int skip_lines = 0;
if (win->w_skipcol > width1) {
skip_lines = (win->w_skipcol - width1) / (width1 + win_col_off2(win)) + 1;
} else if (win->w_skipcol > 0) {
skip_lines = 1;
}
count -= skip_lines;
}
if (count > row) {
@@ -1436,8 +1449,11 @@ bool mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump)
col = off;
}
col += row * (win->w_width_inner - off);
// add skip column (for long wrapping line)
col += win->w_skipcol;
// Add skip column for the topline.
if (lnum == win->w_topline) {
col += win->w_skipcol;
}
}
if (!win->w_p_wrap) {