068b0a3
diff -up screen-4.0.3/etc/etcscreenrc.screenrc screen-4.0.3/etc/etcscreenrc
068b0a3
--- screen-4.0.3/etc/etcscreenrc.screenrc	2003-12-05 14:46:13.000000000 +0100
068b0a3
+++ screen-4.0.3/etc/etcscreenrc	2009-09-25 14:20:31.000000000 +0200
9e6b408
@@ -36,8 +36,8 @@ vbell_msg "   Wuff  ----  Wuff!!  "
9e6b408
 # IC    insert multiple chars
9e6b408
 # nx    terminal uses xon/xoff
9e6b408
 
9e6b408
-termcap  facit|vt100|xterm LP:G0
9e6b408
-terminfo facit|vt100|xterm LP:G0
9e6b408
+termcap  facit|vt100|xterm|xterm-* LP:G0
9e6b408
+terminfo facit|vt100|xterm|xterm-* LP:G0
9e6b408
 
9e6b408
 #the vt100 description does not mention "dl". *sigh*
9e6b408
 termcap  vt100 dl=5\E[M
068b0a3
@@ -55,15 +55,15 @@ terminfo sun 'up=^K:AL=\E[%p1%dL:DL=\E[%
068b0a3
 #xterm understands both im/ic and doesn't have a status line.
068b0a3
 #Note: Do not specify im and ic in the real termcap/info file as
068b0a3
 #some programs (e.g. vi) will (no,no, may (jw)) not work anymore.
068b0a3
-termcap  xterm|fptwist hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
068b0a3
-terminfo xterm|fptwist hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
068b0a3
+#termcap  xterm|fptwist hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
068b0a3
+#terminfo xterm|fptwist hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
068b0a3
 
068b0a3
 # Long time I had this in my private screenrc file. But many people
068b0a3
 # seem to want it (jw):
068b0a3
 # we do not want the width to change to 80 characters on startup:
068b0a3
 # on suns, /etc/termcap has :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l:
068b0a3
-termcap xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
068b0a3
-terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
068b0a3
+#termcap xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
068b0a3
+#terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
068b0a3
 
068b0a3
 #
068b0a3
 # Do not use xterms alternate window buffer. 
068b0a3
diff -up screen-4.0.3/etc/screenrc.screenrc screen-4.0.3/etc/screenrc
068b0a3
--- screen-4.0.3/etc/screenrc.screenrc	2006-10-23 15:06:32.000000000 +0200
068b0a3
+++ screen-4.0.3/etc/screenrc	2009-09-25 14:31:30.000000000 +0200
068b0a3
@@ -1,21 +1,11 @@
068b0a3
-#
068b0a3
-# Example of a user's .screenrc file
068b0a3
-#
068b0a3
-
068b0a3
 # This is how one can set a reattach password:
068b0a3
 # password ODSJQf.4IJN7E    # "1234"
068b0a3
 
068b0a3
-# no annoying audible bell, please
068b0a3
-vbell on
068b0a3
-
068b0a3
-# detach on hangup
068b0a3
-autodetach on
068b0a3
-
068b0a3
 # don't display the copyright page
068b0a3
 startup_message off
068b0a3
 
068b0a3
 # emulate .logout message
068b0a3
-pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended."
068b0a3
+pow_detach_msg "Screen session of $LOGNAME $:cr:$:nl:ended."
068b0a3
 
068b0a3
 # advertise hardstatus support to $TERMCAP
068b0a3
 # termcapinfo  * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\'
068b0a3
@@ -40,18 +30,12 @@ defscrollback 1000
068b0a3
 
068b0a3
 ################
068b0a3
 #
068b0a3
-# xterm tweaks
068b0a3
+# more xterm tweaks
068b0a3
 #
068b0a3
 
068b0a3
-#xterm understands both im/ic and doesn't have a status line.
068b0a3
-#Note: Do not specify im and ic in the real termcap/info file as
068b0a3
-#some programs (e.g. vi) will not work anymore.
068b0a3
-termcap  xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
068b0a3
-terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
068b0a3
-
068b0a3
 #80/132 column switching must be enabled for ^AW to work
068b0a3
 #change init sequence to not switch width
068b0a3
-termcapinfo  xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
068b0a3
+#termcapinfo  xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
068b0a3
 
068b0a3
 # Make the output buffer large for (fast) xterms.
068b0a3
 #termcapinfo xterm* OL=10000
9e6b408
@@ -59,18 +43,18 @@ termcapinfo xterm* OL=100
9e6b408
 
068b0a3
 # tell screen that xterm can switch to dark background and has function
068b0a3
 # keys.
9e6b408
-termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l'
068b0a3
-termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
068b0a3
-termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
9e6b408
+termcapinfo xterm|xterm-* 'VR=\E[?5h:VN=\E[?5l'
068b0a3
+#termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
068b0a3
+#termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
068b0a3
 
068b0a3
 # special xterm hardstatus: use the window title.
9e6b408
-termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
9e6b408
+termcapinfo xterm|xterm-* 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
068b0a3
 
068b0a3
 #terminfo xterm 'vb=\E[?5h$<200/>\E[?5l'
068b0a3
-termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
068b0a3
+#termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
068b0a3
 
068b0a3
 # emulate part of the 'K' charset
9e6b408
-termcapinfo   xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337'
9e6b408
+termcapinfo   xterm|xterm-* 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337'
9e6b408
 
9e6b408
 # xterm-52 tweaks:
9e6b408
 # - uses background color for delete operations
068b0a3
@@ -103,32 +87,12 @@ termcapinfo linux C8
068b0a3
 # old rxvt versions also need this
068b0a3
 # termcapinfo rxvt C8
068b0a3
 
068b0a3
-
068b0a3
-################
068b0a3
-#
068b0a3
-# keybindings
068b0a3
-#
068b0a3
-
068b0a3
-#remove some stupid / dangerous key bindings
068b0a3
-bind k
068b0a3
-bind ^k
068b0a3
-bind .
068b0a3
-bind ^\
068b0a3
-bind \\
068b0a3
-bind ^h
068b0a3
-bind h
068b0a3
-#make them better
068b0a3
-bind 'K' kill
068b0a3
-bind 'I' login on
068b0a3
-bind 'O' login off
068b0a3
-bind '}' history
068b0a3
-
068b0a3
 # Yet another hack:
068b0a3
 # Prepend/append register [/] to the paste if ^a^] is pressed.
068b0a3
 # This lets me have autoindent mode in vi.
068b0a3
-register [ "\033:se noai\015a"
068b0a3
-register ] "\033:se ai\015a"
068b0a3
-bind ^] paste [.]
068b0a3
+#register [ "\033:se noai\015a"
068b0a3
+#register ] "\033:se ai\015a"
068b0a3
+#bind ^] paste [.]
068b0a3
 
068b0a3
 ################
068b0a3
 #
068b0a3
@@ -140,9 +104,14 @@ bind ^] paste [.]
068b0a3
 # screen -t 40 2 rlogin server
068b0a3
 
068b0a3
 # caption always "%3n %t%? @%u%?%? [%h]%?%=%c"
068b0a3
+## alternative caption, gives window list, LOGNAME and current date:
068b0a3
+# caption always "%{wk}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw %=%{mk}@%H %{yk}%D %{ck}%M%{wk} %{ck}%d %{gk}%c"
068b0a3
 # hardstatus alwaysignore
068b0a3
 # hardstatus alwayslastline "%Lw"
068b0a3
 
068b0a3
+# Red Hat's normal status line
068b0a3
+hardstatus string "[screen %n%?: %t%?] %h"
068b0a3
+
068b0a3
 # bind = resize =
068b0a3
 # bind + resize +1
068b0a3
 # bind - resize -1