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

1 files changed, 21 insertions, 0 deletions

diff --git a/src/nvim/ui_client.h b/src/nvim/ui_client.h
index 311dafaa0b..24b8fad4cc 100644
--- a/src/nvim/ui_client.h
+++ b/src/nvim/ui_client.h
@@ -1,8 +1,11 @@
 #ifndef NVIM_UI_CLIENT_H
 #define NVIM_UI_CLIENT_H
 
+#include <stddef.h>
+
 #include "nvim/api/private/defs.h"
 #include "nvim/grid_defs.h"
+#include "nvim/macros.h"
 
 typedef struct {
   const char *name;
@@ -14,6 +17,24 @@ EXTERN size_t grid_line_buf_size INIT(= 0);
 EXTERN schar_T *grid_line_buf_char INIT(= NULL);
 EXTERN sattr_T *grid_line_buf_attr INIT(= NULL);
 
+// ID of the ui client channel. If zero, the client is not running.
+EXTERN uint64_t ui_client_channel_id INIT(= 0);
+
+// TODO(bfredl): the current structure for how tui and ui_client.c communicate is a bit awkward.
+// This will be restructured as part of The UI Devirtualization Project.
+
+/// Whether ui client has sent nvim_ui_attach yet
+EXTERN bool ui_client_attached INIT(= false);
+
+/// Whether ui client has gotten a response about the bg color of the terminal,
+/// kTrue=dark, kFalse=light, kNone=no response yet
+EXTERN TriState ui_client_bg_respose INIT(= kNone);
+
+/// The ui client should forward its stdin to the nvim process
+/// by convention, this uses fd=3 (next free number after stdio)
+EXTERN bool ui_client_forward_stdin INIT(= false);
+
+#define UI_CLIENT_STDIN_FD 3
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ui_client.h.generated.h"