4 files changed, 18 insertions, 389 deletions

diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 34ff7c6374..0d7d5a247e 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -7,8 +7,8 @@
 
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/vim.h"
+#include "nvim/api/ui.h"
 #include "nvim/msgpack_rpc/channel.h"
-#include "nvim/msgpack_rpc/remote_ui.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/libuv_process.h"
 #include "nvim/event/rstream.h"
@@ -16,6 +16,7 @@
 #include "nvim/event/socket.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/vim.h"
+#include "nvim/main.h"
 #include "nvim/ascii.h"
 #include "nvim/memory.h"
 #include "nvim/os_unix.h"
@@ -119,7 +120,7 @@ void channel_teardown(void)
 uint64_t channel_from_process(char **argv)
 {
   Channel *channel = register_channel(kChannelTypeProc);
-  channel->data.process.uvproc = libuv_process_init(&loop, channel);
+  channel->data.process.uvproc = libuv_process_init(&main_loop, channel);
   Process *proc = &channel->data.process.uvproc.process;
   proc->argv = argv;
   proc->in = &channel->data.process.in;
@@ -127,7 +128,7 @@ uint64_t channel_from_process(char **argv)
   proc->err = &channel->data.process.err;
   proc->cb = process_exit;
   if (!process_spawn(proc)) {
-    loop_poll_events(&loop, 0);
+    loop_poll_events(&main_loop, 0);
     decref(channel);
     return 0;
   }
@@ -179,7 +180,7 @@ bool channel_send_event(uint64_t id, char *name, Array args)
       // Pending request, queue the notification for later sending.
       String method = cstr_as_string(name);
       WBuffer *buffer = serialize_request(id, 0, method, args, &out_buffer, 1);
-      kv_push(WBuffer *, channel->delayed_notifications, buffer);
+      kv_push(channel->delayed_notifications, buffer);
     } else {
       send_event(channel, name, args);
     }
@@ -217,10 +218,10 @@ Object channel_send_call(uint64_t id,
   send_request(channel, request_id, method_name, args);
 
   // Push the frame
-  ChannelCallFrame frame = {request_id, false, false, NIL};
-  kv_push(ChannelCallFrame *, channel->call_stack, &frame);
+  ChannelCallFrame frame = { request_id, false, false, NIL };
+  kv_push(channel->call_stack, &frame);
   channel->pending_requests++;
-  LOOP_PROCESS_EVENTS_UNTIL(&loop, channel->events, -1, frame.returned);
+  LOOP_PROCESS_EVENTS_UNTIL(&main_loop, channel->events, -1, frame.returned);
   (void)kv_pop(channel->call_stack);
   channel->pending_requests--;
 
@@ -316,11 +317,11 @@ void channel_from_stdio(void)
   Channel *channel = register_channel(kChannelTypeStdio);
   incref(channel);  // stdio channels are only closed on exit
   // read stream
-  rstream_init_fd(&loop, &channel->data.std.in, 0, CHANNEL_BUFFER_SIZE,
-      channel);
+  rstream_init_fd(&main_loop, &channel->data.std.in, 0, CHANNEL_BUFFER_SIZE,
+                  channel);
   rstream_start(&channel->data.std.in, parse_msgpack);
   // write stream
-  wstream_init_fd(&loop, &channel->data.std.out, 1, 0, NULL);
+  wstream_init_fd(&main_loop, &channel->data.std.out, 1, 0, NULL);
 }
 
 static void forward_stderr(Stream *stream, RBuffer *rbuf, size_t count,
@@ -574,13 +575,12 @@ static void send_event(Channel *channel,
 
 static void broadcast_event(char *name, Array args)
 {
-  kvec_t(Channel *) subscribed;
-  kv_init(subscribed);
+  kvec_t(Channel *) subscribed = KV_INITIAL_VALUE;
   Channel *channel;
 
   map_foreach_value(channels, channel, {
     if (pmap_has(cstr_t)(channel->subscribed_events, name)) {
-      kv_push(Channel *, subscribed, channel);
+      kv_push(subscribed, channel);
     }
   });
 
@@ -600,7 +600,7 @@ static void broadcast_event(char *name, Array args)
   for (size_t i = 0; i < kv_size(subscribed); i++) {
     Channel *channel = kv_A(subscribed, i);
     if (channel->pending_requests) {
-      kv_push(WBuffer *, channel->delayed_notifications, buffer);
+      kv_push(channel->delayed_notifications, buffer);
     } else {
       channel_write(channel, buffer);
     }
@@ -647,7 +647,7 @@ static void close_channel(Channel *channel)
     case kChannelTypeStdio:
       stream_close(&channel->data.std.in, NULL);
       stream_close(&channel->data.std.out, NULL);
-      queue_put(loop.fast_events, exit_event, 1, channel);
+      queue_put(main_loop.fast_events, exit_event, 1, channel);
       return;
     default:
       abort();
@@ -692,7 +692,7 @@ static void close_cb(Stream *stream, void *data)
 static Channel *register_channel(ChannelType type)
 {
   Channel *rv = xmalloc(sizeof(Channel));
-  rv->events = queue_new_child(loop.events);
+  rv->events = queue_new_child(main_loop.events);
   rv->type = type;
   rv->refcount = 1;
   rv->closed = false;
diff --git a/src/nvim/msgpack_rpc/remote_ui.c b/src/nvim/msgpack_rpc/remote_ui.c
deleted file mode 100644
index 6ffcffe2e1..0000000000
--- a/src/nvim/msgpack_rpc/remote_ui.c
+++ /dev/null
@@ -1,363 +0,0 @@
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "nvim/vim.h"
-#include "nvim/ui.h"
-#include "nvim/memory.h"
-#include "nvim/map.h"
-#include "nvim/msgpack_rpc/remote_ui.h"
-#include "nvim/msgpack_rpc/channel.h"
-#include "nvim/api/private/defs.h"
-#include "nvim/api/private/helpers.h"
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "msgpack_rpc/remote_ui.c.generated.h"
-#endif
-
-typedef struct {
-  uint64_t channel_id;
-  Array buffer;
-} UIData;
-
-static PMap(uint64_t) *connected_uis = NULL;
-
-void remote_ui_init(void)
-{
-  connected_uis = pmap_new(uint64_t)();
-  // Add handler for "attach_ui"
-  String method = cstr_as_string("ui_attach");
-  MsgpackRpcRequestHandler handler = {.fn = remote_ui_attach, .async = false};
-  msgpack_rpc_add_method_handler(method, handler);
-  method = cstr_as_string("ui_detach");
-  handler.fn = remote_ui_detach;
-  msgpack_rpc_add_method_handler(method, handler);
-  method = cstr_as_string("ui_try_resize");
-  handler.fn = remote_ui_try_resize;
-  msgpack_rpc_add_method_handler(method, handler);
-}
-
-void remote_ui_disconnect(uint64_t channel_id)
-{
-  UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
-  if (!ui) {
-    return;
-  }
-  UIData *data = ui->data;
-  // destroy pending screen updates
-  api_free_array(data->buffer);
-  pmap_del(uint64_t)(connected_uis, channel_id);
-  xfree(ui->data);
-  ui_detach(ui);
-  xfree(ui);
-}
-
-static Object remote_ui_attach(uint64_t channel_id, uint64_t request_id,
-                               Array args, Error *error)
-{
-  if (pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, Exception, _("UI already attached for channel"));
-    return NIL;
-  }
-
-  if (args.size != 3 || args.items[0].type != kObjectTypeInteger
-      || args.items[1].type != kObjectTypeInteger
-      || args.items[2].type != kObjectTypeBoolean
-      || args.items[0].data.integer <= 0 || args.items[1].data.integer <= 0) {
-    api_set_error(error, Validation,
-                  _("Invalid arguments. Expected: "
-                    "(uint width > 0, uint height > 0, bool enable_rgb)"));
-    return NIL;
-  }
-  UIData *data = xmalloc(sizeof(UIData));
-  data->channel_id = channel_id;
-  data->buffer = (Array)ARRAY_DICT_INIT;
-  UI *ui = xcalloc(1, sizeof(UI));
-  ui->width = (int)args.items[0].data.integer;
-  ui->height = (int)args.items[1].data.integer;
-  ui->rgb = args.items[2].data.boolean;
-  ui->data = data;
-  ui->resize = remote_ui_resize;
-  ui->clear = remote_ui_clear;
-  ui->eol_clear = remote_ui_eol_clear;
-  ui->cursor_goto = remote_ui_cursor_goto;
-  ui->update_menu = remote_ui_update_menu;
-  ui->busy_start = remote_ui_busy_start;
-  ui->busy_stop = remote_ui_busy_stop;
-  ui->mouse_on = remote_ui_mouse_on;
-  ui->mouse_off = remote_ui_mouse_off;
-  ui->mode_change = remote_ui_mode_change;
-  ui->set_scroll_region = remote_ui_set_scroll_region;
-  ui->scroll = remote_ui_scroll;
-  ui->highlight_set = remote_ui_highlight_set;
-  ui->put = remote_ui_put;
-  ui->bell = remote_ui_bell;
-  ui->visual_bell = remote_ui_visual_bell;
-  ui->update_fg = remote_ui_update_fg;
-  ui->update_bg = remote_ui_update_bg;
-  ui->update_sp = remote_ui_update_sp;
-  ui->flush = remote_ui_flush;
-  ui->suspend = remote_ui_suspend;
-  ui->set_title = remote_ui_set_title;
-  ui->set_icon = remote_ui_set_icon;
-  pmap_put(uint64_t)(connected_uis, channel_id, ui);
-  ui_attach(ui);
-  return NIL;
-}
-
-static Object remote_ui_detach(uint64_t channel_id, uint64_t request_id,
-                               Array args, Error *error)
-{
-  if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, Exception, _("UI is not attached for channel"));
-  }
-  remote_ui_disconnect(channel_id);
-
-  return NIL;
-}
-
-static Object remote_ui_try_resize(uint64_t channel_id, uint64_t request_id,
-                                   Array args, Error *error)
-{
-  if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, Exception, _("UI is not attached for channel"));
-  }
-
-  if (args.size != 2 || args.items[0].type != kObjectTypeInteger
-      || args.items[1].type != kObjectTypeInteger
-      || args.items[0].data.integer <= 0 || args.items[1].data.integer <= 0) {
-    api_set_error(error, Validation,
-                  _("Invalid arguments. Expected: "
-                    "(uint width > 0, uint height > 0)"));
-    return NIL;
-  }
-
-  UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
-  ui->width = (int)args.items[0].data.integer;
-  ui->height = (int)args.items[1].data.integer;
-  ui_refresh();
-  return NIL;
-}
-
-
-static void push_call(UI *ui, char *name, Array args)
-{
-  Array call = ARRAY_DICT_INIT;
-  UIData *data = ui->data;
-
-  // To optimize data transfer(especially for "put"), we bundle adjacent
-  // calls to same method together, so only add a new call entry if the last
-  // method call is different from "name"
-  if (kv_size(data->buffer)) {
-    call = kv_A(data->buffer, kv_size(data->buffer) - 1).data.array;
-  }
-
-  if (!kv_size(call) || strcmp(kv_A(call, 0).data.string.data, name)) {
-    call = (Array)ARRAY_DICT_INIT;
-    ADD(data->buffer, ARRAY_OBJ(call));
-    ADD(call, STRING_OBJ(cstr_to_string(name)));
-  }
-
-  ADD(call, ARRAY_OBJ(args));
-  kv_A(data->buffer, kv_size(data->buffer) - 1).data.array = call;
-}
-
-static void remote_ui_resize(UI *ui, int width, int height)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(width));
-  ADD(args, INTEGER_OBJ(height));
-  push_call(ui, "resize", args);
-}
-
-static void remote_ui_clear(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "clear", args);
-}
-
-static void remote_ui_eol_clear(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "eol_clear", args);
-}
-
-static void remote_ui_cursor_goto(UI *ui, int row, int col)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(row));
-  ADD(args, INTEGER_OBJ(col));
-  push_call(ui, "cursor_goto", args);
-}
-
-static void remote_ui_update_menu(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "update_menu", args);
-}
-
-static void remote_ui_busy_start(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "busy_start", args);
-}
-
-static void remote_ui_busy_stop(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "busy_stop", args);
-}
-
-static void remote_ui_mouse_on(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "mouse_on", args);
-}
-
-static void remote_ui_mouse_off(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "mouse_off", args);
-}
-
-static void remote_ui_mode_change(UI *ui, int mode)
-{
-  Array args = ARRAY_DICT_INIT;
-  if (mode == INSERT) {
-    ADD(args, STRING_OBJ(cstr_to_string("insert")));
-  } else if (mode == REPLACE) {
-    ADD(args, STRING_OBJ(cstr_to_string("replace")));
-  } else {
-    assert(mode == NORMAL);
-    ADD(args, STRING_OBJ(cstr_to_string("normal")));
-  }
-  push_call(ui, "mode_change", args);
-}
-
-static void remote_ui_set_scroll_region(UI *ui, int top, int bot, int left,
-    int right)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(top));
-  ADD(args, INTEGER_OBJ(bot));
-  ADD(args, INTEGER_OBJ(left));
-  ADD(args, INTEGER_OBJ(right));
-  push_call(ui, "set_scroll_region", args);
-}
-
-static void remote_ui_scroll(UI *ui, int count)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(count));
-  push_call(ui, "scroll", args);
-}
-
-static void remote_ui_highlight_set(UI *ui, HlAttrs attrs)
-{
-  Array args = ARRAY_DICT_INIT;
-  Dictionary hl = ARRAY_DICT_INIT;
-
-  if (attrs.bold) {
-    PUT(hl, "bold", BOOLEAN_OBJ(true));
-  }
-
-  if (attrs.underline) {
-    PUT(hl, "underline", BOOLEAN_OBJ(true));
-  }
-
-  if (attrs.undercurl) {
-    PUT(hl, "undercurl", BOOLEAN_OBJ(true));
-  }
-
-  if (attrs.italic) {
-    PUT(hl, "italic", BOOLEAN_OBJ(true));
-  }
-
-  if (attrs.reverse) {
-    PUT(hl, "reverse", BOOLEAN_OBJ(true));
-  }
-
-  if (attrs.foreground != -1) {
-    PUT(hl, "foreground", INTEGER_OBJ(attrs.foreground));
-  }
-
-  if (attrs.background != -1) {
-    PUT(hl, "background", INTEGER_OBJ(attrs.background));
-  }
-
-  if (attrs.special != -1) {
-    PUT(hl, "special", INTEGER_OBJ(attrs.special));
-  }
-
-  ADD(args, DICTIONARY_OBJ(hl));
-  push_call(ui, "highlight_set", args);
-}
-
-static void remote_ui_put(UI *ui, uint8_t *data, size_t size)
-{
-  Array args = ARRAY_DICT_INIT;
-  String str = {.data = xmemdupz(data, size), .size = size};
-  ADD(args, STRING_OBJ(str));
-  push_call(ui, "put", args);
-}
-
-static void remote_ui_bell(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "bell", args);
-}
-
-static void remote_ui_visual_bell(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "visual_bell", args);
-}
-
-static void remote_ui_update_fg(UI *ui, int fg)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(fg));
-  push_call(ui, "update_fg", args);
-}
-
-static void remote_ui_update_bg(UI *ui, int bg)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(bg));
-  push_call(ui, "update_bg", args);
-}
-
-static void remote_ui_update_sp(UI *ui, int sp)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(sp));
-  push_call(ui, "update_sp", args);
-}
-
-static void remote_ui_flush(UI *ui)
-{
-  UIData *data = ui->data;
-  channel_send_event(data->channel_id, "redraw", data->buffer);
-  data->buffer = (Array)ARRAY_DICT_INIT;
-}
-
-static void remote_ui_suspend(UI *ui)
-{
-  Array args = ARRAY_DICT_INIT;
-  push_call(ui, "suspend", args);
-}
-
-static void remote_ui_set_title(UI *ui, char *title)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, STRING_OBJ(cstr_to_string(title)));
-  push_call(ui, "set_title", args);
-}
-
-static void remote_ui_set_icon(UI *ui, char *icon)
-{
-  Array args = ARRAY_DICT_INIT;
-  ADD(args, STRING_OBJ(cstr_to_string(icon)));
-  push_call(ui, "set_icon", args);
-}
diff --git a/src/nvim/msgpack_rpc/remote_ui.h b/src/nvim/msgpack_rpc/remote_ui.h
deleted file mode 100644
index 8af86dc1b8..0000000000
--- a/src/nvim/msgpack_rpc/remote_ui.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef NVIM_MSGPACK_RPC_REMOTE_UI_H
-#define NVIM_MSGPACK_RPC_REMOTE_UI_H
-
-#include "nvim/ui.h"
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "msgpack_rpc/remote_ui.h.generated.h"
-#endif
-#endif  // NVIM_MSGPACK_RPC_REMOTE_UI_H
diff --git a/src/nvim/msgpack_rpc/server.c b/src/nvim/msgpack_rpc/server.c
index 6cc56ba3dd..abbd3e8aff 100644
--- a/src/nvim/msgpack_rpc/server.c
+++ b/src/nvim/msgpack_rpc/server.c
@@ -12,6 +12,7 @@
 #include "nvim/eval.h"
 #include "nvim/garray.h"
 #include "nvim/vim.h"
+#include "nvim/main.h"
 #include "nvim/memory.h"
 #include "nvim/log.h"
 #include "nvim/fileio.h"
@@ -108,7 +109,7 @@ int server_start(const char *endpoint)
   }
 
   SocketWatcher *watcher = xmalloc(sizeof(SocketWatcher));
-  socket_watcher_init(&loop, watcher, endpoint, NULL);
+  socket_watcher_init(&main_loop, watcher, endpoint, NULL);
 
   // Check if a watcher for the endpoint already exists
   for (int i = 0; i < watchers.ga_len; i++) {