From ede747c2cc84382e8746df8992ef0e403647ffde Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 25 Nov 2020 01:32:48 -0500 Subject: vim-patch:8.2.0257: cannot recognize a terminal in a popup window Problem: Cannot recognize a terminal in a popup window. Solution: Add the win_gettype() function. https://github.com/vim/vim/commit/00f3b4e007af07870168bf044cecc9d544483953 --- src/nvim/eval/funcs.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 62a8022734..090133c868 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -10992,6 +10992,27 @@ static void f_win_getid(typval_T *argvars, typval_T *rettv, FunPtr fptr) rettv->vval.v_number = win_getid(argvars); } +/// "win_gettype(nr)" function +static void f_win_gettype(typval_T *argvars, typval_T *rettv, FunPtr fptr) +{ + win_T *wp = curwin; + + rettv->v_type = VAR_STRING; + rettv->vval.v_string = NULL; + if (argvars[0].v_type != VAR_UNKNOWN) { + wp = find_win_by_nr_or_id(&argvars[0]); + if (wp == NULL) { + rettv->vval.v_string = vim_strsave((char_u *)"unknown"); + return; + } + } + if (wp->w_floating) { + rettv->vval.v_string = vim_strsave((char_u *)"popup"); + } else if (wp == curwin && cmdwin_type != 0) { + rettv->vval.v_string = vim_strsave((char_u *)"command"); + } +} + /// "win_gotoid()" function static void f_win_gotoid(typval_T *argvars, typval_T *rettv, FunPtr fptr) { -- cgit From 9b2efe6b7d40d6ef317751768a65c74e4e2e8152 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 25 Nov 2020 02:27:10 -0500 Subject: vim-patch:8.2.0991: cannot get window type for autocmd and preview window Problem: Cannot get window type for autocmd and preview window. Solution: Add types to win_gettype(). (Yegappan Lakshmanan, closes vim/vim#6277) https://github.com/vim/vim/commit/0fe937fd8616fcd24b1b1ef2ab9f1657615dd22c Cherry-pick test_preview.vim,test_window_cmd.vim changes from patch v8.2.0522. --- src/nvim/eval/funcs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 090133c868..d07efc297e 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -11006,7 +11006,11 @@ static void f_win_gettype(typval_T *argvars, typval_T *rettv, FunPtr fptr) return; } } - if (wp->w_floating) { + if (wp == aucmd_win) { + rettv->vval.v_string = vim_strsave((char_u *)"aucmdwin"); + } else if (wp->w_p_pvw) { + rettv->vval.v_string = vim_strsave((char_u *)"preview"); + } else if (wp->w_floating) { rettv->vval.v_string = vim_strsave((char_u *)"popup"); } else if (wp == curwin && cmdwin_type != 0) { rettv->vval.v_string = vim_strsave((char_u *)"command"); -- cgit From 8d7fa8962bce98936cf9ddcefd70f35e7db04239 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 25 Nov 2020 02:43:23 -0500 Subject: vim-patch:8.2.0996: using "aucmdwin" in win_gettype() is not ideal Problem: Using "aucmdwin" in win_gettype() is not ideal. Solution: Rename to "autocmd". https://github.com/vim/vim/commit/40a019f157c549dcdc17c33f082975485567bb06 --- src/nvim/eval/funcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index d07efc297e..901f20bedf 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -11007,7 +11007,7 @@ static void f_win_gettype(typval_T *argvars, typval_T *rettv, FunPtr fptr) } } if (wp == aucmd_win) { - rettv->vval.v_string = vim_strsave((char_u *)"aucmdwin"); + rettv->vval.v_string = vim_strsave((char_u *)"autocmd"); } else if (wp->w_p_pvw) { rettv->vval.v_string = vim_strsave((char_u *)"preview"); } else if (wp->w_floating) { -- cgit