From c9b9f052cc3c6e8b7a999f3039cd4ace16094be2 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 13 Oct 2016 15:21:33 +0200
Subject: [PATCH] Revert "tui: Move ui_bridge module to tui/ namespace."

ui_bridge.c is useful for libnvim consumers, not just the built-in TUI.

This reverts commit beb2e4f095583af09ebe9c66e3bf453b61511f23.
---
 src/nvim/tui/tui.c             |  2 +-
 src/nvim/{tui => }/ui_bridge.c |  7 ++++---
 src/nvim/{tui => }/ui_bridge.h | 11 ++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename src/nvim/{tui => }/ui_bridge.c (97%)
 rename src/nvim/{tui => }/ui_bridge.h (82%)

diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index f03d8b87fa..f252b00be2 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -22,10 +22,10 @@
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/strings.h"
+#include "nvim/ui_bridge.h"
 #include "nvim/ugrid.h"
 #include "nvim/tui/input.h"
 #include "nvim/tui/tui.h"
-#include "nvim/tui/ui_bridge.h"
 
 // Space reserved in the output buffer to restore the cursor to normal when
 // flushing. No existing terminal will require 32 bytes to do that.
diff --git a/src/nvim/tui/ui_bridge.c b/src/nvim/ui_bridge.c
similarity index 97%
rename from src/nvim/tui/ui_bridge.c
rename to src/nvim/ui_bridge.c
index 48f4b1bda6..cc27c734e0 100644
--- a/src/nvim/tui/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -1,4 +1,5 @@
-// UI wrapper for the built-in TUI. Sends UI requests to the TUI thread.
+// UI wrapper that sends UI requests to the UI thread.
+// Used by the built-in TUI and external libnvim-based UIs.
 
 #include <assert.h>
 #include <stdbool.h>
@@ -9,11 +10,11 @@
 #include "nvim/vim.h"
 #include "nvim/ui.h"
 #include "nvim/memory.h"
+#include "nvim/ui_bridge.h"
 #include "nvim/ugrid.h"
-#include "nvim/tui/ui_bridge.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "tui/ui_bridge.c.generated.h"
+# include "ui_bridge.c.generated.h"
 #endif
 
 #define UI(b) (((UIBridgeData *)b)->ui)
diff --git a/src/nvim/tui/ui_bridge.h b/src/nvim/ui_bridge.h
similarity index 82%
rename from src/nvim/tui/ui_bridge.h
rename to src/nvim/ui_bridge.h
index 003ed3c2c1..9e4bf9f2a7 100644
--- a/src/nvim/tui/ui_bridge.h
+++ b/src/nvim/ui_bridge.h
@@ -1,6 +1,7 @@
-// Bridge used for communication between a builtin UI thread and nvim core
-#ifndef NVIM_TUI_UI_BRIDGE_H
-#define NVIM_TUI_UI_BRIDGE_H
+// Bridge for communication between a UI thread and nvim core.
+// Used by the built-in TUI and external libnvim-based UIs.
+#ifndef NVIM_UI_BRIDGE_H
+#define NVIM_UI_BRIDGE_H
 
 #include <uv.h>
 
@@ -39,6 +40,6 @@ struct ui_bridge_data {
 
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "tui/ui_bridge.h.generated.h"
+# include "ui_bridge.h.generated.h"
 #endif
-#endif  // NVIM_TUI_UI_BRIDGE_H
+#endif  // NVIM_UI_BRIDGE_H