diff options
-rw-r--r-- | src/nvim/api/ui_events.in.h | 1 | ||||
-rw-r--r-- | src/nvim/popupmnu.c | 13 | ||||
-rw-r--r-- | src/nvim/screen.c | 6 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/nvim/api/ui_events.in.h b/src/nvim/api/ui_events.in.h index e1ff3dfc9d..39d508452c 100644 --- a/src/nvim/api/ui_events.in.h +++ b/src/nvim/api/ui_events.in.h @@ -38,5 +38,6 @@ void set_icon(String icon); void popupmenu_show(Array items, Integer selected, Integer row, Integer col) REMOTE_ONLY; void popupmenu_hide(void) REMOTE_ONLY; void popupmenu_select(Integer selected) REMOTE_ONLY; +void tabline_update(Tabpage current, Array tabs) REMOTE_ONLY; #endif // NVIM_API_UI_EVENTS_IN_H diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index b8650d8c62..9f3abfcb89 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -98,7 +98,6 @@ redo: } if (pum_external) { - Array args = ARRAY_DICT_INIT; if (array_changed) { Array arr = ARRAY_DICT_INIT; for (i = 0; i < size; i++) { @@ -109,14 +108,9 @@ redo: ADD(item, STRING_OBJ(cstr_to_string((char *)array[i].pum_info))); ADD(arr, ARRAY_OBJ(item)); } - ADD(args, ARRAY_OBJ(arr)); - ADD(args, INTEGER_OBJ(selected)); - ADD(args, INTEGER_OBJ(row)); - ADD(args, INTEGER_OBJ(col)); - ui_event("popupmenu_show", args); + ui_call_popupmenu_show(arr, selected, row, col); } else { - ADD(args, INTEGER_OBJ(selected)); - ui_event("popupmenu_select", args); + ui_call_popupmenu_select(selected); } return; } @@ -713,8 +707,7 @@ void pum_undisplay(void) pum_array = NULL; if (pum_external) { - Array args = ARRAY_DICT_INIT; - ui_event("popupmenu_hide", args); + ui_call_popupmenu_hide(); } else { redraw_all_later(SOME_VALID); redraw_tabline = true; diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 238b3f07c8..f897481086 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -7087,8 +7087,6 @@ static void draw_tabline(void) void ui_ext_tabline_update(void) { - Array args = ARRAY_DICT_INIT; - ADD(args, TABPAGE_OBJ(curtab->handle)); Array tabs = ARRAY_DICT_INIT; FOR_ALL_TABS(tp) { Dictionary tab_info = ARRAY_DICT_INIT; @@ -7100,9 +7098,7 @@ void ui_ext_tabline_update(void) ADD(tabs, DICTIONARY_OBJ(tab_info)); } - ADD(args, ARRAY_OBJ(tabs)); - - ui_event("tabline_update", args); + ui_call_tabline_update(curtab->handle, tabs); } /* |