diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-12-24 17:28:56 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-12-24 17:32:30 +0100 |
| commit | cdcf5d2039d5149d8e5d06347400af916b907808 (patch) | |
| tree | cc5256ef245e620172f0eb303d10df32dd25dc32 | |
| parent | a3b58cd60a6bb40c568ee5af4ea9a3ca5a8f7d09 (diff) | |
| download | rneovim-cdcf5d2039d5149d8e5d06347400af916b907808.tar.gz rneovim-cdcf5d2039d5149d8e5d06347400af916b907808.tar.bz2 rneovim-cdcf5d2039d5149d8e5d06347400af916b907808.zip | |
build: Support old libtermkey.
Check TERMKEY_VERSION_* before referencing `TermKey_Terminfo_Getstr_Hook`.
| -rw-r--r-- | src/nvim/tui/input.h | 2 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h index 69a4fae50d..7d59cf5c6a 100644 --- a/src/nvim/tui/input.h +++ b/src/nvim/tui/input.h @@ -12,7 +12,9 @@ typedef struct term_input { bool paste_enabled; bool waiting; TermKey *tk; +#if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18 TermKey_Terminfo_Getstr_Hook *tk_ti_hook_fn; ///< libtermkey terminfo hook +#endif TimeWatcher timer_handle; Loop *loop; Stream read_stream; diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 22af61994c..694d7a7cb4 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -200,7 +200,9 @@ static void tui_terminal_start(UI *ui) update_size(ui); signal_watcher_start(&data->winch_handle, sigwinch_cb, SIGWINCH); +#if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18 data->input.tk_ti_hook_fn = tui_tk_ti_getstr; +#endif term_input_init(&data->input, data->loop); term_input_start(&data->input); } @@ -963,6 +965,7 @@ static void flush_buf(UI *ui, bool toggle_cursor) } } +#if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18 /// Try to get "kbs" code from stty because "the terminfo kbs entry is extremely /// unreliable." (Vim, Bash, and tmux also do this.) /// @@ -1008,4 +1011,4 @@ static const char *tui_tk_ti_getstr(const char *name, const char *value, return value; } - +#endif |