Commits

Rui Abreu Ferreira  committed 8cbf18a

Update bindings to use tarruda/redraw-events

  • Participants
  • Parent commits 25ef755
  • Branches tb-gui

Comments (0)

Files changed (4)

File src/auto/function_enum.h

-// Auto generated Fri May 30 17:18:13 2014
+// Auto generated Mon Jun 9 22:47:31 2014
 enum FunctionId {
 	NEOVIM_FN_TABPAGE_GET_WINDOWS,
 	NEOVIM_FN_TABPAGE_GET_VAR,
 	NEOVIM_FN_TABPAGE_SET_VAR,
 	NEOVIM_FN_TABPAGE_GET_WINDOW,
 	NEOVIM_FN_TABPAGE_IS_VALID,
+	NEOVIM_FN_VIM_PUSH_KEYS,
+	NEOVIM_FN_VIM_COMMAND,
+	NEOVIM_FN_VIM_COMMAND_OUTPUT,
+	NEOVIM_FN_VIM_EVAL,
+	NEOVIM_FN_VIM_STRWIDTH,
+	NEOVIM_FN_VIM_LIST_RUNTIME_PATHS,
+	NEOVIM_FN_VIM_CHANGE_DIRECTORY,
+	NEOVIM_FN_VIM_GET_CURRENT_LINE,
+	NEOVIM_FN_VIM_SET_CURRENT_LINE,
+	NEOVIM_FN_VIM_DEL_CURRENT_LINE,
+	NEOVIM_FN_VIM_GET_VAR,
+	NEOVIM_FN_VIM_SET_VAR,
+	NEOVIM_FN_VIM_GET_VVAR,
+	NEOVIM_FN_VIM_GET_OPTION,
+	NEOVIM_FN_VIM_SET_OPTION,
+	NEOVIM_FN_VIM_OUT_WRITE,
+	NEOVIM_FN_VIM_ERR_WRITE,
+	NEOVIM_FN_VIM_GET_BUFFERS,
+	NEOVIM_FN_VIM_GET_CURRENT_BUFFER,
+	NEOVIM_FN_VIM_SET_CURRENT_BUFFER,
+	NEOVIM_FN_VIM_GET_WINDOWS,
+	NEOVIM_FN_VIM_GET_CURRENT_WINDOW,
+	NEOVIM_FN_VIM_SET_CURRENT_WINDOW,
+	NEOVIM_FN_VIM_GET_TABPAGES,
+	NEOVIM_FN_VIM_GET_CURRENT_TABPAGE,
+	NEOVIM_FN_VIM_SET_CURRENT_TABPAGE,
+	NEOVIM_FN_VIM_SUBSCRIBE,
+	NEOVIM_FN_VIM_UNSUBSCRIBE,
+	NEOVIM_FN_VIM_REQUEST_SCREEN,
 	NEOVIM_FN_BUFFER_GET_LENGTH,
 	NEOVIM_FN_BUFFER_GET_LINE,
 	NEOVIM_FN_BUFFER_SET_LINE,
 	NEOVIM_FN_WINDOW_GET_POSITION,
 	NEOVIM_FN_WINDOW_GET_TABPAGE,
 	NEOVIM_FN_WINDOW_IS_VALID,
-	NEOVIM_FN_VIM_PUSH_KEYS,
-	NEOVIM_FN_VIM_COMMAND,
-	NEOVIM_FN_VIM_EVAL,
-	NEOVIM_FN_VIM_STRWIDTH,
-	NEOVIM_FN_VIM_LIST_RUNTIME_PATHS,
-	NEOVIM_FN_VIM_CHANGE_DIRECTORY,
-	NEOVIM_FN_VIM_GET_CURRENT_LINE,
-	NEOVIM_FN_VIM_DEL_CURRENT_LINE,
-	NEOVIM_FN_VIM_SET_CURRENT_LINE,
-	NEOVIM_FN_VIM_GET_VAR,
-	NEOVIM_FN_VIM_SET_VAR,
-	NEOVIM_FN_VIM_GET_VVAR,
-	NEOVIM_FN_VIM_GET_OPTION,
-	NEOVIM_FN_VIM_SET_OPTION,
-	NEOVIM_FN_VIM_OUT_WRITE,
-	NEOVIM_FN_VIM_ERR_WRITE,
-	NEOVIM_FN_VIM_GET_BUFFERS,
-	NEOVIM_FN_VIM_GET_CURRENT_BUFFER,
-	NEOVIM_FN_VIM_SET_CURRENT_BUFFER,
-	NEOVIM_FN_VIM_GET_WINDOWS,
-	NEOVIM_FN_VIM_GET_CURRENT_WINDOW,
-	NEOVIM_FN_VIM_SET_CURRENT_WINDOW,
-	NEOVIM_FN_VIM_GET_TABPAGES,
-	NEOVIM_FN_VIM_GET_CURRENT_TABPAGE,
-	NEOVIM_FN_VIM_SET_CURRENT_TABPAGE,
-	NEOVIM_FN_VIM_SUBSCRIBE,
-	NEOVIM_FN_VIM_UNSUBSCRIBE,
 	NEOVIM_FN_NULL
 };

File src/auto/function_static.cpp

-// Auto generated Fri May 30 17:18:13 2014
+// Auto generated Mon Jun 9 22:47:31 2014
 const QList<Function> Function::knownFunctions = QList<Function>()
 << Function("WindowArray", "tabpage_get_windows",
 	QList<QString>()
 	QList<QString>()
 		<< QString("Tabpage")
 	, 0)
+<< Function("void", "vim_push_keys",
+	QList<QString>()
+		<< QString("String")
+	, 0)
+<< Function("void", "vim_command",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("String", "vim_command_output",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("Object", "vim_eval",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("Integer", "vim_strwidth",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("StringArray", "vim_list_runtime_paths",
+	QList<QString>()
+	, 0)
+<< Function("void", "vim_change_directory",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("String", "vim_get_current_line",
+	QList<QString>()
+	, 1)
+<< Function("void", "vim_set_current_line",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("void", "vim_del_current_line",
+	QList<QString>()
+	, 1)
+<< Function("Object", "vim_get_var",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("Object", "vim_set_var",
+	QList<QString>()
+		<< QString("String")
+		<< QString("Object")
+	, 1)
+<< Function("Object", "vim_get_vvar",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("Object", "vim_get_option",
+	QList<QString>()
+		<< QString("String")
+	, 1)
+<< Function("void", "vim_set_option",
+	QList<QString>()
+		<< QString("String")
+		<< QString("Object")
+	, 1)
+<< Function("void", "vim_out_write",
+	QList<QString>()
+		<< QString("String")
+	, 0)
+<< Function("void", "vim_err_write",
+	QList<QString>()
+		<< QString("String")
+	, 0)
+<< Function("BufferArray", "vim_get_buffers",
+	QList<QString>()
+	, 0)
+<< Function("Buffer", "vim_get_current_buffer",
+	QList<QString>()
+	, 0)
+<< Function("void", "vim_set_current_buffer",
+	QList<QString>()
+		<< QString("Buffer")
+	, 1)
+<< Function("WindowArray", "vim_get_windows",
+	QList<QString>()
+	, 0)
+<< Function("Window", "vim_get_current_window",
+	QList<QString>()
+	, 0)
+<< Function("void", "vim_set_current_window",
+	QList<QString>()
+		<< QString("Window")
+	, 1)
+<< Function("TabpageArray", "vim_get_tabpages",
+	QList<QString>()
+	, 0)
+<< Function("Tabpage", "vim_get_current_tabpage",
+	QList<QString>()
+	, 0)
+<< Function("void", "vim_set_current_tabpage",
+	QList<QString>()
+		<< QString("Tabpage")
+	, 1)
+<< Function("void", "vim_subscribe",
+	QList<QString>()
+		<< QString("String")
+	, 0)
+<< Function("void", "vim_unsubscribe",
+	QList<QString>()
+		<< QString("String")
+	, 0)
+<< Function("void", "vim_request_screen",
+	QList<QString>()
+	, 0)
 << Function("Integer", "buffer_get_length",
 	QList<QString>()
 		<< QString("Buffer")
 	QList<QString>()
 		<< QString("Window")
 	, 0)
-<< Function("void", "vim_push_keys",
-	QList<QString>()
-		<< QString("String")
-	, 0)
-<< Function("void", "vim_command",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("Object", "vim_eval",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("Integer", "vim_strwidth",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("StringArray", "vim_list_runtime_paths",
-	QList<QString>()
-	, 0)
-<< Function("void", "vim_change_directory",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("String", "vim_get_current_line",
-	QList<QString>()
-	, 1)
-<< Function("void", "vim_del_current_line",
-	QList<QString>()
-	, 1)
-<< Function("void", "vim_set_current_line",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("Object", "vim_get_var",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("Object", "vim_set_var",
-	QList<QString>()
-		<< QString("String")
-		<< QString("Object")
-	, 1)
-<< Function("Object", "vim_get_vvar",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("Object", "vim_get_option",
-	QList<QString>()
-		<< QString("String")
-	, 1)
-<< Function("void", "vim_set_option",
-	QList<QString>()
-		<< QString("String")
-		<< QString("Object")
-	, 1)
-<< Function("void", "vim_out_write",
-	QList<QString>()
-		<< QString("String")
-	, 0)
-<< Function("void", "vim_err_write",
-	QList<QString>()
-		<< QString("String")
-	, 0)
-<< Function("BufferArray", "vim_get_buffers",
-	QList<QString>()
-	, 0)
-<< Function("Buffer", "vim_get_current_buffer",
-	QList<QString>()
-	, 0)
-<< Function("void", "vim_set_current_buffer",
-	QList<QString>()
-		<< QString("Buffer")
-	, 1)
-<< Function("WindowArray", "vim_get_windows",
-	QList<QString>()
-	, 0)
-<< Function("Window", "vim_get_current_window",
-	QList<QString>()
-	, 0)
-<< Function("void", "vim_set_current_window",
-	QList<QString>()
-		<< QString("Window")
-	, 1)
-<< Function("TabpageArray", "vim_get_tabpages",
-	QList<QString>()
-	, 0)
-<< Function("Tabpage", "vim_get_current_tabpage",
-	QList<QString>()
-	, 0)
-<< Function("void", "vim_set_current_tabpage",
-	QList<QString>()
-		<< QString("Tabpage")
-	, 1)
-<< Function("void", "vim_subscribe",
-	QList<QString>()
-		<< QString("String")
-	, 0)
-<< Function("void", "vim_unsubscribe",
-	QList<QString>()
-		<< QString("String")
-	, 0)
 	;

File src/auto/neovim.cpp

-// Auto generated Fri May 30 17:18:13 2014
+// Auto generated Mon Jun 9 22:47:31 2014
 #include "neovim.h"
 #include "neovimconnector.h"
 namespace NeovimQt {
 	m_c->send(tabpage);
 }
 
+void Neovim::vim_push_keys(String str)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_PUSH_KEYS, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(str);
+}
+
+void Neovim::vim_command(String str)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_COMMAND, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(str);
+}
+
+void Neovim::vim_command_output(String str)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_COMMAND_OUTPUT, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(str);
+}
+
+void Neovim::vim_eval(String str)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_EVAL, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(str);
+}
+
+void Neovim::vim_strwidth(String str)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_STRWIDTH, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(str);
+}
+
+void Neovim::vim_list_runtime_paths()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_LIST_RUNTIME_PATHS, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_change_directory(String dir)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_CHANGE_DIRECTORY, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(dir);
+}
+
+void Neovim::vim_get_current_line()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_LINE, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_set_current_line(String line)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_LINE, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(line);
+}
+
+void Neovim::vim_del_current_line()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_DEL_CURRENT_LINE, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_get_var(String name)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_VAR, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(name);
+}
+
+void Neovim::vim_set_var(String name, Object value)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_VAR, 2);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(name);
+	m_c->send(value);
+}
+
+void Neovim::vim_get_vvar(String name)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_VVAR, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(name);
+}
+
+void Neovim::vim_get_option(String name)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_OPTION, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(name);
+}
+
+void Neovim::vim_set_option(String name, Object value)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_OPTION, 2);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(name);
+	m_c->send(value);
+}
+
+void Neovim::vim_out_write(String str)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_OUT_WRITE, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(str);
+}
+
+void Neovim::vim_err_write(String str)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_ERR_WRITE, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(str);
+}
+
+void Neovim::vim_get_buffers()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_BUFFERS, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_get_current_buffer()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_BUFFER, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_set_current_buffer(Buffer buffer)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_BUFFER, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(buffer);
+}
+
+void Neovim::vim_get_windows()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_WINDOWS, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_get_current_window()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_WINDOW, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_set_current_window(Window window)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_WINDOW, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(window);
+}
+
+void Neovim::vim_get_tabpages()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_TABPAGES, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_get_current_tabpage()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_TABPAGE, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
+void Neovim::vim_set_current_tabpage(Tabpage tabpage)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_TABPAGE, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(tabpage);
+}
+
+void Neovim::vim_subscribe(String event)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SUBSCRIBE, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(event);
+}
+
+void Neovim::vim_unsubscribe(String event)
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_UNSUBSCRIBE, 1);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+	m_c->send(event);
+}
+
+void Neovim::vim_request_screen()
+{
+	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_REQUEST_SCREEN, 0);
+	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
+}
+
 void Neovim::buffer_get_length(Buffer buffer)
 {
 	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_LENGTH, 1);
 	m_c->send(window);
 }
 
-void Neovim::vim_push_keys(String str)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_PUSH_KEYS, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(str);
-}
-
-void Neovim::vim_command(String str)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_COMMAND, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(str);
-}
-
-void Neovim::vim_eval(String str)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_EVAL, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(str);
-}
-
-void Neovim::vim_strwidth(String str)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_STRWIDTH, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(str);
-}
-
-void Neovim::vim_list_runtime_paths()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_LIST_RUNTIME_PATHS, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_change_directory(String dir)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_CHANGE_DIRECTORY, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(dir);
-}
-
-void Neovim::vim_get_current_line()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_LINE, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_del_current_line()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_DEL_CURRENT_LINE, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_set_current_line(String line)
+void Neovim::handleResponse(uint32_t msgid, Function::FunctionId fun, bool failed, const msgpack_object& res)
 {
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_LINE, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(line);
-}
-
-void Neovim::vim_get_var(String name)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_VAR, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(name);
-}
-
-void Neovim::vim_set_var(String name, Object value)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_VAR, 2);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(name);
-	m_c->send(value);
-}
-
-void Neovim::vim_get_vvar(String name)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_VVAR, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(name);
-}
-
-void Neovim::vim_get_option(String name)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_OPTION, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(name);
-}
-
-void Neovim::vim_set_option(String name, Object value)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_OPTION, 2);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(name);
-	m_c->send(value);
-}
-
-void Neovim::vim_out_write(String str)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_OUT_WRITE, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(str);
-}
-
-void Neovim::vim_err_write(String str)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_ERR_WRITE, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(str);
-}
-
-void Neovim::vim_get_buffers()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_BUFFERS, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_get_current_buffer()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_BUFFER, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_set_current_buffer(Buffer buffer)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_BUFFER, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(buffer);
-}
-
-void Neovim::vim_get_windows()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_WINDOWS, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_get_current_window()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_WINDOW, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_set_current_window(Window window)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_WINDOW, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(window);
-}
-
-void Neovim::vim_get_tabpages()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_TABPAGES, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_get_current_tabpage()
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_CURRENT_TABPAGE, 0);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-}
-
-void Neovim::vim_set_current_tabpage(Tabpage tabpage)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_TABPAGE, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(tabpage);
-}
-
-void Neovim::vim_subscribe(String event)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SUBSCRIBE, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(event);
-}
-
-void Neovim::vim_unsubscribe(String event)
-{
-	NeovimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_UNSUBSCRIBE, 1);
-	connect(r, &NeovimRequest::finished, this, &Neovim::handleResponse);
-	m_c->send(event);
-}
-
-void Neovim::handleResponse(uint32_t msgid, Function::FunctionId fun, bool failed, const msgpack_object& res)
-{
-	bool convfail=true;
-	if (failed) {
-		emit error(m_c->to_String(res));
-		return;
-	}
+	bool convfail=true;
+	if (failed) {
+		emit error(m_c->to_String(res));
+		return;
+	}
 
 	switch(fun) {
 	case Function::NEOVIM_FN_TABPAGE_GET_WINDOWS:
 			}
 		}
 		break;
-	case Function::NEOVIM_FN_TABPAGE_GET_WINDOW:
+	case Function::NEOVIM_FN_TABPAGE_GET_WINDOW:
+		{
+			Window data = m_c->to_Window(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal tabpage_get_window";
+			} else {
+				qDebug() << "tabpage_get_window ->" << data;
+				emit on_tabpage_get_window(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_TABPAGE_IS_VALID:
+		{
+			Boolean data = m_c->to_Boolean(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal tabpage_is_valid";
+			} else {
+				qDebug() << "tabpage_is_valid ->" << data;
+				emit on_tabpage_is_valid(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_PUSH_KEYS:
+		{
+			qDebug() << "on_vim_push_keys";
+			emit on_vim_push_keys();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_COMMAND:
+		{
+			qDebug() << "on_vim_command";
+			emit on_vim_command();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_COMMAND_OUTPUT:
+		{
+			String data = m_c->to_String(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_command_output";
+			} else {
+				qDebug() << "vim_command_output ->" << data;
+				emit on_vim_command_output(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_EVAL:
+		{
+			Object data = m_c->to_Object(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_eval";
+			} else {
+				qDebug() << "vim_eval ->" << data;
+				emit on_vim_eval(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_STRWIDTH:
+		{
+			Integer data = m_c->to_Integer(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_strwidth";
+			} else {
+				qDebug() << "vim_strwidth ->" << data;
+				emit on_vim_strwidth(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_LIST_RUNTIME_PATHS:
+		{
+			StringArray data = m_c->to_StringArray(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_list_runtime_paths";
+			} else {
+				qDebug() << "vim_list_runtime_paths ->" << data;
+				emit on_vim_list_runtime_paths(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_CHANGE_DIRECTORY:
+		{
+			qDebug() << "on_vim_change_directory";
+			emit on_vim_change_directory();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_CURRENT_LINE:
+		{
+			String data = m_c->to_String(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_current_line";
+			} else {
+				qDebug() << "vim_get_current_line ->" << data;
+				emit on_vim_get_current_line(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_SET_CURRENT_LINE:
+		{
+			qDebug() << "on_vim_set_current_line";
+			emit on_vim_set_current_line();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_DEL_CURRENT_LINE:
+		{
+			qDebug() << "on_vim_del_current_line";
+			emit on_vim_del_current_line();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_VAR:
+		{
+			Object data = m_c->to_Object(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_var";
+			} else {
+				qDebug() << "vim_get_var ->" << data;
+				emit on_vim_get_var(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_SET_VAR:
+		{
+			Object data = m_c->to_Object(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_set_var";
+			} else {
+				qDebug() << "vim_set_var ->" << data;
+				emit on_vim_set_var(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_VVAR:
+		{
+			Object data = m_c->to_Object(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_vvar";
+			} else {
+				qDebug() << "vim_get_vvar ->" << data;
+				emit on_vim_get_vvar(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_OPTION:
+		{
+			Object data = m_c->to_Object(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_option";
+			} else {
+				qDebug() << "vim_get_option ->" << data;
+				emit on_vim_get_option(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_SET_OPTION:
+		{
+			qDebug() << "on_vim_set_option";
+			emit on_vim_set_option();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_OUT_WRITE:
+		{
+			qDebug() << "on_vim_out_write";
+			emit on_vim_out_write();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_ERR_WRITE:
+		{
+			qDebug() << "on_vim_err_write";
+			emit on_vim_err_write();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_BUFFERS:
+		{
+			BufferArray data = m_c->to_BufferArray(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_buffers";
+			} else {
+				qDebug() << "vim_get_buffers ->" << data;
+				emit on_vim_get_buffers(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_CURRENT_BUFFER:
+		{
+			Buffer data = m_c->to_Buffer(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_current_buffer";
+			} else {
+				qDebug() << "vim_get_current_buffer ->" << data;
+				emit on_vim_get_current_buffer(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_SET_CURRENT_BUFFER:
+		{
+			qDebug() << "on_vim_set_current_buffer";
+			emit on_vim_set_current_buffer();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_WINDOWS:
+		{
+			WindowArray data = m_c->to_WindowArray(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_windows";
+			} else {
+				qDebug() << "vim_get_windows ->" << data;
+				emit on_vim_get_windows(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_CURRENT_WINDOW:
+		{
+			Window data = m_c->to_Window(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_current_window";
+			} else {
+				qDebug() << "vim_get_current_window ->" << data;
+				emit on_vim_get_current_window(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_SET_CURRENT_WINDOW:
+		{
+			qDebug() << "on_vim_set_current_window";
+			emit on_vim_set_current_window();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_TABPAGES:
+		{
+			TabpageArray data = m_c->to_TabpageArray(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_tabpages";
+			} else {
+				qDebug() << "vim_get_tabpages ->" << data;
+				emit on_vim_get_tabpages(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_GET_CURRENT_TABPAGE:
+		{
+			Tabpage data = m_c->to_Tabpage(res, &convfail);
+			if (convfail) {
+				qWarning() << "Error unpacking data for signal vim_get_current_tabpage";
+			} else {
+				qDebug() << "vim_get_current_tabpage ->" << data;
+				emit on_vim_get_current_tabpage(data);
+			}
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_SET_CURRENT_TABPAGE:
+		{
+			qDebug() << "on_vim_set_current_tabpage";
+			emit on_vim_set_current_tabpage();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_SUBSCRIBE:
+		{
+			qDebug() << "on_vim_subscribe";
+			emit on_vim_subscribe();
+		}
+		break;
+	case Function::NEOVIM_FN_VIM_UNSUBSCRIBE:
 		{
-			Window data = m_c->to_Window(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal tabpage_get_window";
-			} else {
-				qDebug() << "tabpage_get_window ->" << data;
-				emit on_tabpage_get_window(data);
-			}
+			qDebug() << "on_vim_unsubscribe";
+			emit on_vim_unsubscribe();
 		}
 		break;
-	case Function::NEOVIM_FN_TABPAGE_IS_VALID:
+	case Function::NEOVIM_FN_VIM_REQUEST_SCREEN:
 		{
-			Boolean data = m_c->to_Boolean(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal tabpage_is_valid";
-			} else {
-				qDebug() << "tabpage_is_valid ->" << data;
-				emit on_tabpage_is_valid(data);
-			}
+			qDebug() << "on_vim_request_screen";
+			emit on_vim_request_screen();
 		}
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_LENGTH:
 			}
 		}
 		break;
-	case Function::NEOVIM_FN_VIM_PUSH_KEYS:
-		{
-			qDebug() << "on_vim_push_keys";
-			emit on_vim_push_keys();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_COMMAND:
-		{
-			qDebug() << "on_vim_command";
-			emit on_vim_command();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_EVAL:
-		{
-			Object data = m_c->to_Object(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_eval";
-			} else {
-				qDebug() << "vim_eval ->" << data;
-				emit on_vim_eval(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_STRWIDTH:
-		{
-			Integer data = m_c->to_Integer(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_strwidth";
-			} else {
-				qDebug() << "vim_strwidth ->" << data;
-				emit on_vim_strwidth(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_LIST_RUNTIME_PATHS:
-		{
-			StringArray data = m_c->to_StringArray(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_list_runtime_paths";
-			} else {
-				qDebug() << "vim_list_runtime_paths ->" << data;
-				emit on_vim_list_runtime_paths(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_CHANGE_DIRECTORY:
-		{
-			qDebug() << "on_vim_change_directory";
-			emit on_vim_change_directory();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_CURRENT_LINE:
-		{
-			String data = m_c->to_String(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_current_line";
-			} else {
-				qDebug() << "vim_get_current_line ->" << data;
-				emit on_vim_get_current_line(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_DEL_CURRENT_LINE:
-		{
-			qDebug() << "on_vim_del_current_line";
-			emit on_vim_del_current_line();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_SET_CURRENT_LINE:
-		{
-			qDebug() << "on_vim_set_current_line";
-			emit on_vim_set_current_line();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_VAR:
-		{
-			Object data = m_c->to_Object(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_var";
-			} else {
-				qDebug() << "vim_get_var ->" << data;
-				emit on_vim_get_var(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_SET_VAR:
-		{
-			Object data = m_c->to_Object(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_set_var";
-			} else {
-				qDebug() << "vim_set_var ->" << data;
-				emit on_vim_set_var(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_VVAR:
-		{
-			Object data = m_c->to_Object(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_vvar";
-			} else {
-				qDebug() << "vim_get_vvar ->" << data;
-				emit on_vim_get_vvar(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_OPTION:
-		{
-			Object data = m_c->to_Object(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_option";
-			} else {
-				qDebug() << "vim_get_option ->" << data;
-				emit on_vim_get_option(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_SET_OPTION:
-		{
-			qDebug() << "on_vim_set_option";
-			emit on_vim_set_option();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_OUT_WRITE:
-		{
-			qDebug() << "on_vim_out_write";
-			emit on_vim_out_write();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_ERR_WRITE:
-		{
-			qDebug() << "on_vim_err_write";
-			emit on_vim_err_write();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_BUFFERS:
-		{
-			BufferArray data = m_c->to_BufferArray(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_buffers";
-			} else {
-				qDebug() << "vim_get_buffers ->" << data;
-				emit on_vim_get_buffers(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_CURRENT_BUFFER:
-		{
-			Buffer data = m_c->to_Buffer(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_current_buffer";
-			} else {
-				qDebug() << "vim_get_current_buffer ->" << data;
-				emit on_vim_get_current_buffer(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_SET_CURRENT_BUFFER:
-		{
-			qDebug() << "on_vim_set_current_buffer";
-			emit on_vim_set_current_buffer();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_WINDOWS:
-		{
-			WindowArray data = m_c->to_WindowArray(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_windows";
-			} else {
-				qDebug() << "vim_get_windows ->" << data;
-				emit on_vim_get_windows(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_CURRENT_WINDOW:
-		{
-			Window data = m_c->to_Window(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_current_window";
-			} else {
-				qDebug() << "vim_get_current_window ->" << data;
-				emit on_vim_get_current_window(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_SET_CURRENT_WINDOW:
-		{
-			qDebug() << "on_vim_set_current_window";
-			emit on_vim_set_current_window();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_TABPAGES:
-		{
-			TabpageArray data = m_c->to_TabpageArray(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_tabpages";
-			} else {
-				qDebug() << "vim_get_tabpages ->" << data;
-				emit on_vim_get_tabpages(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_GET_CURRENT_TABPAGE:
-		{
-			Tabpage data = m_c->to_Tabpage(res, &convfail);
-			if (convfail) {
-				qWarning() << "Error unpacking data for signal vim_get_current_tabpage";
-			} else {
-				qDebug() << "vim_get_current_tabpage ->" << data;
-				emit on_vim_get_current_tabpage(data);
-			}
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_SET_CURRENT_TABPAGE:
-		{
-			qDebug() << "on_vim_set_current_tabpage";
-			emit on_vim_set_current_tabpage();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_SUBSCRIBE:
-		{
-			qDebug() << "on_vim_subscribe";
-			emit on_vim_subscribe();
-		}
-		break;
-	case Function::NEOVIM_FN_VIM_UNSUBSCRIBE:
-		{
-			qDebug() << "on_vim_unsubscribe";
-			emit on_vim_unsubscribe();
-		}
-		break;
 	default:
 		qWarning() << "Received unexpected response";
 	}

File src/auto/neovim.h

-// Auto generated Fri May 30 17:18:13 2014
+// Auto generated Mon Jun 9 22:47:31 2014
 #ifndef NEOVIM_QT_NEOVIMOBJ
 #define NEOVIM_QT_NEOVIMOBJ
 #include "function.h"
 	void tabpage_set_var(Tabpage tabpage, String name, Object value);
 	void tabpage_get_window(Tabpage tabpage);
 	void tabpage_is_valid(Tabpage tabpage);
+	void vim_push_keys(String str);
+	void vim_command(String str);
+	void vim_command_output(String str);
+	void vim_eval(String str);
+	void vim_strwidth(String str);
+	void vim_list_runtime_paths();
+	void vim_change_directory(String dir);
+	void vim_get_current_line();
+	void vim_set_current_line(String line);
+	void vim_del_current_line();
+	void vim_get_var(String name);
+	void vim_set_var(String name, Object value);
+	void vim_get_vvar(String name);
+	void vim_get_option(String name);
+	void vim_set_option(String name, Object value);
+	void vim_out_write(String str);
+	void vim_err_write(String str);
+	void vim_get_buffers();
+	void vim_get_current_buffer();
+	void vim_set_current_buffer(Buffer buffer);
+	void vim_get_windows();
+	void vim_get_current_window();
+	void vim_set_current_window(Window window);
+	void vim_get_tabpages();
+	void vim_get_current_tabpage();
+	void vim_set_current_tabpage(Tabpage tabpage);
+	void vim_subscribe(String event);
+	void vim_unsubscribe(String event);
+	void vim_request_screen();
 	void buffer_get_length(Buffer buffer);
 	void buffer_get_line(Buffer buffer, Integer index);
 	void buffer_set_line(Buffer buffer, Integer index, String line);
 	void window_get_position(Window window);
 	void window_get_tabpage(Window window);
 	void window_is_valid(Window window);
-	void vim_push_keys(String str);
-	void vim_command(String str);
-	void vim_eval(String str);
-	void vim_strwidth(String str);
-	void vim_list_runtime_paths();
-	void vim_change_directory(String dir);
-	void vim_get_current_line();
-	void vim_del_current_line();
-	void vim_set_current_line(String line);
-	void vim_get_var(String name);
-	void vim_set_var(String name, Object value);
-	void vim_get_vvar(String name);
-	void vim_get_option(String name);
-	void vim_set_option(String name, Object value);
-	void vim_out_write(String str);
-	void vim_err_write(String str);
-	void vim_get_buffers();
-	void vim_get_current_buffer();
-	void vim_set_current_buffer(Buffer buffer);
-	void vim_get_windows();
-	void vim_get_current_window();
-	void vim_set_current_window(Window window);
-	void vim_get_tabpages();
-	void vim_get_current_tabpage();
-	void vim_set_current_tabpage(Tabpage tabpage);
-	void vim_subscribe(String event);
-	void vim_unsubscribe(String event);
 
 signals:
 	void on_tabpage_get_windows(WindowArray);
 	void on_tabpage_set_var(Object);
 	void on_tabpage_get_window(Window);
 	void on_tabpage_is_valid(Boolean);
+	void on_vim_push_keys(void);
+	void on_vim_command(void);
+	void on_vim_command_output(String);
+	void on_vim_eval(Object);
+	void on_vim_strwidth(Integer);
+	void on_vim_list_runtime_paths(StringArray);
+	void on_vim_change_directory(void);
+	void on_vim_get_current_line(String);
+	void on_vim_set_current_line(void);
+	void on_vim_del_current_line(void);
+	void on_vim_get_var(Object);
+	void on_vim_set_var(Object);
+	void on_vim_get_vvar(Object);
+	void on_vim_get_option(Object);
+	void on_vim_set_option(void);
+	void on_vim_out_write(void);
+	void on_vim_err_write(void);
+	void on_vim_get_buffers(BufferArray);
+	void on_vim_get_current_buffer(Buffer);
+	void on_vim_set_current_buffer(void);
+	void on_vim_get_windows(WindowArray);
+	void on_vim_get_current_window(Window);
+	void on_vim_set_current_window(void);
+	void on_vim_get_tabpages(TabpageArray);
+	void on_vim_get_current_tabpage(Tabpage);
+	void on_vim_set_current_tabpage(void);
+	void on_vim_subscribe(void);
+	void on_vim_unsubscribe(void);
+	void on_vim_request_screen(void);
 	void on_buffer_get_length(Integer);
 	void on_buffer_get_line(String);
 	void on_buffer_set_line(void);
 	void on_window_get_position(Position);
 	void on_window_get_tabpage(Tabpage);
 	void on_window_is_valid(Boolean);
-	void on_vim_push_keys(void);
-	void on_vim_command(void);
-	void on_vim_eval(Object);
-	void on_vim_strwidth(Integer);
-	void on_vim_list_runtime_paths(StringArray);
-	void on_vim_change_directory(void);
-	void on_vim_get_current_line(String);
-	void on_vim_del_current_line(void);
-	void on_vim_set_current_line(void);
-	void on_vim_get_var(Object);
-	void on_vim_set_var(Object);
-	void on_vim_get_vvar(Object);
-	void on_vim_get_option(Object);
-	void on_vim_set_option(void);
-	void on_vim_out_write(void);
-	void on_vim_err_write(void);
-	void on_vim_get_buffers(BufferArray);
-	void on_vim_get_current_buffer(Buffer);
-	void on_vim_set_current_buffer(void);
-	void on_vim_get_windows(WindowArray);
-	void on_vim_get_current_window(Window);
-	void on_vim_set_current_window(void);
-	void on_vim_get_tabpages(TabpageArray);
-	void on_vim_get_current_tabpage(Tabpage);
-	void on_vim_set_current_tabpage(void);
-	void on_vim_subscribe(void);
-	void on_vim_unsubscribe(void);
 };
 } // namespace
 #endif