Mercurial > vim
diff src/mouse.c @ 31154:7e48ddb8b079 v9.0.0911
patch 9.0.0911: with 'smoothscroll' set mouse click position may be wrong
Commit: https://github.com/vim/vim/commit/e6392b102151ec69fad232bcf00591230cef8e1c
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Sat Nov 19 14:31:08 2022 +0000
patch 9.0.0911: with 'smoothscroll' set mouse click position may be wrong
Problem: With 'smoothscroll' set mouse click position may be wrong.
Solution: Adjust computations for w_skipcol. (Yee Cheng Chin, closes https://github.com/vim/vim/issues/11514)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 19 Nov 2022 15:45:03 +0100 |
| parents | 388ef91ae4f5 |
| children | a86ee6c0309e |
line wrap: on
line diff
--- a/src/mouse.c +++ b/src/mouse.c @@ -3034,14 +3034,29 @@ mouse_comp_pos( row -= win->w_topfill; else row -= diff_check_fill(win, lnum); - count = plines_win_nofill(win, lnum, TRUE); + count = plines_win_nofill(win, lnum, FALSE); } else #endif - count = plines_win(win, lnum, TRUE); + count = plines_win(win, lnum, FALSE); if (plines_cache != NULL && cache_idx < Rows) plines_cache[cache_idx] = count; } + + 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) break; // Position is in this buffer line. #ifdef FEAT_FOLDING @@ -3063,8 +3078,10 @@ mouse_comp_pos( if (col < off) col = off; col += row * (win->w_width - 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)