aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

patch 8.2.4559: getmousepos() returns the screen column

Browse Source 
Problem:    getmousepos() returns the screen column. (Ernie Rael)
Solution:   Return the text column, as documented.
This commit is contained in:
Bram Moolenaar 2022-03-13 15:52:44 +00:00
parent e850439a56
commit 533870a985
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mouse.c
View File

@ -3065,7 +3065,7 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv)
varnumber_T winid = 0; varnumber_T winid = 0;
varnumber_T winrow = 0; varnumber_T winrow = 0;
varnumber_T wincol = 0; varnumber_T wincol = 0;
linenr_T line = 0; linenr_T lnum = 0;
varnumber_T column = 0; varnumber_T column = 0;
if (rettv_dict_alloc(rettv) != OK) if (rettv_dict_alloc(rettv) != OK)
@ -3099,14 +3099,8 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv)
col -= left_off; col -= left_off;
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)
{ {
int count; if (!mouse_comp_pos(wp, &row, &col, &lnum, NULL))
col = vcol2col(wp, lnum, col);
mouse_comp_pos(wp, &row, &col, &line, NULL);
// limit to text size plus one
count = linetabsize(ml_get_buf(wp->w_buffer, line, FALSE));
if (col > count)
col = count;
column = col + 1; column = col + 1;
} }
} }
@ -3114,7 +3108,7 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv)
dict_add_number(d, "winid", winid); dict_add_number(d, "winid", winid);
dict_add_number(d, "winrow", winrow); dict_add_number(d, "winrow", winrow);
dict_add_number(d, "wincol", wincol); dict_add_number(d, "wincol", wincol);
dict_add_number(d, "line", (varnumber_T)line); dict_add_number(d, "line", (varnumber_T)lnum);
dict_add_number(d, "column", column); dict_add_number(d, "column", column);
} }
#endif #endif

14
src/testdir/test_functions.vim
View File

@ -2753,6 +2753,16 @@ endfunc
func Test_getmousepos() func Test_getmousepos()
enew! enew!
call setline(1, "\t\t\t1234") call setline(1, "\t\t\t1234")
call test_setmouse(1, 1)
call assert_equal(#{
\ screenrow: 1,
\ screencol: 1,
\ winid: win_getid(),
\ winrow: 1,
\ wincol: 1,
\ line: 1,
\ column: 1,
\ }, getmousepos())
call test_setmouse(1, 25) call test_setmouse(1, 25)
call assert_equal(#{ call assert_equal(#{
\ screenrow: 1, \ screenrow: 1,
@ -2761,7 +2771,7 @@ func Test_getmousepos()
\ winrow: 1, \ winrow: 1,
\ wincol: 25, \ wincol: 25,
\ line: 1, \ line: 1,
\ column: 25, \ column: 4,
\ }, getmousepos()) \ }, getmousepos())
call test_setmouse(1, 50) call test_setmouse(1, 50)
call assert_equal(#{ call assert_equal(#{
@ -2771,7 +2781,7 @@ func Test_getmousepos()
\ winrow: 1, \ winrow: 1,
\ wincol: 50, \ wincol: 50,
\ line: 1, \ line: 1,
\ column: 29, \ column: 8,
\ }, getmousepos()) \ }, getmousepos())
bwipe! bwipe!
endfunc endfunc

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4559,
/**/ /**/
4558, 4558,
/**/ /**/