Imported Upstream version 4.0.2upstream/4.0.2

2 files changed, 44 insertions, 17 deletions

diff --git a/terminfo/screencap b/terminfo/screencap
index d2becd4..4820d92 100644
--- a/terminfo/screencap
+++ b/terminfo/screencap
@@ -9,13 +9,15 @@ SC|screen|VT 100/ANSI X3.64 virtual terminal:\
 	:AL=\E[%dL:dl=\E[M:DL=\E[%dM:cs=\E[%i%d;%dr:dc=\E[P:\
 	:DC=\E[%dP:im=\E[4h:ei=\E[4l:IC=\E[%d@:\
 	:ks=\E[?1h\E=:ke=\E[?1l\E>:vb=\Eg:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
+	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
 	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
 	:kh=\E[1~:kI=\E[2~:kD=\E[3~:kH=\E[4~:@7=\E[4~:kP=\E[5~:\
-	:kN=\E[6~:eA=\E(B\E)0:as=^N:ae=^O:\
+	:kN=\E[6~:eA=\E(B\E)0:as=^N:ae=^O:ti=\E[?1049h:te=\E[?1049l:\
 	:vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l:\
 	:Co#8:pa#64:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:AX:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++,,hhII00:
-SW|screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
-	:co#132:tc=screen:
+SB|screen-bce|VT 100/ANSI X3.64 virtual terminal with bce:\
+	:ut:tc=screen:
+SH|screen-s|VT 100/ANSI X3.64 virtual terminal with hardstatus line:\
+	:ts=\E_:fs=\E\\:ds=\E_\E\\:tc=screen:
diff --git a/terminfo/screeninfo.src b/terminfo/screeninfo.src
index aee40a8..c6ca4d9 100644
--- a/terminfo/screeninfo.src
+++ b/terminfo/screeninfo.src
@@ -9,22 +9,46 @@ screen|VT 100/ANSI X3.64 virtual terminal,
 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
 	enacs=\E(B\E)0, home=\E[H,
 	ht=\t, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
-	ind=\n, is2=\E)0, kbs=\b, kcub1=\EOD, kcud1=\EOB,
+	ind=\n, is2=\E)0, kcub1=\EOD, kcud1=\EOB,
 	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kend=\E[4~,
 	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, nel=\EE,
-	rc=\E8, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7, sgr0=\E[m,
-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m,
-	tbc=\E[3g, smacs=^N, rmacs=^O, flash=\Eg, 
+	rc=\E8, rev=\E[7m, ri=\EM, rmcup=\E[?1049l, rmir=\E[4l,
+	rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7,
+	sgr0=\E[m, smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=,
+	smso=\E[3m, smul=\E[4m, tbc=\E[3g, smacs=^N, rmacs=^O, flash=\Eg, 
 	civis=\E[?25l, cnorm=\E[34h\E[?25h, cvvis=\E[34l,
 	op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\054\054hhII00,
-screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
-	am, km, mir, msgr, xenl,
-	cols#132, it#8, lines#24, colors#8, pairs#64,
+screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
+	am, bce, km, mir, msgr, xenl,
+	cols#80, it#8, lines#24, colors#8, pairs#64,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
+	clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	cub=\E[%p1%dD, cub1=\b, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P,
+	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+	enacs=\E(B\E)0, home=\E[H,
+	ht=\t, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+	ind=\n, is2=\E)0, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kend=\E[4~,
+	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, nel=\EE,
+	rc=\E8, rev=\E[7m, ri=\EM, rmcup=\E[?1049l, rmir=\E[4l,
+	rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7,
+	sgr0=\E[m, smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=,
+	smso=\E[3m, smul=\E[4m, tbc=\E[3g, smacs=^N, rmacs=^O, flash=\Eg, 
+	civis=\E[?25l, cnorm=\E[34h\E[?25h, cvvis=\E[34l,
+	op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\054\054hhII00,
+screen-s|VT 100/ANSI X3.64 virtual terminal with hardstatus line,
+	am, bce, km, mir, msgr, xenl,
+	cols#80, it#8, lines#24, colors#8, pairs#64,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
 	clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr,
 	cub=\E[%p1%dD, cub1=\b, cud=\E[%p1%dB, cud1=\n,
@@ -33,16 +57,17 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
 	enacs=\E(B\E)0, home=\E[H,
 	ht=\t, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
-	ind=\n, is2=\E)0, kbs=\b, kcub1=\EOD, kcud1=\EOB,
+	ind=\n, is2=\E)0, kcub1=\EOD, kcud1=\EOB,
 	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kend=\E[4~,
 	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, nel=\EE,
-	rc=\E8, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7, sgr0=\E[m,
-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m,
-	tbc=\E[3g, smacs=^N, rmacs=^O, flash=\Eg, 
+	rc=\E8, rev=\E[7m, ri=\EM, rmcup=\E[?1049l, rmir=\E[4l,
+	rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7,
+	sgr0=\E[m, smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=,
+	smso=\E[3m, smul=\E[4m, tbc=\E[3g, smacs=^N, rmacs=^O, flash=\Eg, 
+	tsl=\E_, fsl=\E\\, dsl=\E_\E\\,
 	civis=\E[?25l, cnorm=\E[34h\E[?25h, cvvis=\E[34l,
 	op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\054\054hhII00,