aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

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
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 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