tui: rework deferred-termcodes implementation

Try another approach to defer the termcodes. Seems less janky, but still not perfect. ref neovim#7664 ref neovim#7649 ref neovim#7664 ref 27f9b1c
justinmk · Dec 12, 2017 · 0c5e522 · 0c5e522
1 parent fb03f3a
commit 0c5e522
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/src/nvim/main.c b/src/nvim/main.c
@@ -563,6 +563,9 @@ int main(int argc, char **argv)
     (void)eval_has_provider("clipboard");
   }
 
+  if (!headless_mode) {
+    ui_builtin_after_startup();
+  }
   TIME_MSG("before starting main loop");
   ILOG("starting main loop");
 

diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
@@ -125,6 +125,7 @@ UI *tui_start(void)
 {
   UI *ui = xcalloc(1, sizeof(UI));
   ui->stop = tui_stop;
+  ui->after_startup = tui_after_startup;
   ui->rgb = p_tgc;
   ui->resize = tui_resize;
   ui->clear = tui_clear;
@@ -172,13 +173,7 @@ static size_t unibi_pre_fmt_str(TUIData *data, unsigned int unibi_index,
 static void terminfo_after_startup_event(void **argv)
 {
   UI *ui = argv[0];
-  bool defer = argv[1] != NULL;  // clever(?) boolean without malloc() dance.
   TUIData *data = ui->data;
-  if (defer) {  // We're on the main-loop. Now forward to the TUI loop.
-    loop_schedule(data->loop,
-                  event_create(terminfo_after_startup_event, 2, ui, NULL));
-    return;
-  }
   // Enable bracketed paste
   unibi_out_ext(ui, data->unibi_ext.enable_bracketed_paste);
   // Enable focus reporting
@@ -274,9 +269,13 @@ static void terminfo_start(UI *ui)
     uv_pipe_init(&data->write_loop, &data->output_handle.pipe, 0);
     uv_pipe_open(&data->output_handle.pipe, data->out_fd);
   }
+}
 
-  loop_schedule(&main_loop,
-                event_create(terminfo_after_startup_event, 2, ui, ui));
+static void tui_after_startup(UI *ui)
+{
+  TUIData *data = ui->data;
+  loop_schedule(data->loop,
+                event_create(terminfo_after_startup_event, 1, ui));
 }
 
 static void terminfo_stop(UI *ui)

diff --git a/src/nvim/ui.c b/src/nvim/ui.c
@@ -138,6 +138,14 @@ void ui_builtin_start(void)
 #endif
 }
 
+/// Immediately after VimEnter event.
+void ui_builtin_after_startup(void)
+{
+#ifdef FEAT_TUI
+  UI_CALL(after_startup);
+#endif
+}
+
 void ui_builtin_stop(void)
 {
   UI_CALL(stop);

diff --git a/src/nvim/ui.h b/src/nvim/ui.h
@@ -31,13 +31,12 @@ struct ui_t {
   bool ui_ext[UI_WIDGETS];  ///< Externalized widgets
   int width, height;
   void *data;
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ui_events.generated.h"
 #endif
-
   void (*event)(UI *ui, char *name, Array args, bool *args_consumed);
   void (*stop)(UI *ui);
+  void (*after_startup)(UI *ui);
 };
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
@@ -42,6 +42,7 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
   rv->ui = ui;
   rv->bridge.rgb = ui->rgb;
   rv->bridge.stop = ui_bridge_stop;
+  rv->bridge.after_startup = ui_bridge_after_startup;
   rv->bridge.resize = ui_bridge_resize;
   rv->bridge.clear = ui_bridge_clear;
   rv->bridge.eol_clear = ui_bridge_eol_clear;
@@ -105,6 +106,16 @@ static void ui_thread_run(void *data)
   bridge->ui_main(bridge, bridge->ui);
 }
 
+static void ui_bridge_after_startup(UI *b)
+{
+  UI_BRIDGE_CALL(b, after_startup, 1, b);
+}
+static void ui_bridge_after_startup_event(void **argv)
+{
+  UI *ui = UI(argv[0]);
+  ui->after_startup(ui);
+}
+
 static void ui_bridge_stop(UI *b)
 {
   UIBridgeData *bridge = (UIBridgeData *)b;