ext_cmdline: change to use ui_call

2 files changed, 16 insertions, 22 deletions

diff --git a/src/nvim/api/ui_events.in.h b/src/nvim/api/ui_events.in.h
index 1b5d17584f..093251bb00 100644
--- a/src/nvim/api/ui_events.in.h
+++ b/src/nvim/api/ui_events.in.h
@@ -68,4 +68,15 @@ void popupmenu_select(Integer selected)
 void tabline_update(Tabpage current, Array tabs)
   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
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 34547c59c9..0223d9e936 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -1831,13 +1831,11 @@ getcmdline (
 )
 {
   if (ui_is_external(kUICmdline)) {
-    Array args = ARRAY_DICT_INIT;
-    ui_event("cmdline_enter", args);
+    ui_call_cmdline_enter();
   }
   char_u *p = command_line_enter(firstc, count, indent);
   if (ui_is_external(kUICmdline)) {
-    Array args = ARRAY_DICT_INIT;
-    ui_event("cmdline_hide", args);
+    ui_call_cmdline_hide();
   }
   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)
 {
-    Array args = ARRAY_DICT_INIT;
     Array content = ARRAY_DICT_INIT;
     Array text = ARRAY_DICT_INIT;
     ADD(text, STRING_OBJ(cstr_to_string("Normal")));
     ADD(text, STRING_OBJ(cstr_to_string((char *)(ccline.cmdbuff))));
     ADD(content, ARRAY_OBJ(text));
-    ADD(args, ARRAY_OBJ(content));
-    ADD(args, INTEGER_OBJ(ccline.cmdpos));
     char *firstc = (char []) { (char)ccline.cmdfirstc };
     String str = (String) {
         .data = xmemdupz(firstc, 1),
         .size = 1
     };
-    ADD(args, STRING_OBJ(str));
-    ADD(args, STRING_OBJ(cstr_to_string((char *)(ccline.cmdprompt))));
-    ui_event("cmdline_show", args);
+    ui_call_cmdline_show(content, ccline.cmdpos, str, cstr_to_string((char *)(ccline.cmdprompt)));
 }
 
 /*
@@ -2765,7 +2750,7 @@ void putcmdline(int c, int shift)
       draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos);
     msg_no_more = FALSE;
   } else {
-    ui_ext_cmdline_char(c, shift);
+    ui_call_cmdline_char(cstr_to_string((char *)(&c)), shift);
   }
   cursorcmd();
   ui_cursor_shape();
@@ -3193,9 +3178,7 @@ static void cursorcmd(void)
     return;
 
   if (ui_is_external(kUICmdline)) {
-    Array args = ARRAY_DICT_INIT;
-    ADD(args, INTEGER_OBJ(ccline.cmdpos));
-    ui_event("cmdline_pos", args);
+    ui_call_cmdline_pos(ccline.cmdpos);
     return;
   }