Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 15 insertions, 7 deletions

diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index 9140a9f1f3..666a869c89 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -1,5 +1,4 @@
-#ifndef NVIM_UI_H
-#define NVIM_UI_H
+#pragma once
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -9,9 +8,9 @@
 #include "nvim/event/multiqueue.h"
 #include "nvim/globals.h"
 #include "nvim/highlight_defs.h"
-#include "nvim/macros.h"
+#include "nvim/macros_defs.h"
 #include "nvim/memory.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 struct ui_t;
 
@@ -30,7 +29,7 @@ typedef enum {
   kUIExtCount,
 } UIExtension;
 
-EXTERN const char *ui_ext_names[] INIT(= {
+EXTERN const char *ui_ext_names[] INIT( = {
   "ext_cmdline",
   "ext_popupmenu",
   "ext_tabline",
@@ -79,6 +78,8 @@ typedef struct {
   uint32_t ncalls;  ///< number of calls made to the current event (plus one for the name!)
   bool flushed_events;  ///< events where sent to client without "flush" event
 
+  size_t ncells_pending;  ///< total number of cells since last buffer flush
+
   int hl_id;  // Current highlight for legacy put event.
   Integer cursor_row, cursor_col;  // Intended visible cursor position.
 
@@ -101,6 +102,14 @@ struct ui_t {
   double pum_height;
   double pum_width;
 
+  // TUI fields.
+  char *term_name;
+  char *term_background;  ///< Deprecated. No longer needed since background color detection happens
+                          ///< in Lua. To be removed in a future release.
+  int term_colors;
+  bool stdin_tty;
+  bool stdout_tty;
+
   // TODO(bfredl): integrate into struct!
   UIData data[1];
 };
@@ -113,9 +122,8 @@ typedef struct ui_event_callback {
 // uncrustify:off
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ui.h.generated.h"
-# include "ui_events_call.h.generated.h"
+# include "ui_events_call.h.generated.h"  // IWYU pragma: export
 #endif
 // uncrustify:on
 
 EXTERN MultiQueue *resize_events;
-#endif  // NVIM_UI_H