vim-patch:8.2.4555: getmousepos() returns the wrong column

Problem:    getmousepos() returns the wrong column. (Ernie Rael)
Solution:   Limit to the text size, not the number of bytes.
986b0fd0c5

test_setmouse is N/A; adjust test for Nvim.

N/A patches for version.c:

vim-patch:8.2.4569: Coverity warning for not using a return value

Problem:    Coverity warning for not using a return value.
Solution:   Add "(void)".
977525fea6
This commit is contained in:
Sean Dewar
2022-03-13 18:01:44 +00:00
parent 9a9b93c485
commit 6906c5759d
2 changed files with 32 additions and 5 deletions

View File

@@ -3753,18 +3753,15 @@ static 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);
// limit to text size plus one
count = linetabsize(ml_get_buf(wp->w_buffer, line, false));
if (col > count) {
col = count;
}
column = col + 1;
}
}

View File

@@ -1762,6 +1762,36 @@ func Test_getcurpos_setpos()
call assert_equal([0, 0, 0, 0, 0], getcurpos(1999))
endfunc
func Test_getmousepos()
enew!
call setline(1, "\t\t\t1234")
" call test_setmouse(1, 25)
call nvim_input_mouse('left', 'press', '', 0, 0, 24)
call getchar() " wait for and consume the mouse press
call assert_equal(#{
\ screenrow: 1,
\ screencol: 25,
\ winid: win_getid(),
\ winrow: 1,
\ wincol: 25,
\ line: 1,
\ column: 25,
\ }, getmousepos())
" call test_setmouse(1, 50)
call nvim_input_mouse('left', 'press', '', 0, 0, 49)
call getchar() " wait for and consume the mouse press
call assert_equal(#{
\ screenrow: 1,
\ screencol: 50,
\ winid: win_getid(),
\ winrow: 1,
\ wincol: 50,
\ line: 1,
\ column: 29,
\ }, getmousepos())
bwipe!
endfunc
func HasDefault(msg = 'msg')
return a:msg
endfunc