commit d002e411c60a231b7c136a84422b3d9bf7b8b4df
author Bram Moolenaar <Bram@vim.org> Mon Nov 11 21:45:05 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Nov 11 21:45:05 2019 +0100
tree b5213a74e07f8b0d2ea32617f7870fa769c243f3
parent adf4aa200b026dce91dd169143ee8b93e848ec8b

patch 8.1.2292: v:mouse_winid not set on click in popup window

Problem:    v:mouse_winid not set on click in popup window.
Solution:   Set v:mouse_winid. (closes #5171)

runtime/doc/popup.txt

diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
index 0dd8d1a..a74c2ad 100644
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -863,8 +863,9 @@
 	Tab		accept current suggestion
 
 A mouse click arrives as <LeftMouse>.  The coordinates are in |v:mouse_col|
-and |v:mouse_lnum|.  The top-left screen cell of the popup is col 1, row 1
-(not counting the border).
+and |v:mouse_lnum|.  |v:mouse_winid| holds the window ID, |v:mouse_win| is
+always zero.  The top-left screen cell of the popup is col 1, row 1 (not
+counting the border).
 
 Vim provides standard filters |popup_filter_menu()| and
 |popup_filter_yesno()|.

src/popupwin.c

diff --git a/src/popupwin.c b/src/popupwin.c
index 405e608..66ce30c 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2915,6 +2915,7 @@
 	    (void)mouse_comp_pos(wp, &row, &col, &lnum, NULL);
 	    set_vim_var_nr(VV_MOUSE_LNUM, lnum);
 	    set_vim_var_nr(VV_MOUSE_COL, col + 1);
+	    set_vim_var_nr(VV_MOUSE_WINID, wp->w_id);
 	}
     }
 

src/testdir/test_popupwin.vim

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index ad3caa0..7e94041 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2207,6 +2207,7 @@
   func MyPopupFilter(winid, c)
     let g:got_mouse_col = v:mouse_col
     let g:got_mouse_lnum = v:mouse_lnum
+    let g:got_mouse_winid = v:mouse_winid
     return 0
   endfunc
 
@@ -2221,6 +2222,7 @@
   call feedkeys("\<LeftMouse>", 'xt')
   call assert_equal(1, g:got_mouse_col)
   call assert_equal(1, g:got_mouse_lnum)
+  call assert_equal(winid, g:got_mouse_winid)
 
   call test_setmouse(5, 8)
   call feedkeys("\<LeftMouse>", 'xt')
@@ -2236,6 +2238,7 @@
   call feedkeys("\<LeftMouse>", 'xt')
   call assert_equal(13, g:got_mouse_col)
   call assert_equal(3, g:got_mouse_lnum)
+  call assert_equal(winid, g:got_mouse_winid)
 
   call popup_close(winid)
   delfunc MyPopupFilter

src/version.c

diff --git a/src/version.c b/src/version.c
index f2b1a75..0e9b27b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2292,
+/**/
     2291,
 /**/
     2290,