From 2e1ac96d3f6ff85ccac1681631d09d60953cf8a6 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Tue, 4 Oct 2022 17:34:50 +0000 Subject: vt: fix home/end sequences in xterm mode According to the ncurses terminfo database, we have $ for k in khome kend; do printf '%s:\t' "$k"; TERM=xterm tput $k | od -An -tc; done khome: 033 O H kend: 033 O F $ This differs from vt220fk, so add a new xtermfk table with the proper sequences. --- sys/src/cmd/vt/cons.h | 2 +- sys/src/cmd/vt/main.c | 2 +- sys/src/cmd/vt/vt.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) (limited to 'sys/src') diff --git a/sys/src/cmd/vt/cons.h b/sys/src/cmd/vt/cons.h index d6483ae64..5180024a4 100644 --- a/sys/src/cmd/vt/cons.h +++ b/sys/src/cmd/vt/cons.h @@ -39,7 +39,7 @@ struct funckey { char *sequence; }; extern struct funckey *fk, *appfk; -extern struct funckey ansifk[], ansiappfk[], vt220fk[]; +extern struct funckey ansifk[], ansiappfk[], vt220fk[], xtermfk[]; extern int x, y, xmax, ymax, olines; extern int peekc, attribute; diff --git a/sys/src/cmd/vt/main.c b/sys/src/cmd/vt/main.c index 32743c792..cdf2e2586 100644 --- a/sys/src/cmd/vt/main.c +++ b/sys/src/cmd/vt/main.c @@ -286,7 +286,7 @@ threadmain(int argc, char **argv) sysfatal("could not create log file: %s: %r", p); break; case 'x': - fk = vt220fk; + fk = xtermfk; term = "xterm"; break; case 'r': diff --git a/sys/src/cmd/vt/vt.c b/sys/src/cmd/vt/vt.c index d7e69465c..cf8369ec7 100644 --- a/sys/src/cmd/vt/vt.c +++ b/sys/src/cmd/vt/vt.c @@ -91,6 +91,35 @@ struct funckey vt220fk[] = { { 0 }, }; +struct funckey xtermfk[] = { + { "insert", "\033[2~", }, + { "delete", "\033[3~", }, + { "home", "\033OH", }, + { "end", "\033OF", }, + { "page up", "\033[5~", }, + { "page down", "\033[6~", }, + + { "up key", "\033[A", }, + { "down key", "\033[B", }, + { "left key", "\033[D", }, + { "right key", "\033[C", }, + + { "F1", "\033OP", }, + { "F2", "\033OQ", }, + { "F3", "\033OR", }, + { "F4", "\033OS", }, + { "F5", "\033[15~", }, + { "F6", "\033[17~", }, + { "F7", "\033[18~", }, + { "F8", "\033[19~", }, + { "F9", "\033[20~", }, + { "F10", "\033[21~", }, + { "F11", "\033[23~", }, + { "F12", "\033[24~", }, + + { 0 }, +}; + char gmap[256] = { ['_'] ' ', /* blank */ ['\\'] '*', /* diamond */ -- cgit v1.2.3