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

ext_cmdline: change to use ui_call

Browse Source
This commit is contained in:
Dongdong Zhou 2017-05-11 07:11:21 +01:00 committed by Björn Linse
parent e164ba41c8
commit ab85999eb7
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,4 +68,15 @@ void popupmenu_select(Integer selected)
void tabline_update(Tabpage current, Array tabs) void tabline_update(Tabpage current, Array tabs)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void cmdline_enter(void)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void cmdline_show(Array content, Integer pos, String firstc, String prompt)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void cmdline_pos(Integer pos)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void cmdline_char(String c, Integer shift)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void cmdline_hide(void)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
#endif // NVIM_API_UI_EVENTS_IN_H #endif // NVIM_API_UI_EVENTS_IN_H

27
src/nvim/ex_getln.c
View File

@ -1831,13 +1831,11 @@ getcmdline (
) )
{ {
if (ui_is_external(kUICmdline)) { if (ui_is_external(kUICmdline)) {
Array args = ARRAY_DICT_INIT; ui_call_cmdline_enter();
ui_event("cmdline_enter", args);
} }
char_u *p = command_line_enter(firstc, count, indent); char_u *p = command_line_enter(firstc, count, indent);
if (ui_is_external(kUICmdline)) { if (ui_is_external(kUICmdline)) {
Array args = ARRAY_DICT_INIT; ui_call_cmdline_hide();
ui_event("cmdline_hide", args);
} }
return p; return p;
} }
@ -2720,32 +2718,19 @@ draw_cmdline_no_arabicshape:
} }
} }
void ui_ext_cmdline_char(int c, int shift)
{
Array args = ARRAY_DICT_INIT;
ADD(args, STRING_OBJ(cstr_to_string((char *)(&c))));
ADD(args, INTEGER_OBJ(shift));
ui_event("cmdline_char", args);
}
void ui_ext_cmdline_show(void) void ui_ext_cmdline_show(void)
{ {
Array args = ARRAY_DICT_INIT;
Array content = ARRAY_DICT_INIT; Array content = ARRAY_DICT_INIT;
Array text = ARRAY_DICT_INIT; Array text = ARRAY_DICT_INIT;
ADD(text, STRING_OBJ(cstr_to_string("Normal"))); ADD(text, STRING_OBJ(cstr_to_string("Normal")));
ADD(text, STRING_OBJ(cstr_to_string((char *)(ccline.cmdbuff)))); ADD(text, STRING_OBJ(cstr_to_string((char *)(ccline.cmdbuff))));
ADD(content, ARRAY_OBJ(text)); ADD(content, ARRAY_OBJ(text));
ADD(args, ARRAY_OBJ(content));
ADD(args, INTEGER_OBJ(ccline.cmdpos));
char *firstc = (char []) { (char)ccline.cmdfirstc }; char *firstc = (char []) { (char)ccline.cmdfirstc };
String str = (String) { String str = (String) {
.data = xmemdupz(firstc, 1), .data = xmemdupz(firstc, 1),
.size = 1 .size = 1
}; };
ADD(args, STRING_OBJ(str)); ui_call_cmdline_show(content, ccline.cmdpos, str, cstr_to_string((char *)(ccline.cmdprompt)));
ADD(args, STRING_OBJ(cstr_to_string((char *)(ccline.cmdprompt))));
ui_event("cmdline_show", args);
} }
/* /*
@ -2765,7 +2750,7 @@ void putcmdline(int c, int shift)
draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos); draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos);
msg_no_more = FALSE; msg_no_more = FALSE;
} else { } else {
ui_ext_cmdline_char(c, shift); ui_call_cmdline_char(cstr_to_string((char *)(&c)), shift);
} }
cursorcmd(); cursorcmd();
ui_cursor_shape(); ui_cursor_shape();
@ -3193,9 +3178,7 @@ static void cursorcmd(void)
return; return;
if (ui_is_external(kUICmdline)) { if (ui_is_external(kUICmdline)) {
Array args = ARRAY_DICT_INIT; ui_call_cmdline_pos(ccline.cmdpos);
ADD(args, INTEGER_OBJ(ccline.cmdpos));
ui_event("cmdline_pos", args);
return; return;
} }