IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

api: use generated events for popupmenu and tabline

Browse Source
This commit is contained in:
Björn Linse 2017-04-29 14:27:22 +02:00
parent 489d10c57c
commit 4eb781ce1d
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/api/ui_events.in.h
View File

@ -38,5 +38,6 @@ void set_icon(String icon);
void popupmenu_show(Array items, Integer selected, Integer row, Integer col) REMOTE_ONLY; void popupmenu_show(Array items, Integer selected, Integer row, Integer col) REMOTE_ONLY;
void popupmenu_hide(void) REMOTE_ONLY; void popupmenu_hide(void) REMOTE_ONLY;
void popupmenu_select(Integer selected) 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 #endif // NVIM_API_UI_EVENTS_IN_H

13
src/nvim/popupmnu.c
View File

@ -98,7 +98,6 @@ redo:
} }
if (pum_external) { if (pum_external) {
Array args = ARRAY_DICT_INIT;
if (array_changed) { if (array_changed) {
Array arr = ARRAY_DICT_INIT; Array arr = ARRAY_DICT_INIT;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
@ -109,14 +108,9 @@ redo:
ADD(item, STRING_OBJ(cstr_to_string((char *)array[i].pum_info))); ADD(item, STRING_OBJ(cstr_to_string((char *)array[i].pum_info)));
ADD(arr, ARRAY_OBJ(item)); ADD(arr, ARRAY_OBJ(item));
} }
ADD(args, ARRAY_OBJ(arr)); ui_call_popupmenu_show(arr, selected, row, col);
ADD(args, INTEGER_OBJ(selected));
ADD(args, INTEGER_OBJ(row));
ADD(args, INTEGER_OBJ(col));
ui_event("popupmenu_show", args);
} else { } else {
ADD(args, INTEGER_OBJ(selected)); ui_call_popupmenu_select(selected);
ui_event("popupmenu_select", args);
} }
return; return;
} }
@ -713,8 +707,7 @@ void pum_undisplay(void)
pum_array = NULL; pum_array = NULL;
if (pum_external) { if (pum_external) {
Array args = ARRAY_DICT_INIT; ui_call_popupmenu_hide();
ui_event("popupmenu_hide", args);
} else { } else {
redraw_all_later(SOME_VALID); redraw_all_later(SOME_VALID);
redraw_tabline = true; redraw_tabline = true;

6
src/nvim/screen.c
View File

@ -7087,8 +7087,6 @@ static void draw_tabline(void)
void ui_ext_tabline_update(void) void ui_ext_tabline_update(void)
{ {
Array args = ARRAY_DICT_INIT;
ADD(args, TABPAGE_OBJ(curtab->handle));
Array tabs = ARRAY_DICT_INIT; Array tabs = ARRAY_DICT_INIT;
FOR_ALL_TABS(tp) { FOR_ALL_TABS(tp) {
Dictionary tab_info = ARRAY_DICT_INIT; Dictionary tab_info = ARRAY_DICT_INIT;
@ -7100,9 +7098,7 @@ void ui_ext_tabline_update(void)
ADD(tabs, DICTIONARY_OBJ(tab_info)); ADD(tabs, DICTIONARY_OBJ(tab_info));
} }
ADD(args, ARRAY_OBJ(tabs)); ui_call_tabline_update(curtab->handle, tabs);
ui_event("tabline_update", args);
} }
/* /*