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

remote_ui: Move handler registration to remote_ui.c

Browse Source 
Also disable deferral of attach_ui
This commit is contained in:
Thiago de Arruda 2014-12-13 09:20:00 -03:00
parent f0a944d3cf
commit 8c12292a61
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/msgpack_rpc/channel.c
View File

@ -103,14 +103,7 @@ void channel_init(void)
} }
if (abstract_ui) { if (abstract_ui) {
// Add handler for "attach_ui"
remote_ui_init(); remote_ui_init();
String method = cstr_as_string("attach_ui");
MsgpackRpcRequestHandler handler = {.fn = remote_ui_attach, .defer = true};
msgpack_rpc_add_method_handler(method, handler);
method = cstr_as_string("detach_ui");
handler.fn = remote_ui_detach;
msgpack_rpc_add_method_handler(method, handler);
} }
} }

45
src/nvim/msgpack_rpc/remote_ui.c
View File

@ -26,10 +26,32 @@ static PMap(uint64_t) *connected_uis = NULL;
void remote_ui_init(void) void remote_ui_init(void)
{ {
connected_uis = pmap_new(uint64_t)(); connected_uis = pmap_new(uint64_t)();
// Add handler for "attach_ui"
String method = cstr_as_string("attach_ui");
MsgpackRpcRequestHandler handler = {.fn = remote_ui_attach, .defer = false};
msgpack_rpc_add_method_handler(method, handler);
method = cstr_as_string("detach_ui");
handler.fn = remote_ui_detach;
msgpack_rpc_add_method_handler(method, handler);
} }
Object remote_ui_attach(uint64_t channel_id, uint64_t request_id, Array args, void remote_ui_disconnect(uint64_t channel_id)
Error *error) {
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);
free(ui->data);
ui_detach(ui);
free(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)) { if (pmap_has(uint64_t)(connected_uis, channel_id)) {
api_set_error(error, Exception, _("UI already attached for channel")); api_set_error(error, Exception, _("UI already attached for channel"));
@ -77,8 +99,8 @@ Object remote_ui_attach(uint64_t channel_id, uint64_t request_id, Array args,
return NIL; return NIL;
} }
Object remote_ui_detach(uint64_t channel_id, uint64_t request_id, Array args, static Object remote_ui_detach(uint64_t channel_id, uint64_t request_id,
Error *error) Array args, Error *error)
{ {
if (!pmap_has(uint64_t)(connected_uis, channel_id)) { if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
api_set_error(error, Exception, _("UI is not attached for channel")); api_set_error(error, Exception, _("UI is not attached for channel"));
@ -88,21 +110,6 @@ Object remote_ui_detach(uint64_t channel_id, uint64_t request_id, Array args,
return NIL; return NIL;
} }
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);
free(ui->data);
ui_detach(ui);
free(ui);
}
static void push_call(UI *ui, char *name, Array args) static void push_call(UI *ui, char *name, Array args)
{ {
Array call = ARRAY_DICT_INIT; Array call = ARRAY_DICT_INIT;