diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-16 23:42:25 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-16 23:42:25 -0300 |
| commit | 0429857689ba98356bc80d01ebd540fe861e8db2 (patch) | |
| tree | b4d039dba9e18a041b00cfe31d954931a97241dd /src/nvim/msgpack_rpc | |
| parent | af46564dd6e7e709f269f041f749dc312d9c3773 (diff) | |
| parent | 40b7990553997d9eabb21b746346356016b373c5 (diff) | |
| download | rneovim-0429857689ba98356bc80d01ebd540fe861e8db2.tar.gz rneovim-0429857689ba98356bc80d01ebd540fe861e8db2.tar.bz2 rneovim-0429857689ba98356bc80d01ebd540fe861e8db2.zip | |
Merge PR #1820 'Reimplement builtin terminal UI with termkey/unibilium'
Diffstat (limited to 'src/nvim/msgpack_rpc')
| -rw-r--r-- | src/nvim/msgpack_rpc/channel.c | 16 | ||||
| -rw-r--r-- | src/nvim/msgpack_rpc/helpers.c | 16 |
2 files changed, 2 insertions, 30 deletions
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index 7ae45ee84a..58c181e4de 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -103,9 +103,7 @@ void channel_init(void) channel_from_stdio(); } - if (abstract_ui) { - remote_ui_init(); - } + remote_ui_init(); } /// Teardown the module @@ -176,13 +174,6 @@ void channel_from_stream(uv_stream_t *stream) channel->data.streams.uv = stream; } -bool channel_exists(uint64_t id) -{ - Channel *channel; - return (channel = pmap_get(uint64_t)(channels, id)) != NULL - && !channel->closed; -} - /// Sends event/arguments to channel /// /// @param id The channel id. If 0, the event will be sent to all @@ -665,10 +656,7 @@ static void on_stdio_close(Event e) static void free_channel(Channel *channel) { - if (abstract_ui) { - remote_ui_disconnect(channel->id); - } - + remote_ui_disconnect(channel->id); pmap_del(uint64_t)(channels, channel->id); msgpack_unpacker_free(channel->unpacker); diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c index 54e8b83cd0..355176aa5f 100644 --- a/src/nvim/msgpack_rpc/helpers.c +++ b/src/nvim/msgpack_rpc/helpers.c @@ -295,22 +295,6 @@ void msgpack_rpc_from_dictionary(Dictionary result, msgpack_packer *res) } } -/// Finishes the msgpack-rpc call with an error message. -/// -/// @param msg The error message -/// @param res A packer that contains the response -void msgpack_rpc_error(char *msg, msgpack_packer *res) - FUNC_ATTR_NONNULL_ALL -{ - size_t len = strlen(msg); - - // error message - msgpack_pack_bin(res, len); - msgpack_pack_bin_body(res, msg, len); - // Nil result - msgpack_pack_nil(res); -} - /// Handler executed when an invalid method name is passed Object msgpack_rpc_handle_missing_method(uint64_t channel_id, uint64_t request_id, |