diff options
| author | Daniel Steinberg <dstein64@users.noreply.github.com> | 2021-06-30 14:10:26 -0400 |
|---|---|---|
| committer | Daniel Steinberg <dstein64@users.noreply.github.com> | 2021-09-29 11:13:49 -0400 |
| commit | c423ee584a63b5b18cdb3aa8ebd736207ecada62 (patch) | |
| tree | 2bef5d48304dc28bc36a8c7ea6d5278a03cd98e0 /src | |
| parent | 037ec8f20865fa171b2ff05c19b87df684ee47ce (diff) | |
| download | rneovim-c423ee584a63b5b18cdb3aa8ebd736207ecada62.tar.gz rneovim-c423ee584a63b5b18cdb3aa8ebd736207ecada62.tar.bz2 rneovim-c423ee584a63b5b18cdb3aa8ebd736207ecada62.zip | |
vim-patch:8.1.2321: cannot select all text with the mouse
Problem: Cannot select all text with the mouse. (John Marriott)
Solution: Move limiting the mouse column to f_getmousepos().
(closes https://github.com/vim/vim/issues/5242)
https://github.com/vim/vim/commit/0a5aa7b28a39507260acb15c1ef698a33c855cc1
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/funcs.c | 11 | ||||
| -rw-r--r-- | src/nvim/mouse.c | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 6e3be94366..98edc36a7c 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3780,7 +3780,18 @@ void f_getmousepos(typval_T *argvars, typval_T *rettv, FunPtr fptr) winrow = row + 1 + wp->w_border_adj[0]; // Adjust by 1 for top border wincol = col + 1 + wp->w_border_adj[3]; // Adjust by 1 for left border if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width) { + char_u *p; + int count; + mouse_comp_pos(wp, &row, &col, &line); + + // limit to text length plus one + p = ml_get_buf(wp->w_buffer, line, false); + count = (int)STRLEN(p); + if (col > count) { + col = count; + } + column = col + 1; } } diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c index 4001d620c8..cf463fd40a 100644 --- a/src/nvim/mouse.c +++ b/src/nvim/mouse.c @@ -363,7 +363,6 @@ bool mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump) bool retval = false; int off; int count; - char_u *p; if (win->w_p_rl) { col = win->w_width_inner - 1 - col; @@ -408,12 +407,6 @@ bool mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump) col += row * (win->w_width_inner - off); // add skip column (for long wrapping line) col += win->w_skipcol; - // limit to text length plus one - p = ml_get_buf(win->w_buffer, lnum, false); - count = (int)STRLEN(p); - if (col > count) { - col = count; - } } if (!win->w_p_wrap) { |