diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-10-13 15:21:33 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-10-13 16:05:06 +0200 |
| commit | c9b9f052cc3c6e8b7a999f3039cd4ace16094be2 (patch) | |
| tree | a6502f6253b9f1b2dcadf45396344fe553b054ee | |
| parent | 294c0ba0149950696aec1da6f0af549a0662fd08 (diff) | |
| download | rneovim-c9b9f052cc3c6e8b7a999f3039cd4ace16094be2.tar.gz rneovim-c9b9f052cc3c6e8b7a999f3039cd4ace16094be2.tar.bz2 rneovim-c9b9f052cc3c6e8b7a999f3039cd4ace16094be2.zip | |
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.
| -rw-r--r-- | src/nvim/tui/tui.c | 2 | ||||
| -rw-r--r-- | src/nvim/ui_bridge.c (renamed from src/nvim/tui/ui_bridge.c) | 7 | ||||
| -rw-r--r-- | src/nvim/ui_bridge.h (renamed from src/nvim/tui/ui_bridge.h) | 11 |
3 files changed, 11 insertions, 9 deletions
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 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 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 |