development/eovim: Updated for version 0.1.3.

Signed-off-by: Benjamin Trigona-Harany <slackbuilds@jaxartes.net>

5 files changed, 727 insertions, 21 deletions

diff --git a/development/eovim/07716.patch b/development/eovim/07716.patch
new file mode 100644
index 0000000000..a591038ac9
--- /dev/null
+++ b/development/eovim/07716.patch
@@ -0,0 +1,427 @@
+From 0771672b18c6645a7fa4de61ac106bdf3b69a04a Mon Sep 17 00:00:00 2001
+From: Jean Guyomarc'h <jean@guyomarch.bzh>
+Date: Sat, 12 Jan 2019 08:43:01 +0100
+Subject: [PATCH] nvim: handle requests initiates by neovim
+
+Neovim is able to initiate requests to the UI client (via the
+'rpcrequest()') API. Eovim is now able to run a user-defined callback
+function when a request is emitted. A request response is sent back to
+neovim. This is one step to solve #38.
+---
+ CMakeLists.txt               |   1 +
+ include/eovim/nvim.h         |  11 +++
+ include/eovim/nvim_request.h |  52 ++++++++++++++
+ src/main.c                   |   2 +
+ src/nvim.c                   |  72 +++++++++++++++++++-
+ src/nvim_api.c               |  18 ++---
+ src/nvim_request.c           | 127 +++++++++++++++++++++++++++++++++++
+ 7 files changed, 272 insertions(+), 11 deletions(-)
+ create mode 100644 include/eovim/nvim_request.h
+ create mode 100644 src/nvim_request.c
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index adf75dc..cfc6dbf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,6 +115,7 @@ add_executable(eovim
+    "${SRC_DIR}/event/cmdline.c"
+    "${SRC_DIR}/nvim_api.c"
+    "${SRC_DIR}/nvim_helper.c"
++   "${SRC_DIR}/nvim_request.c"
+    "${SRC_DIR}/plugin.c"
+    "${SRC_DIR}/options.c"
+    "${SRC_DIR}/contrib.c"
+diff --git a/include/eovim/nvim.h b/include/eovim/nvim.h
+index 13c77ab..f27e3f4 100644
+--- a/include/eovim/nvim.h
++++ b/include/eovim/nvim.h
+@@ -52,6 +52,8 @@ struct nvim
+    Eina_List *requests;
+ 
+    msgpack_unpacker unpacker;
++
++   /* The following msgpack structures must be handled on the main loop only */
+    msgpack_sbuffer sbuffer;
+    msgpack_packer packer;
+    uint32_t request_id;
+@@ -76,4 +78,13 @@ void nvim_mouse_enabled_set(s_nvim *nvim, Eina_Bool enable);
+ Eina_Bool nvim_mouse_enabled_get(const s_nvim *nvim);
+ Eina_Stringshare *nvim_eovimrc_path_get(const s_nvim *nvim);
+ 
++/**
++ * Flush the msgpack buffer to the neovim instance, by writing to its standard
++ * input
++ *
++ * @param[in] nvim The neovim handle
++ * @return EINA_TRUE on success, EINA_FALSE on failure.
++ */
++Eina_Bool nvim_flush(s_nvim *nvim);
++
+ #endif /* ! __EOVIM_NVIM_H__ */
+diff --git a/include/eovim/nvim_request.h b/include/eovim/nvim_request.h
+new file mode 100644
+index 0000000..68de980
+--- /dev/null
++++ b/include/eovim/nvim_request.h
+@@ -0,0 +1,52 @@
++/*
++ * Copyright (c) 2019 Jean Guyomarc'h
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ */
++
++#ifndef EOVIM_NVIM_REQUEST_H__
++#define EOVIM_NVIM_REQUEST_H__
++
++#include "eovim/types.h"
++
++/**
++ * Callback signature used when replying to a request.
++ *
++ * @param[in] nvim The neovim handle
++ * @param[in] args Array of arguments from the request
++ * @param[in,out] pk Msgpack packer to be used to write the error and the
++ *   result of the request. See msgpack-rpc.
++ * @return EINA_TRUE on success, EINA_FALSE on failure
++ *
++ * @note This function should not call nvim_flush(). It is automatically handled.
++ */
++typedef Eina_Bool (*f_nvim_request_cb)(s_nvim *nvim, const msgpack_object_array *args,
++                                       msgpack_packer *pk);
++
++Eina_Bool nvim_request_init(void);
++void nvim_request_shutdown(void);
++
++Eina_Bool nvim_request_add(const char *request_name, f_nvim_request_cb func);
++void nvim_request_del(const char *request_name);
++
++Eina_Bool
++nvim_request_process(s_nvim *nvim, Eina_Stringshare *request,
++                     const msgpack_object_array *args, uint32_t req_id);
++
++#endif /* ! EOVIM_NVIM_REQUEST_H__ */
+diff --git a/src/main.c b/src/main.c
+index 2708186..4beb699 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -24,6 +24,7 @@
+ #include "eovim/config.h"
+ #include "eovim/nvim.h"
+ #include "eovim/nvim_api.h"
++#include "eovim/nvim_request.h"
+ #include "eovim/nvim_event.h"
+ #include "eovim/termview.h"
+ #include "eovim/main.h"
+@@ -53,6 +54,7 @@ static const s_module _modules[] =
+    MODULE(config),
+    MODULE(keymap),
+    MODULE(nvim_api),
++   MODULE(nvim_request),
+    MODULE(nvim_event),
+    MODULE(plugin),
+    MODULE(prefs),
+diff --git a/src/nvim.c b/src/nvim.c
+index 6c9d18f..83fdee4 100644
+--- a/src/nvim.c
++++ b/src/nvim.c
+@@ -26,6 +26,7 @@
+ #include "eovim/config.h"
+ #include "eovim/nvim_api.h"
+ #include "eovim/nvim_event.h"
++#include "eovim/nvim_request.h"
+ #include "eovim/nvim_helper.h"
+ #include "eovim/log.h"
+ #include "eovim/main.h"
+@@ -53,6 +54,51 @@ _nvim_get(void)
+    return _nvim_instance;
+ }
+ 
++static Eina_Bool
++_handle_request(s_nvim *nvim, const msgpack_object_array *args)
++{
++   /* Retrieve the request identifier ****************************************/
++   if (EINA_UNLIKELY(args->ptr[1].type != MSGPACK_OBJECT_POSITIVE_INTEGER))
++     {
++        ERR("Second argument in request is expected to be an integer");
++        return EINA_FALSE;
++     }
++   const uint64_t long_req_id = args->ptr[1].via.u64;
++   if (EINA_UNLIKELY(long_req_id > UINT32_MAX))
++     {
++        ERR("Request ID '%" PRIu64 " is too big", long_req_id);
++        return EINA_FALSE;
++     }
++   const uint32_t req_id = (uint32_t)long_req_id;
++
++   /* Retrieve the request arguments *****************************************/
++   if (EINA_UNLIKELY(args->ptr[3].type != MSGPACK_OBJECT_ARRAY))
++     {
++        ERR("Fourth argument in request is expected to be an array");
++        return EINA_FALSE;
++     }
++   const msgpack_object_array *const req_args = &(args->ptr[3].via.array);
++
++   /* Retrieve the request name **********************************************/
++   if (EINA_UNLIKELY(args->ptr[2].type != MSGPACK_OBJECT_STR))
++     {
++        ERR("Third argument in request is expected to be a string");
++        return EINA_FALSE;
++     }
++   const msgpack_object_str *const str = &(args->ptr[2].via.str);
++   Eina_Stringshare *const request =
++     eina_stringshare_add_length(str->ptr, str->size);
++   if (EINA_UNLIKELY(! request))
++     {
++        ERR("Failed to create stringshare");
++        return EINA_FALSE;
++     }
++
++   const Eina_Bool ok = nvim_request_process(nvim, request, req_args, req_id);
++   eina_stringshare_del(request);
++   return ok;
++}
++
+ static Eina_Bool
+ _handle_request_response(s_nvim *nvim,
+                          const msgpack_object_array *args)
+@@ -289,6 +335,7 @@ _nvim_received_data_cb(void *data EINA_UNUSED,
+                        int   type EINA_UNUSED,
+                        void *event)
+ {
++   /* See https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md */
+    const Ecore_Exe_Event_Data *const info = event;
+    s_nvim *const nvim = _nvim_get();
+    msgpack_unpacker *const unpacker = &nvim->unpacker;
+@@ -356,11 +403,15 @@ _nvim_received_data_cb(void *data EINA_UNUSED,
+           }
+         switch (args->ptr[0].via.u64)
+           {
+-           case 1:
++           case 0: /* msgpack-rpc request */
++              _handle_request(nvim, args);
++              break;
++
++           case 1: /* msgpack-rpc response */
+               _handle_request_response(nvim, args);
+               break;
+ 
+-           case 2:
++           case 2: /* msgpack-rpc notification */
+               _handle_notification(nvim, args);
+               break;
+ 
+@@ -824,6 +875,23 @@ nvim_free(s_nvim *nvim)
+      }
+ }
+ 
++Eina_Bool nvim_flush(s_nvim *nvim)
++{
++   /* Send the data present in the msgpack buffer */
++   const Eina_Bool ok =
++     ecore_exe_send(nvim->exe, nvim->sbuffer.data, (int)nvim->sbuffer.size);
++
++   /* Now that the data is gone (hopefully), clear the buffer */
++   msgpack_sbuffer_clear(&nvim->sbuffer);
++   if (EINA_UNLIKELY(! ok))
++     {
++        CRI("Failed to send %zu bytes to neovim", nvim->sbuffer.size);
++        return EINA_FALSE;
++     }
++   DBG("Sent %zu bytes to neovim", nvim->sbuffer.size);
++   return EINA_TRUE;
++}
++
+ void
+ nvim_mouse_enabled_set(s_nvim *nvim,
+                        Eina_Bool enable)
+diff --git a/src/nvim_api.c b/src/nvim_api.c
+index 0b7e6ee..8082352 100644
+--- a/src/nvim_api.c
++++ b/src/nvim_api.c
+@@ -55,8 +55,13 @@ _request_new(s_nvim *nvim,
+    req->uid = nvim_next_uid_get(nvim);
+    DBG("Preparing request '%s' with id %"PRIu32, rpc_name, req->uid);
+ 
+-   /* Clear the serialization buffer before pushing a new request */
+-   msgpack_sbuffer_clear(&nvim->sbuffer);
++   /* The buffer MUST be empty before preparing another request. If this is not
++    * the case, something went very wrong! Discard the buffer and keep going */
++   if (EINA_UNLIKELY(nvim->sbuffer.size != 0u))
++     {
++        ERR("The buffer is not empty. I've messed up somewhere");
++        msgpack_sbuffer_clear(&nvim->sbuffer);
++     }
+ 
+    /* Keep the request around */
+    nvim->requests = eina_list_append(nvim->requests, req);
+@@ -91,19 +96,14 @@ _request_cleanup(s_nvim *nvim,
+ }
+ 
+ static Eina_Bool
+-_request_send(s_nvim *nvim,
+-              s_request *req)
++_request_send(s_nvim *nvim, s_request *req)
+ {
+    /* Finally, send that to the slave neovim process */
+-   const Eina_Bool ok =
+-     ecore_exe_send(nvim->exe, nvim->sbuffer.data, (int)nvim->sbuffer.size);
+-   if (EINA_UNLIKELY(! ok))
++   if (EINA_UNLIKELY(! nvim_flush(nvim)))
+      {
+-        CRI("Failed to send %zu bytes to neovim", nvim->sbuffer.size);
+         _request_cleanup(nvim, req);
+         return EINA_FALSE;
+      }
+-   DBG("Sent %zu bytes to neovim", nvim->sbuffer.size);
+    return EINA_TRUE;
+ }
+ 
+diff --git a/src/nvim_request.c b/src/nvim_request.c
+new file mode 100644
+index 0000000..7d34602
+--- /dev/null
++++ b/src/nvim_request.c
+@@ -0,0 +1,127 @@
++/*
++ * Copyright (c) 2019 Jean Guyomarc'h
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ */
++
++#include "eovim/nvim_request.h"
++#include "eovim/nvim.h"
++#include "eovim/log.h"
++
++static Eina_Hash *_nvim_requests;
++
++
++/*============================================================================*
++ *                                     API                                    *
++ *============================================================================*/
++
++Eina_Bool
++nvim_request_add(const char *request_name, f_nvim_request_cb func)
++{
++   Eina_Stringshare *const name = eina_stringshare_add(request_name);
++   const Eina_Bool ok = eina_hash_direct_add(_nvim_requests, name, func);
++   if (EINA_UNLIKELY(! ok))
++     {
++        ERR("Failed to register request \"%s\"", request_name);
++        return EINA_FALSE;
++     }
++   return EINA_TRUE;
++}
++
++void
++nvim_request_del(const char *request_name)
++{
++   Eina_Stringshare *const name = eina_stringshare_add(request_name);
++   eina_hash_del(_nvim_requests, name, NULL);
++   eina_stringshare_del(name);
++}
++
++Eina_Bool
++nvim_request_init(void)
++{
++   _nvim_requests = eina_hash_stringshared_new(NULL);
++   if (EINA_UNLIKELY(! _nvim_requests))
++     {
++        CRI("Failed to create hash table");
++        return EINA_FALSE;
++     }
++   return EINA_TRUE;
++}
++
++void
++nvim_request_shutdown(void)
++{
++   assert(_nvim_requests != NULL);
++   eina_hash_free(_nvim_requests);
++   _nvim_requests = NULL;
++}
++
++Eina_Bool
++nvim_request_process(s_nvim *nvim, Eina_Stringshare *request,
++                     const msgpack_object_array *args, uint32_t req_id)
++{
++   /* This function shall only be used on the main loop. Otherwise, we cannot
++    * use this packer */
++   msgpack_packer *const pk = &nvim->packer;
++
++   /* The buffer MUST be empty before preparing the response. If this is not
++    * the case, something went very wrong! Discard the buffer and keep going */
++   if (EINA_UNLIKELY(nvim->sbuffer.size != 0u))
++     {
++        ERR("The buffer is not empty. I've messed up somewhere");
++        msgpack_sbuffer_clear(&nvim->sbuffer);
++     }
++
++   /*
++    * Pack the message! It is an array of four (4) items:
++    *  - the rpc type:
++    *    - 1 is a request response
++    *  - the unique identifier of the request
++    *  - the error return
++    *  - the result return
++    *
++    * We start to reply with the two first elements. If we are not prepared to
++    * handle this request, we will finish the message with an error and no
++    * result. But if someone handles the request, it is up to the handler to
++    * finish the message by setting both the error and result.
++    */
++   msgpack_pack_array(pk, 4);
++   msgpack_pack_int(pk, 1);
++   msgpack_pack_uint32(pk, req_id);
++
++   const f_nvim_request_cb func = eina_hash_find(_nvim_requests, request);
++   if (EINA_UNLIKELY(! func))
++     {
++        WRN("No handler for request '%s'", request);
++        const char error[] = "unknown request";
++
++        /* See msgpack-rpc request response. Reply there is an error */
++        msgpack_pack_str(pk, sizeof(error) - 1u);
++        msgpack_pack_str_body(pk, error, sizeof(error) - 1u);
++        msgpack_pack_nil(pk);
++        nvim_flush(nvim);
++        return EINA_FALSE;
++     }
++   else
++     {
++        const Eina_Bool ok = func(nvim, args, pk);
++        nvim_flush(nvim);
++        return ok;
++     }
++}
diff --git a/development/eovim/7b320.patch b/development/eovim/7b320.patch
new file mode 100644
index 0000000000..a2b31e8c7f
--- /dev/null
+++ b/development/eovim/7b320.patch
@@ -0,0 +1,182 @@
+From 7b320c17b1fc8821eac411f6d6afc14e32f7e093 Mon Sep 17 00:00:00 2001
+From: Jean Guyomarc'h <jean@guyomarch.bzh>
+Date: Sat, 12 Jan 2019 08:46:44 +0100
+Subject: [PATCH] nvim: properly handle the vimenter request
+
+Fixes #38
+---
+ include/eovim/nvim_api.h    |  3 ++-
+ include/eovim/nvim_helper.h |  2 +-
+ src/nvim.c                  | 47 +++++++++++++++++++++++++++----------
+ src/nvim_api.c              |  6 +++--
+ src/nvim_helper.c           |  4 ++--
+ 5 files changed, 43 insertions(+), 19 deletions(-)
+
+diff --git a/include/eovim/nvim_api.h b/include/eovim/nvim_api.h
+index 9885ee1..ca9baab 100644
+--- a/include/eovim/nvim_api.h
++++ b/include/eovim/nvim_api.h
+@@ -27,7 +27,8 @@
+ #include <Eina.h>
+ #include <msgpack.h>
+ 
+-Eina_Bool nvim_api_ui_attach(s_nvim *nvim, unsigned int width, unsigned int height);
++Eina_Bool nvim_api_ui_attach(s_nvim *nvim, unsigned int width, unsigned int height,
++                             f_nvim_api_cb func, void *func_data);
+ Eina_Bool nvim_api_get_api_info(s_nvim *nvim, f_nvim_api_cb cb, void *data);
+ Eina_Bool nvim_api_ui_try_resize(s_nvim *nvim, unsigned int width, unsigned height);
+ Eina_Bool nvim_api_ui_ext_cmdline_set(s_nvim *nvim, Eina_Bool externalize);
+diff --git a/include/eovim/nvim_helper.h b/include/eovim/nvim_helper.h
+index b6ce5f4..9f976d5 100644
+--- a/include/eovim/nvim_helper.h
++++ b/include/eovim/nvim_helper.h
+@@ -49,6 +49,6 @@ nvim_helper_highlight_group_decode_noop(s_nvim *nvim,
+ 
+ 
+ void nvim_helper_autocmd_do(s_nvim *nvim, const char *event);
+-void nvim_helper_autocmd_vimenter_exec(s_nvim *nvim, f_nvim_api_cb func, void *func_data);
++void nvim_helper_autocmd_vimenter_exec(s_nvim *nvim);
+ 
+ #endif /* ! __EOVIM_NVIM_HELPER_H__ */
+diff --git a/src/nvim.c b/src/nvim.c
+index 83fdee4..a003a00 100644
+--- a/src/nvim.c
++++ b/src/nvim.c
+@@ -43,6 +43,8 @@ enum
+ static Ecore_Event_Handler *_event_handlers[__HANDLERS_LAST];
+ static s_nvim *_nvim_instance = NULL;
+ 
++static void _api_decode_cb(s_nvim *nvim, void *data, const msgpack_object *result);
++
+ /*============================================================================*
+  *                                 Private API                                *
+  *============================================================================*/
+@@ -278,6 +280,15 @@ _handle_notification(s_nvim *nvim,
+    return EINA_FALSE;
+ }
+ 
++static Eina_Bool
++_vimenter_request_cb(s_nvim *nvim EINA_UNUSED,
++                     const msgpack_object_array *args EINA_UNUSED,
++                     msgpack_packer *pk)
++{
++  msgpack_pack_nil(pk); /* Error */
++  msgpack_pack_nil(pk); /* Result */
++  return EINA_TRUE;
++}
+ 
+ /*============================================================================*
+  *                       Nvim Processes Events Handlers                       *
+@@ -298,6 +309,21 @@ _nvim_added_cb(void *data EINA_UNUSED,
+ 
+    const Ecore_Exe_Event_Add *const info = event;
+    INF("Process with PID %i was created", ecore_exe_pid_get(info->exe));
++
++   /* Okay, at this point the neovim process is running! Great! Now, we can
++    * start to retrieve the API information and trigger the vimenter autocmd.
++    *
++    * We can start attaching the UI on the fly.
++    * See :help ui-startup for details.
++    */
++   s_nvim *const nvim = _nvim_get();
++   nvim_api_get_api_info(nvim, _api_decode_cb, NULL);
++
++   nvim_helper_autocmd_vimenter_exec(nvim);
++   const s_geometry *const geo = &nvim->opts->geometry;
++   nvim_api_ui_attach(nvim, geo->w, geo->h, _ui_attached_cb, NULL);
++
++
+    return ECORE_CALLBACK_PASS_ON;
+ }
+ 
+@@ -438,6 +464,7 @@ _nvim_received_error_cb(void *data EINA_UNUSED,
+    return ECORE_CALLBACK_PASS_ON;
+ }
+ 
++/* FIXME this is soooooo fragile */
+ static void
+ _nvim_runtime_load(s_nvim *nvim,
+                    const char *filename)
+@@ -653,16 +680,6 @@ _api_decode_cb(s_nvim *nvim, void *data EINA_UNUSED, const msgpack_object *resul
+   _virtual_interface_setup(nvim);
+ }
+ 
+-static void
+-_vimenter_cb(s_nvim *nvim,
+-             void *data EINA_UNUSED,
+-             const msgpack_object *result EINA_UNUSED)
+-{
+-  _nvim_builtin_runtime_load(nvim);
+-  _nvim_eovimrc_load(nvim);
+-  nvim_api_var_integer_set(nvim, "eovim_running", 1);
+-}
+-
+ static void
+ _nvim_plugins_load(s_nvim *nvim)
+ {
+@@ -815,6 +832,9 @@ nvim_new(const s_options *opts,
+    /* Initialize the virtual interface to safe values (non-NULL pointers) */
+    _virtual_interface_init(nvim);
+ 
++   /* Add a callback to the vimenter request */
++   nvim_request_add("vimenter", _vimenter_request_cb);
++
+    /* Create the neovim process */
+    nvim->exe = ecore_exe_pipe_run(
+       eina_strbuf_string_get(cmdline),
+@@ -831,9 +851,10 @@ nvim_new(const s_options *opts,
+    DBG("Running %s", eina_strbuf_string_get(cmdline));
+    eina_strbuf_free(cmdline);
+ 
+-   nvim_api_get_api_info(nvim, _api_decode_cb, NULL);
+-   nvim_helper_autocmd_vimenter_exec(nvim, _vimenter_cb, NULL);
+-   nvim_api_ui_attach(nvim, opts->geometry.w, opts->geometry.h);
++   /* FIXME These are sooo fragile. Rework that!!! */
++   _nvim_builtin_runtime_load(nvim);
++   _nvim_eovimrc_load(nvim);
++   nvim_api_var_integer_set(nvim, "eovim_running", 1);
+ 
+    /* Create the GUI window */
+    if (EINA_UNLIKELY(! gui_add(&nvim->gui, nvim)))
+diff --git a/src/nvim_api.c b/src/nvim_api.c
+index 8082352..cf93577 100644
+--- a/src/nvim_api.c
++++ b/src/nvim_api.c
+@@ -138,8 +138,8 @@ void nvim_api_request_call(s_nvim *nvim,
+ 
+ Eina_Bool
+ nvim_api_ui_attach(s_nvim *nvim,
+-                   unsigned int width,
+-                   unsigned int height)
++                   unsigned int width, unsigned int height,
++                   f_nvim_api_cb func, void *func_data)
+ {
+    const char api[] = "nvim_ui_attach";
+    s_request *const req = _request_new(nvim, api, sizeof(api) - 1);
+@@ -148,6 +148,8 @@ nvim_api_ui_attach(s_nvim *nvim,
+         CRI("Failed to create request");
+         return EINA_FALSE;
+      }
++   req->cb.func = func;
++   req->cb.data = func_data;
+ 
+    const s_config *const cfg = nvim->config;
+ 
+diff --git a/src/nvim_helper.c b/src/nvim_helper.c
+index 7199203..2ec09fb 100644
+--- a/src/nvim_helper.c
++++ b/src/nvim_helper.c
+@@ -134,11 +134,11 @@ nvim_helper_autocmd_do(s_nvim *nvim,
+ }
+ 
+ void
+-nvim_helper_autocmd_vimenter_exec(s_nvim *nvim, f_nvim_api_cb func, void *func_data)
++nvim_helper_autocmd_vimenter_exec(s_nvim *nvim)
+ {
+   const char cmd[] = "autocmd VimEnter * call rpcrequest(1, 'vimenter')";
+   const Eina_Bool ok =
+-    nvim_api_command(nvim, cmd, sizeof(cmd) - 1u, func, func_data);
++    nvim_api_command(nvim, cmd, sizeof(cmd) - 1u, NULL, NULL);
+   if (EINA_UNLIKELY(! ok))
+   { ERR("Failed to execute: %s", cmd); }
+ }
diff --git a/development/eovim/dd8f0.patch b/development/eovim/dd8f0.patch
new file mode 100644
index 0000000000..9b9722a037
--- /dev/null
+++ b/development/eovim/dd8f0.patch
@@ -0,0 +1,107 @@
+From dd8f0d3fff4951cd7b7ea294823b8e377024c2ff Mon Sep 17 00:00:00 2001
+From: Jean Guyomarc'h <jean@guyomarch.bzh>
+Date: Sat, 12 Jan 2019 08:47:35 +0100
+Subject: [PATCH] gui: make an overlay fade when the UI is attached to neovim
+
+---
+ data/themes/default.edc | 29 +++++++++++++++++++++++++++++
+ include/eovim/gui.h     |  1 +
+ src/gui.c               |  5 +++++
+ src/nvim.c              |  9 +++++++--
+ 4 files changed, 42 insertions(+), 2 deletions(-)
+
+diff --git a/data/themes/default.edc b/data/themes/default.edc
+index 27703fc..7f8d0e3 100644
+--- a/data/themes/default.edc
++++ b/data/themes/default.edc
+@@ -430,6 +430,19 @@ collections {
+                visible: 0;
+             }
+          }
++
++         rect { "overlay"; nomouse;
++            desc { "default";
++               color: 40 40 40 255;;
++            }
++            desc { "fade";
++               color: 40 40 40 0;
++            }
++            desc { "faded";
++               inherit: "fade";
++               visible: 0; /* Make sure it is killed */
++            }
++         }
+       }
+ 
+       programs {
+@@ -437,6 +450,22 @@ collections {
+             action: PLAY_SAMPLE "bell" 1.0 ALERT;
+          }
+ 
++         /* [OVERLAY FADING] **************************************************
++          * When eovim starts, we push an overlay that covers the whole window.
++          * When neovim is successfully attached to the UI, we make the overlay
++          * fade away, so we can begin to use neovim. */
++         program { signal: "eovim,ready"; source: "eovim";
++            action: STATE_SET "fade";
++            target: "overlay";
++            transition: ACCELERATE 0.2;
++            after: "eovim_overlay_faded";
++         }
++         program { name: "eovim_overlay_faded";
++            action: STATE_SET "faded";
++            target: "overlay";
++         }
++         /* END OVERLAY FADING ***********************************************/
++
+          program { signal: "eovim,cmdline,show"; source: "eovim";
+             action: STATE_SET "default";
+             target: "eovim.cmdline";
+diff --git a/include/eovim/gui.h b/include/eovim/gui.h
+index f05fb97..981e957 100644
+--- a/include/eovim/gui.h
++++ b/include/eovim/gui.h
+@@ -192,6 +192,7 @@ void gui_caps_lock_alert(s_gui *gui);
+ void gui_caps_lock_dismiss(s_gui *gui);
+ Eina_Bool gui_caps_lock_warning_get(const s_gui *gui);
+ 
++void gui_ready_set(s_gui *gui);
+ void gui_mode_update(s_gui *gui, const s_mode *mode);
+ 
+ #endif /* ! __EOVIM_GUI_H__ */
+diff --git a/src/gui.c b/src/gui.c
+index 96dcdcd..efd476b 100644
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -893,6 +893,11 @@ gui_bell_ring(s_gui *gui)
+      elm_layout_signal_emit(gui->layout, "eovim,bell,ring", "eovim");
+ }
+ 
++void gui_ready_set(s_gui *gui)
++{
++   elm_layout_signal_emit(gui->layout, "eovim,ready", "eovim");
++}
++
+ static void
+ _compl_item_del(void *data,
+                 Evas_Object *obj EINA_UNUSED)
+diff --git a/src/nvim.c b/src/nvim.c
+index a003a00..dcf263d 100644
+--- a/src/nvim.c
++++ b/src/nvim.c
+@@ -49,8 +49,13 @@ static void _api_decode_cb(s_nvim *nvim, void *data, const msgpack_object *resul
+  *                                 Private API                                *
+  *============================================================================*/
+ 
+-static inline s_nvim *
+-_nvim_get(void)
++static void _ui_attached_cb(s_nvim *nvim, void *data EINA_UNUSED,
++                            const msgpack_object *result EINA_UNUSED)
++{
++  gui_ready_set(&nvim->gui);
++}
++
++static inline s_nvim *_nvim_get(void)
+ {
+    /* We handle only one neovim instance */
+    return _nvim_instance;
diff --git a/development/eovim/eovim.SlackBuild b/development/eovim/eovim.SlackBuild
index 39bbb984a8..3eaaa8b9a6 100644
--- a/development/eovim/eovim.SlackBuild
+++ b/development/eovim/eovim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for eovim
 
-# Copyright 2018 Benjamin Trigona-Harany
+# Copyright 2018-2019 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=eovim
-VERSION=${VERSION:-0.1.2}
+VERSION=${VERSION:-0.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,31 +69,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cat >> src/main.c <<'code'
-static void __attribute__((constructor))
-__constructor(void)
-{
-   const char bt_env[] = "EINA_LOG_BACKTRACE";
-   if (! getenv(bt_env))
-     setenv(bt_env, "-1", 1);
-}
-code
-
-sed -i "s/edje_object_signal_emit(gui/elm_layout_signal_emit(gui/" src/gui.c
+patch -p1 < $CWD/7b320.patch
+patch -p1 < $CWD/07716.patch
+patch -p1 < $CWD/dd8f0.patch
 
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release ..
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
+    ..
   make install DESTDIR=$PKG
 cd ..
 
-if [ "$LIBDIRSUFFIX" != "" ]; then
-    mv $PKG/usr/lib{,$LIBDIRSUFFIX}
-fi
-
 mv $PKG/usr/share/man $PKG/usr/man
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/development/eovim/eovim.info b/development/eovim/eovim.info
index 4d10fcf9bb..cdaa0982bf 100644
--- a/development/eovim/eovim.info
+++ b/development/eovim/eovim.info
@@ -1,8 +1,8 @@
 PRGNAM="eovim"
-VERSION="0.1.2"
+VERSION="0.1.3"
 HOMEPAGE="https://github.com/jeanguyomarch/eovim"
-DOWNLOAD="https://github.com/jeanguyomarch/eovim/archive/v0.1.2/eovim-0.1.2.tar.gz"
-MD5SUM="af551e6241f0cacc63d6beca2d7bc0fc"
+DOWNLOAD="https://github.com/jeanguyomarch/eovim/archive/v0.1.3/eovim-0.1.3.tar.gz"
+MD5SUM="c4f833fa94c483d20d83eb83b48c4c23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="efl neovim"