Signed-off-by: Jakub Horký <[email protected]>
---
 misc/terminfo.src | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/misc/terminfo.src b/misc/terminfo.src
index 4e0d854c..c0c1e81e 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -4624,12 +4624,6 @@ ms-vt100-16color|VT-UTF-8 and VT100+,
 
 # Based on
 # 
https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
-# We use this scheme to map function keys
-#       terminfo        modifier        code    keys
-#       kf13-kf24       shift           2       F1 to F12
-#       kf25-kf36       alt             3       F1 to F12
-#       kf37-kf48       control         4       F1 to F12
-#       kf49-kf60       ctrl-alt        7       F1 to F12
 #
 # Unclear: smam and rmam implemented?
 # Unclear: rmkx, smkx, rmir, smir - irrelevant?
@@ -4644,37 +4638,25 @@ ms-vt100-16color|VT-UTF-8 and VT100+,
 # +    Function keys... do not work consistently in telnet and ssh.  With
 #      telnet, kf1-kf4 are \EOP to \EOS, and kf5-kf12 match the terminfo.
 #      But with ssh, it's entirely different (reminds me of rxvt).
+#
+# JH:
+#      In version 10 22H2 (19045.6332), the function keys kf1-kf4 work
+#      consistently as \EOP to \EOS even in ssh, as well as shifted keys.
 winconsole|Windows 10 new console,
        am, km, mir, msgr, xenl,
        ncv@, U8#1,
        acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
             yzz~~,
        bel=^G, blink@, cr=\r, ech=\E[%p1%dX, el1=\E[0K, ich1@, ind=\n,
-       invis@, is1=\E[!p, kf13=\E[11;2~, kf14=\E[12;2~,
-       kf15=\E[13;2~, kf16=\E[14;2~, kf17=\E[15;2~,
-       kf18=\E[17;2~, kf19=\E[18;2~, kf20=\E[19;2~,
-       kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[24;2~,
-       kf24=\E[25;2~, kf25=\E[11;3~, kf26=\E[12;3~,
-       kf27=\E[13;3~, kf28=\E[14;3~, kf29=\E[15;3~,
-       kf30=\E[17;3~, kf31=\E[18;3~, kf32=\E[19;3~,
-       kf33=\E[20;3~, kf34=\E[21;3~, kf35=\E[24;3~,
-       kf36=\E[25;3~, kf37=\E[11;4~, kf38=\E[12;4~,
-       kf39=\E[13;4~, kf40=\E[14;4~, kf41=\E[15;4~,
-       kf42=\E[17;4~, kf43=\E[18;4~, kf44=\E[19;4~,
-       kf45=\E[20;4~, kf46=\E[21;4~, kf47=\E[24;4~,
-       kf48=\E[25;4~, kf49=\E[11;7~, kf50=\E[12;7~,
-       kf51=\E[13;7~, kf52=\E[14;7~, kf53=\E[15;7~,
-       kf54=\E[17;7~, kf55=\E[18;7~, kf56=\E[19;7~,
-       kf57=\E[20;7~, kf58=\E[21;7~, kf59=\E[24;7~,
-       kf60=\E[25;7~, khome=\E[1~, nel=\r\n, ri=\E[T, rmacs=\E(B,
+       invis@, is1=\E[!p, kspd=^Z, nel=\r\n, ri=\E[T, rmacs=\E(B,
        rmir@, rmpch@, rs1=\E[!p,
        sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
            \E(0%e\E(B%;,
-       sgr0=\E[0m\E(B, smacs=\E(0, smir@, smpch@, use=ansi+arrows,
-       use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
-       use=ansi+idl, use=ecma+index, use=ansi+inittabs,
-       use=ansi+local, use=ecma+sgr, use=ecma+color,
-       use=vt220+cvis, use=vt220+pcedit, use=xterm+nopcfkeys,
+       sgr0=\E[0m\E(B, smacs=\E(0, smir@, smpch@, use=linux+kbs,
+       use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+       use=ecma+index, use=ansi+inittabs, use=ansi+local, use=ecma+sgr,
+       use=ecma+color, use=vt220+cvis, use=vt100+noapp, use=xterm+pcfkeys,
+       
 
 # Windows Terminal
 # https://github.com/microsoft/terminal
@@ -28100,6 +28082,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #      + add putty+keypad+kp for backwards compatibility
 #      + fix teraterm-4.97, which no longer emulates VT220 editing keys
 #        based on their physical locations
+#      + add support for xterm shifted keys to winconsole, fix kbs and kspd
 #      (all by Jakub Horky)
 #
 ######## SHANTIH!  SHANTIH!  SHANTIH!
-- 
2.43.0


Reply via email to