IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2321: cannot select all text with the mouse

Browse Source 
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)
0a5aa7b28a
This commit is contained in:
Daniel Steinberg 2021-06-30 14:10:26 -04:00
parent 037ec8f208
commit c423ee584a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/eval/funcs.c
View File

@ -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 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 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) { 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); 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; column = col + 1;
} }
} }

7
src/nvim/mouse.c
View File

@ -363,7 +363,6 @@ bool mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump)
bool retval = false; bool retval = false;
int off; int off;
int count; int count;
char_u *p;
if (win->w_p_rl) { if (win->w_p_rl) {
col = win->w_width_inner - 1 - col; 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); col += row * (win->w_width_inner - off);
// add skip column (for long wrapping line) // add skip column (for long wrapping line)
col += win->w_skipcol; 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) { if (!win->w_p_wrap) {