Mercurial > vim
changeset 28087:4c60e656e054 v8.2.4568
patch 8.2.4568: getmousepos() does not compute the column below the last line
Commit: https://github.com/vim/vim/commit/10792feebd237aee89270669e509e85cafdfac60
Author: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue Mar 15 09:46:54 2022 +0000
patch 8.2.4568: getmousepos() does not compute the column below the last line
Problem: getmousepos() does not compute the column below the last line.
Solution: Also compute the column when the mouse is below the last line.
(Sean Dewar, closes #9946)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 15 Mar 2022 11:00:07 +0100 |
parents | d66743eafbb7 |
children | 687d1529c5fd |
files | src/mouse.c src/testdir/test_functions.vim src/version.c |
diffstat | 3 files changed, 27 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mouse.c +++ b/src/mouse.c @@ -3099,8 +3099,8 @@ f_getmousepos(typval_T *argvars UNUSED, col -= left_off; if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width) { - if (!mouse_comp_pos(wp, &row, &col, &lnum, NULL)) - col = vcol2col(wp, lnum, col); + (void)mouse_comp_pos(wp, &row, &col, &lnum, NULL); + col = vcol2col(wp, lnum, col); column = col + 1; } }
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -2783,6 +2783,29 @@ func Test_getmousepos() \ line: 1, \ column: 8, \ }, getmousepos()) + + " If the mouse is positioned past the last buffer line, "line" and "column" + " should act like it's positioned on the last buffer line. + call test_setmouse(2, 25) + call assert_equal(#{ + \ screenrow: 2, + \ screencol: 25, + \ winid: win_getid(), + \ winrow: 2, + \ wincol: 25, + \ line: 1, + \ column: 4, + \ }, getmousepos()) + call test_setmouse(2, 50) + call assert_equal(#{ + \ screenrow: 2, + \ screencol: 50, + \ winid: win_getid(), + \ winrow: 2, + \ wincol: 50, + \ line: 1, + \ column: 8, + \ }, getmousepos()) bwipe! endfunc