aboutsummaryrefslogtreecommitdiff
path: root/vis-cmds.c
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2016-05-10 22:22:52 +0200
committerMarc André Tanner <mat@brain-dump.org>2016-05-10 22:22:52 +0200
commite2e0162b5bfd2a5ef31f1d09fca4da8962d5d098 (patch)
tree984329f1824e81b0eb2a6f162f5c33ec7c8eb69c /vis-cmds.c
parent0ac9c6210b3b08b2e8a9e7e4de387abcef9afcff (diff)
downloadvis-e2e0162b5bfd2a5ef31f1d09fca4da8962d5d098.tar.gz
vis-e2e0162b5bfd2a5ef31f1d09fca4da8962d5d098.tar.xz
Revert "vis: clean up interaction between vis and ui"
This caused issues on OpenBSD where it crashed the terminal. Also on Mac OS X suspend via ^Z (Ctrl-Z) was missing a \r i.e. the shell prompt was not properly redrawn. While in principle user interfaces should not have to depend on libtermkey, in practice this won't be an issue unless we are adding a non-terminal based UI (which won't happen anytime soon). This reverts commit 8f92b98848f9366e78c7aa824615bade83971513. Close #311
Diffstat (limited to 'vis-cmds.c')
-rw-r--r--vis-cmds.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vis-cmds.c b/vis-cmds.c
index 34f75f2..e52072d 100644
--- a/vis-cmds.c
+++ b/vis-cmds.c
@@ -1,5 +1,6 @@
/* this file is included from sam.c */
+#include <termkey.h>
#include "vis-lua.h"
#ifndef VIS_OPEN
@@ -632,7 +633,7 @@ static void print_symbolic_keys(Vis *vis, Text *txt) {
TERMKEY_SYM_KPEQUALS,
};
- TermKey *termkey = vis->termkey;
+ TermKey *termkey = vis->ui->termkey_get(vis->ui);
text_appendf(txt, " ␣ (a literal \" \" space symbol must be used to refer to <Space>)\n");
for (size_t i = 0; i < LENGTH(keys); i++) {
text_appendf(txt, " <%s>\n", termkey_get_keyname(termkey, keys[i]));