From 3b9e75b3664652e5557dd6423adda9b55d113c4f Mon Sep 17 00:00:00 2001 From: Daniel Steinberg Date: Tue, 29 Jun 2021 17:55:54 -0400 Subject: vim-patch:8.1.2304: cannot get the mouse position when getting a mouse click Problem: Cannot get the mouse position when getting a mouse click. Solution: Add getmousepos(). https://github.com/vim/vim/commit/db3a205147ce2c335d5c2181c1f789277f8775b0 --- src/nvim/eval/funcs.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 9feecadb6f..7791e03944 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3750,6 +3750,48 @@ static void f_getmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr) } } +// "getmousepos()" function +void f_getmousepos(typval_T *argvars, typval_T *rettv, FunPtr fptr) +{ + dict_T *d; + win_T *wp; + int row = mouse_row; + int col = mouse_col; + int grid = mouse_grid; + varnumber_T winid = 0; + varnumber_T winrow = 0; + varnumber_T wincol = 0; + varnumber_T line = 0; + varnumber_T column = 0; + + tv_dict_alloc_ret(rettv); + d = rettv->vval.v_dict; + + tv_dict_add_nr(d, S_LEN("screenrow"), (varnumber_T)mouse_row + 1); + tv_dict_add_nr(d, S_LEN("screencol"), (varnumber_T)mouse_col + 1); + + wp = mouse_find_win(&grid, &row, &col); + if (wp != NULL) { + int height = wp->w_height + wp->w_status_height; + // The height is adjusted by 1 when there is a bottom border. This is not + // necessary for a top border since `row` starts at -1 in that case. + if (row < height + wp->w_border_adj[2]) { + winid = wp->handle; + 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) { + mouse_comp_pos(wp, &row, &col, &line); + column = col + 1; + } + } + } + tv_dict_add_nr(d, S_LEN("winid"), winid); + tv_dict_add_nr(d, S_LEN("winrow"), winrow); + tv_dict_add_nr(d, S_LEN("wincol"), wincol); + tv_dict_add_nr(d, S_LEN("line"), line); + tv_dict_add_nr(d, S_LEN("column"), column); +} + /* * "getpid()" function */ -- cgit From 95bf86c2bfdd8db4019695c6a85a99b3889232e4 Mon Sep 17 00:00:00 2001 From: Daniel Steinberg Date: Wed, 30 Jun 2021 13:26:48 -0400 Subject: vim-patch:8.1.2309: compiler warning for argument type Problem: Compiler warning for argument type. Solution: Use linenr_T and cast to varnumber_T. (John Marriott) https://github.com/vim/vim/commit/abe12a1a4fce36bfa5dea3a0ce85603432d1905b --- src/nvim/eval/funcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 7791e03944..6e3be94366 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3761,7 +3761,7 @@ void f_getmousepos(typval_T *argvars, typval_T *rettv, FunPtr fptr) varnumber_T winid = 0; varnumber_T winrow = 0; varnumber_T wincol = 0; - varnumber_T line = 0; + linenr_T line = 0; varnumber_T column = 0; tv_dict_alloc_ret(rettv); @@ -3788,7 +3788,7 @@ void f_getmousepos(typval_T *argvars, typval_T *rettv, FunPtr fptr) tv_dict_add_nr(d, S_LEN("winid"), winid); tv_dict_add_nr(d, S_LEN("winrow"), winrow); tv_dict_add_nr(d, S_LEN("wincol"), wincol); - tv_dict_add_nr(d, S_LEN("line"), line); + tv_dict_add_nr(d, S_LEN("line"), (varnumber_T)line); tv_dict_add_nr(d, S_LEN("column"), column); } -- cgit From c423ee584a63b5b18cdb3aa8ebd736207ecada62 Mon Sep 17 00:00:00 2001 From: Daniel Steinberg Date: Wed, 30 Jun 2021 14:10:26 -0400 Subject: vim-patch:8.1.2321: cannot select all text with the mouse Problem: Cannot select all text with the mouse. (John Marriott) Solution: Move limiting the mouse column to f_getmousepos(). (closes https://github.com/vim/vim/issues/5242) https://github.com/vim/vim/commit/0a5aa7b28a39507260acb15c1ef698a33c855cc1 --- src/nvim/eval/funcs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 6e3be94366..98edc36a7c 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3780,7 +3780,18 @@ 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); + if (col > count) { + col = count; + } + column = col + 1; } } -- cgit