Make pcvt arrow keys work with vt220 entries; DEC terminals generate DEL,

not ^H.

1 files changed, 13 insertions, 11 deletions

diff --git a/share/termtypes/termtypes.master b/share/termtypes/termtypes.master
index 1b9e4c235fa..1ccce4851b9 100644
--- a/share/termtypes/termtypes.master
+++ b/share/termtypes/termtypes.master
@@ -1,5 +1,7 @@
 ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
 #
+# $OpenBSD: termtypes.master,v 1.15 2000/03/10 02:54:39 millert Exp $
+#
 # This version of terminfo.src is distributed with ncurses.
 # Report bugs to
 #	bug-ncurses@gnu.org
@@ -1726,8 +1728,8 @@ vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, 
 	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, 
 	if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, 
-	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, 
-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, 
+	is2=\E[1;24r\E[24;1H, kbs=\177, kcub1=\EOD, kcud1=\EOB, 
+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, 
 	kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~, 
 	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, 
 	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, rc=\E8, 
@@ -1753,8 +1755,8 @@ vt220|vt200|dec vt220,
 	flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, hts=\EH, 
 	ich=\E[%p1%d@, if=/usr/share/tabset/vt100, 
 	il=\E[%p1%dL, il1=\E[L, ind=\ED, 
-	is2=\E[?7h\E[>\E[?1h\E F\E[?4l, kbs=^H, kcub1=\E[D, 
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~, 
+	is2=\E[?7h\E[>\E[?1h\E F\E[?4l, kbs=\177, kcub1=\EOD, 
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, 
 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, 
 	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ, 
 	kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~, 
@@ -1781,7 +1783,7 @@ vt220-8bit|vt220-8|vt200-8bit|vt200-8|dec vt220/200 in 8-bit mode,
 	flash=\233?5h$<200/>\233?5l, home=\233H, ht=^I, hts=\EH, 
 	ich=\233%p1%d@, if=/usr/share/tabset/vt100, 
 	il=\233%p1%dL, il1=\233L, ind=\ED, 
-	is2=\233?7h\233>\233?1h\E F\233?4l, kbs=^H, 
+	is2=\233?7h\233>\233?1h\E F\233?4l, kbs=\177, 
 	kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A, 
 	kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~, 
 	kf13=\23325~, kf14=\23326~, kf17=\23331~, kf18=\23332~, 
@@ -1837,7 +1839,7 @@ vt200-js|vt220-js|dec vt200 series with jump scroll,
 	dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, 
 	il1=\E[L, ind=\ED, 
 	is2=\E[61"p\E[H\E[?3l\E[?4l\E[?1l\E[?5l\E[?6l\E[?7h\E[?8h\E[?25h\E>\E[m, 
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=^M\ED, rc=\E8, 
 	rf=/usr/lib/tabset/vt100, ri=\EM, rmdc=, rmir=\E[4l, 
 	rmkx=\E[?1l\E>, rmso=\E[27m$<5/>, rmul=\E[24m, 
@@ -1949,7 +1951,7 @@ vt340|dec-vt340|vt330|dec-vt330|dec vt340 graphics terminal with 24 line page,
 	flash=\E[?5h\E[?5l$<200/>, fsl=\E[$}, home=\E[H, ht=^I, 
 	hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, 
 	is2=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, 
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kbs==177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~, 
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2, 
 	lf3=pf3, lf4=pf4, nel=^M\ED, rc=\E8, rev=\E[7m, 
@@ -1995,7 +1997,7 @@ vt400|vt400-24|dec-vt400|dec vt400 24x80 column autowrap,
 	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, 
 	il=\E[%p1%dL, il1=\E[L, ind=\ED, 
 	is2=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, 
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~, 
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2, 
 	lf3=pf3, lf4=pf4, nel=^M\ED, rc=\E8, rev=\E[7m, 
@@ -2018,7 +2020,7 @@ vt420|DEC VT420,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, 
 	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, 
 	if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED, 
-	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H, 
+	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=\177, 
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 
 	kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, 
 	kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, 
@@ -2115,7 +2117,7 @@ vt520|DEC VT520,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, 
 	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, 
 	if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED, 
-	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H, 
+	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=\177, 
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 
 	kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, 
 	kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, 
@@ -2142,7 +2144,7 @@ vt525|DEC VT525,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, 
 	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, 
 	if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED, 
-	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H, 
+	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=\177, 
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 
 	kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, 
 	kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,