comparison src/eval.c @ 9221:17fa362f10be v7.4.1894

commit https://github.com/vim/vim/commit/511972d810ea490955161ff5097ec2f57919ceaf Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 4 18:09:59 2016 +0200 patch 7.4.1894 Problem: Cannot get the window ID for a mouse click. Solution: Add v:mouse_winid.
author Christian Brabandt <cb@256bit.org>
date Sat, 04 Jun 2016 18:15:05 +0200
parents 7363f5cc4cb8
children 6c4d610fce0a
comparison
equal deleted inserted replaced
9220:29a8841b4025 9221:17fa362f10be
357 {VV_NAME("swapname", VAR_STRING), VV_RO}, 357 {VV_NAME("swapname", VAR_STRING), VV_RO},
358 {VV_NAME("swapchoice", VAR_STRING), 0}, 358 {VV_NAME("swapchoice", VAR_STRING), 0},
359 {VV_NAME("swapcommand", VAR_STRING), VV_RO}, 359 {VV_NAME("swapcommand", VAR_STRING), VV_RO},
360 {VV_NAME("char", VAR_STRING), 0}, 360 {VV_NAME("char", VAR_STRING), 0},
361 {VV_NAME("mouse_win", VAR_NUMBER), 0}, 361 {VV_NAME("mouse_win", VAR_NUMBER), 0},
362 {VV_NAME("mouse_winid", VAR_NUMBER), 0},
362 {VV_NAME("mouse_lnum", VAR_NUMBER), 0}, 363 {VV_NAME("mouse_lnum", VAR_NUMBER), 0},
363 {VV_NAME("mouse_col", VAR_NUMBER), 0}, 364 {VV_NAME("mouse_col", VAR_NUMBER), 0},
364 {VV_NAME("operator", VAR_STRING), VV_RO}, 365 {VV_NAME("operator", VAR_STRING), VV_RO},
365 {VV_NAME("searchforward", VAR_NUMBER), 0}, 366 {VV_NAME("searchforward", VAR_NUMBER), 0},
366 {VV_NAME("hlsearch", VAR_NUMBER), 0}, 367 {VV_NAME("hlsearch", VAR_NUMBER), 0},
12753 } 12754 }
12754 --no_mapping; 12755 --no_mapping;
12755 --allow_keys; 12756 --allow_keys;
12756 12757
12757 vimvars[VV_MOUSE_WIN].vv_nr = 0; 12758 vimvars[VV_MOUSE_WIN].vv_nr = 0;
12759 vimvars[VV_MOUSE_WINID].vv_nr = 0;
12758 vimvars[VV_MOUSE_LNUM].vv_nr = 0; 12760 vimvars[VV_MOUSE_LNUM].vv_nr = 0;
12759 vimvars[VV_MOUSE_COL].vv_nr = 0; 12761 vimvars[VV_MOUSE_COL].vv_nr = 0;
12760 12762
12761 rettv->vval.v_number = n; 12763 rettv->vval.v_number = n;
12762 if (IS_SPECIAL(n) || mod_mask != 0) 12764 if (IS_SPECIAL(n) || mod_mask != 0)
12808 # ifdef FEAT_WINDOWS 12810 # ifdef FEAT_WINDOWS
12809 for (wp = firstwin; wp != win; wp = wp->w_next) 12811 for (wp = firstwin; wp != win; wp = wp->w_next)
12810 ++winnr; 12812 ++winnr;
12811 # endif 12813 # endif
12812 vimvars[VV_MOUSE_WIN].vv_nr = winnr; 12814 vimvars[VV_MOUSE_WIN].vv_nr = winnr;
12815 vimvars[VV_MOUSE_WINID].vv_nr = win->w_id;
12813 vimvars[VV_MOUSE_LNUM].vv_nr = lnum; 12816 vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
12814 vimvars[VV_MOUSE_COL].vv_nr = col + 1; 12817 vimvars[VV_MOUSE_COL].vv_nr = col + 1;
12815 } 12818 }
12816 } 12819 }
12817 #endif 12820 #endif