diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-03-13 15:52:44 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-03-13 15:52:44 +0000 |
| commit | 533870a98501fac2b51ef4bc489fac3a055a41a9 (patch) | |
| tree | 5e103e13fcad08f63083daf20c07995895c419e3 | |
| parent | e850439a561d8e7153b987473d768fe9696e9afa (diff) | |
| download | vim-git-533870a98501fac2b51ef4bc489fac3a055a41a9.tar.gz | |
patch 8.2.4559: getmousepos() returns the screen columnv8.2.4559
Problem: getmousepos() returns the screen column. (Ernie Rael)
Solution: Return the text column, as documented.
| -rw-r--r-- | src/mouse.c | 14 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 12 deletions
diff --git a/src/mouse.c b/src/mouse.c index a094df6bb..c2bde6d16 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -3065,7 +3065,7 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv) varnumber_T winid = 0; varnumber_T winrow = 0; varnumber_T wincol = 0; - linenr_T line = 0; + linenr_T lnum = 0; varnumber_T column = 0; if (rettv_dict_alloc(rettv) != OK) @@ -3099,14 +3099,8 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv) col -= left_off; if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width) { - int count; - - 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; + if (!mouse_comp_pos(wp, &row, &col, &lnum, NULL)) + col = vcol2col(wp, lnum, col); 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, "winrow", winrow); 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); } #endif diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index ce868c20a..d97522a37 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -2753,6 +2753,16 @@ endfunc func Test_getmousepos() enew! 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 assert_equal(#{ \ screenrow: 1, @@ -2761,7 +2771,7 @@ func Test_getmousepos() \ winrow: 1, \ wincol: 25, \ line: 1, - \ column: 25, + \ column: 4, \ }, getmousepos()) call test_setmouse(1, 50) call assert_equal(#{ @@ -2771,7 +2781,7 @@ func Test_getmousepos() \ winrow: 1, \ wincol: 50, \ line: 1, - \ column: 29, + \ column: 8, \ }, getmousepos()) bwipe! endfunc diff --git a/src/version.c b/src/version.c index f21159412..a8a8a6475 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4559, +/**/ 4558, /**/ 4557, |