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

1 files changed, 14 insertions, 18 deletions

diff --git a/src/nvim/ui_client.h b/src/nvim/ui_client.h
index 7e5f847039..93170ed86d 100644
--- a/src/nvim/ui_client.h
+++ b/src/nvim/ui_client.h
@@ -1,14 +1,13 @@
-#ifndef NVIM_UI_CLIENT_H
-#define NVIM_UI_CLIENT_H
+#pragma once
 
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "nvim/api/private/defs.h"
-#include "nvim/grid_defs.h"
-#include "nvim/macros.h"
-#include "nvim/types.h"
+#include "nvim/grid_defs.h"  // IWYU pragma: keep
+#include "nvim/macros_defs.h"
+#include "nvim/types_defs.h"
 
 typedef struct {
   const char *name;
@@ -16,33 +15,30 @@ typedef struct {
 } UIClientHandler;
 
 // Temporary buffer for converting a single grid_line event
-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);
+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);
+EXTERN uint64_t ui_client_channel_id INIT( = 0);
+
+// exit status from embedded nvim process
+EXTERN int ui_client_exit_status 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_response INIT(= kNone);
+EXTERN bool ui_client_attached INIT( = false);
 
 /// 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);
+EXTERN bool ui_client_forward_stdin INIT( = false);
 
 #define UI_CLIENT_STDIN_FD 3
 // uncrustify:off
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ui_client.h.generated.h"
-# include "ui_events_client.h.generated.h"
+# include "ui_events_client.h.generated.h"  // IWYU pragma: export
 #endif
 // uncrustify:on
-
-#endif  // NVIM_UI_CLIENT_H