4446280 Add 'screen' terminfo/termcap entry

6512285 xterm-color: Unknown terminal type needs to be bundled with Solaris

5 files changed, 121 insertions, 12 deletions

diff --git a/usr/src/cmd/terminfo/Makefile b/usr/src/cmd/terminfo/Makefile
index 2c53fb8199..bdd865ab9c 100644
--- a/usr/src/cmd/terminfo/Makefile
+++ b/usr/src/cmd/terminfo/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,8 +21,8 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1989,1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 
 PROG=	terminfo
@@ -37,7 +36,7 @@ TISRC=	adds.ti annarbor.ti ansi.ti att.ti beehive.ti \
 	cdc.ti colorscan.ti datamedia.ti dec.ti diablo.ti \
 	fortune.ti general.ti hardcopy.ti hazeltine.ti hds.ti \
 	heath.ti homebrew.ti hp.ti lsi.ti microterm.ti \
-	misc.ti pc.ti perkinelmer.ti print.ti special.ti \
+	misc.ti pc.ti perkinelmer.ti print.ti screen.ti special.ti \
 	sperry.ti tektronix.ti teleray.ti televideo.ti ti.ti \
 	tymshare.ti visual.ti wyse.ti
 
diff --git a/usr/src/cmd/terminfo/att.ti b/usr/src/cmd/terminfo/att.ti
index f084ded542..a22ff5cf13 100644
--- a/usr/src/cmd/terminfo/att.ti
+++ b/usr/src/cmd/terminfo/att.ti
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -3285,7 +3284,7 @@ xtermm|xterm terminal emulator (monocrome) @(#)xterm.ti 1.3,
 #
 # color xterm
 #
-xtermc|xterm terminal emulator (color) @(#)xterm.ti 1.3,
+xtermc|xterm-color|xterm terminal emulator (color) @(#)xterm.ti 1.3,
 	colors#8, ncv#7, pairs#64,
 	op=\E[100m,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
diff --git a/usr/src/cmd/terminfo/screen.ti b/usr/src/cmd/terminfo/screen.ti
new file mode 100644
index 0000000000..04f8f80856
--- /dev/null
+++ b/usr/src/cmd/terminfo/screen.ti
@@ -0,0 +1,79 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+# ^L# --------------------------------
+#
+# screen: SCREEN 
+#
+# Screen is a curses based virtual terminal multiplexor.
+screen|VT 100/ANSI X3.64 virtual terminal,
+	am, 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, kbs=\b, 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,
+	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,
+	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, kbs=\b, 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,
+	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,
diff --git a/usr/src/cmd/terminfo/termcap b/usr/src/cmd/terminfo/termcap
index 606ab598e3..ef5eb39a8c 100644
--- a/usr/src/cmd/terminfo/termcap
+++ b/usr/src/cmd/terminfo/termcap
@@ -1,5 +1,5 @@
 #
-# Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -1079,6 +1079,32 @@ N1|aa|annarbor|4080|ann arbor 4080:\
 	:do=^J:pt:ct=^\^P^P:st=^]^P1:cm=^O%r%\066%.%>^S^L%+@:\
 	:co#80:li#40:le=^H:bs:cl=2^L:up=^N:nd=^_:ho=^K:am:\
 	:kb=^^:kd=^J:ku=^N:kl=^H:kr=^_:kh=^K:ma=^_ ^N^P:
+# ^L# --------------------------------
+#
+# S: SCREEN 
+#
+# Screen is a curses based virtual terminal multiplexor.
+SC|screen|VT 100/ANSI X3.64 virtual terminal:\
+	:am:xn:ms:mi:G0:km:\
+	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:bs:bt=\E[Z:\
+	:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:ct=\E[3g:\
+	:do=^J:nd=\E[C:pt:rc=\E8:rs=\Ec:sc=\E7:st=\EH:up=\EM:\
+	:le=^H:bl=^G:cr=^M:it#8:ho=\E[H:nw=\EE:ta=^I:is=\E)0:\
+	:li#24:co#80:us=\E[4m:ue=\E[24m:so=\E[3m:se=\E[23m:\
+	:mb=\E[5m:md=\E[1m:mr=\E[7m:me=\E[m:sr=\EM:al=\E[L:\
+	: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:\
+	: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:\
+	: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:
 # # --------------------------------
 #
 # T: TELETYPE
@@ -1709,6 +1735,9 @@ x5|xpcterm|X PC-compatible terminal:\
 	:ko=nd,up,ho,ic:
 x6|xpcterms|X PC-compatible terminal (small):\
 	:co#80:li#25:tc=xpcterm:
+x7|xtermc|xterm-color|xterm terminal emulator (color):\
+	:Co#8:NC#7:pa#64:\
+	:AB=\E[4%dm:AF=\E[3%dm:ac=:op=\E[100m:tc=xterm:
 
 # # --------------------------------
 #
diff --git a/usr/src/pkgdefs/SUNWcsu/prototype_com b/usr/src/pkgdefs/SUNWcsu/prototype_com
index 47860e1c61..04544cbee1 100644
--- a/usr/src/pkgdefs/SUNWcsu/prototype_com
+++ b/usr/src/pkgdefs/SUNWcsu/prototype_com
@@ -926,6 +926,8 @@ f none usr/share/lib/terminfo/a/ansi+tabs 644 root bin
 f none usr/share/lib/terminfo/a/at386 644 root bin
 f none usr/share/lib/terminfo/a/at386-m 644 root bin
 d none usr/share/lib/terminfo/s 755 root bin
+f none usr/share/lib/terminfo/s/screen 644 root bin 
+f none usr/share/lib/terminfo/s/screen-w 644 root bin
 f none usr/share/lib/terminfo/s/sun 644 root bin
 f none usr/share/lib/terminfo/s/sun-1 644 root bin
 f none usr/share/lib/terminfo/s/sun-12 644 root bin
@@ -973,6 +975,7 @@ f none usr/share/lib/terminfo/v/vt132 644 root bin
 f none usr/share/lib/terminfo/v/vt220 644 root bin
 d none usr/share/lib/terminfo/x 755 root bin
 l none usr/share/lib/terminfo/x/xterm=../../../../../usr/share/lib/terminfo/v/vs100
+l none usr/share/lib/terminfo/x/xterm-color=../../../../../usr/share/lib/terminfo/x/xtermc
 f none usr/share/lib/terminfo/x/xtermc 644 root bin
 f none usr/share/lib/terminfo/x/xtermm 644 root bin
 l none usr/share/lib/terminfo/x/xterms=../../../../../usr/share/lib/terminfo/v/vs100s