>Number:         34995
>Category:       misc
>Synopsis:       [PATCH] termcap update: wsvt25, xterm
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    misc-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 05 19:55:00 +0000 2006
>Originator:     svs+pr@grep.ru
>Release:        NetBSD 3.0.1_STABLE
>Organization:
>Environment:
	
	
>Description:
Current termcap entry for wsvt25 is 'micro-minimal', so here's an
updated one.  I've based it on vt220-8.  DECSCNM sequence (dark/light
background) is not emulated by wscons, so visual bell is disabled (vb@);
also, I think that 'xn' quirk is unnecessary.  'rs' sequence should 
fix PR/28402.

I've also added kB (back tab), F1 (F11 key) and F2 (F12 key) to xterm
entry.
	
>How-To-Repeat:
	
>Fix:
	
--- termcap.src	17 Sep 2006 09:30:50 -0000	1.97
+++ termcap.src	5 Nov 2006 19:46:18 -0000
@@ -929,15 +929,10 @@
 	:%1=\E[28~:kC=\E[9~:tc=vt220:
 
 # NetBSD "wscons" emulator in vt220 mode
-# These are micro-minimal and probably need to be redone for real
-# after the manner of the pcvt entries.
 wsvt25|NetBSD wscons in 25 line DEC VT220 mode:\
-	:Co#8:pa#64:it#8:ms:ut:\
-	:@7=\E[8~:is=\E[r\E[25;1H:\
-	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kh=\E[7~:F1=\E[23~:F2=\E[24~:\
-	:AB=\E[4%dm:AF=\E[3%dm:op=\E[m:\
-	:co#80:li#25:tc=vt220:
+	:Co#8:pa#64:it#8:ut:co#80:li#25:vb@:xn@:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:k;=\E[21~:\
+	:@7=\E[8~:kh=\E[7~:kH=\E[8~:rs=\E[c:tc=vt220-8:
 
 wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta:\
 	:km:tc=wsvt25:
@@ -1374,7 +1369,8 @@
 	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
 	:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
-	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:
+	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
+	:ve=\E[?25h:vi=\E[?25l:
 
 # This was DEC's vt320.  Use the purpose-built one below instead 
 #vt320|DEC VT320 in vt100 emulation mode,
@@ -1841,7 +1837,7 @@
 	:am:bs:km:mi:ms:ut:xn:\
 	:co#80:it#8:li#24:\
 	:Co#8:pa#64:AB=\E[4%dm:AF=\E[3%dm:op=\E[m:\
-	:@1=\EOE:@7=\EOF:@8=\EOM:k;=\E[21~:\
+	:@1=\EOE:@7=\EOF:@8=\EOM:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
@@ -1851,7 +1847,7 @@
 	:eA=\E(B\E)0:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\
 	:is=\E[m\E7\E[r\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kB=\E[Z:kD=\E[3~:kI=\E[2~:\
 	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\EOH:\
 	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:\
 	:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:\

>Unformatted: