Trust provided TERM and override missing terminfo entries.

git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@122 6be0d1a5-5cfe-0310-89b6-964be062b18b

diff --git a/.Xdefaults b/.Xdefaults
index b24656d..1e40f40 100644 (file)
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -29,13 +29,14 @@ Dtterm*dtTermView.marginWidth: 0
 urxvt.foreground:      white
 urxvt.background:      black
 urxvt.scrollBar_right: True
+urxvt.secondaryScroll: True
 urxvt.font: xft:DejaVu Sans Mono:pixelsize=12:aspect=0.9
 urxvt.multichar_encoding:      noenc
 urxvt.title:   Penguin terminal
-urxvt.termName: xterm-color
+!urxvt.termName: xterm-color
 urxvt.saveLines: 512
 urxvt.scrollstyle: next
-urxvt.answerbackString: PuTTY
+urxvt.answerbackString: urxvt
 
 ! transparency
 !rxvt*inheritPixmap:   True
@@ -44,7 +45,7 @@ rxvt*scrollBar_right: True
 rxvt*font: fixed
 rxvt*multichar_encoding:       noenc
 rxvt*title:    Penguin terminal
-rxvt*termName: xterm-color
+!rxvt*termName: xterm-color
 rxvt*saveLines: 512
 
 !rxvt-big5*inheritPixmap:      True
@@ -56,7 +57,7 @@ rxvt-big5*mfont:      -tlc-ming-medium-r-normal-*-16-120-100-100-c-160-big5-0
 rxvt-big5*multichar_encoding:  big5
 rxvt-big5*inputMethod: xcin-big5
 rxvt-big5*title:       Penguin terminal (Big 5)
-rxvt-big5*termName: xterm-color
+!rxvt-big5*termName: xterm-color
 
 !rxvt-gb2312*inheritPixmap:    True
 rxvt-gb2312*reverseVideo:      True
@@ -67,7 +68,7 @@ rxvt-gb2312*mfont: -tlc-song-medium-r-normal-*-14-140-75-75-c-140-gb2312.1980-0
 rxvt-gb2312*multichar_encoding:        gb2312
 rxvt-gb2312*inputMethod:       xcin-gb2312
 rxvt-gb2312*title:     Penguin terminal (GB2312)
-rxvt-gb2312*termName: xterm-color
+!rxvt-gb2312*termName: xterm-color
 
 ! aewm
 Palette.geometry: 1280x30+0+0
@@ -82,3 +83,4 @@ Palette*showGrip: False
 
 XTerm.*faceName: DejaVu Sans Mono
 XTerm.*faceSize: 9
+XTerm.*termName: xterm-256color

diff --git a/.profile.d/TERM.bashrc b/.profile.d/TERM.bashrc
index 054e284..a315c9f 100644 (file)
--- a/.profile.d/TERM.bashrc
+++ b/.profile.d/TERM.bashrc
@@ -1,29 +1,2 @@
 # $Id$
-#
-# Try to find a valid TERM entry.
-#
-
-# Note that running answerback will prevent keyboard input, which is annoying 
-# if you try to start typing while the shell is starting up.
-term=
-eval $(answerback 2>/dev/null)
-case "$ANSWERBACK" in
-  PuTTY) term=xterm-256color;;
-  urxvt) term=rxvt-unicode;;
-esac
-
-if [ ! -z "$term" ]; then
-  if ! has_term $term; then
-    export TERMINFO=~/.terminfo
-  fi
-  export TERM=$term
-elif ! has_term $TERM; then
-  for term in rxvt-unicode xterm-256color xterm-88color linux dtterm xterm-color xterm vt100; do
-    if has_term $term; then
-      export TERM=$term
-      break
-    fi
-  done
-fi
-
-unset ANSWERBACK term
+export TERMINFO=~/.terminfo

diff --git a/.screenrc b/.screenrc
index da1faa5..9b6a296 100644 (file)
--- a/.screenrc
+++ b/.screenrc
@@ -8,4 +8,6 @@ bind k focus up
 bind t title
 #bind h focus top
 #bind l focus bottom
-#termcapinfo xterm ti@:te@
+termcapinfo putty*|rxvt-unicode|xterm* 'AB=\E[48;5;%dm:AF=\E[38;5;%dm'
+termcapinfo * 'ti@:te@'
+defbce on

diff --git a/.terminfo/d/dtterm b/.terminfo/d/dtterm
new file mode 100644 (file)
index 0000000..4c997df
Binary files /dev/null and b/.terminfo/d/dtterm differ

diff --git a/.terminfo/l/linux b/.terminfo/l/linux
new file mode 100644 (file)
index 0000000..0b36f01
Binary files /dev/null and b/.terminfo/l/linux differ

diff --git a/.terminfo/p/putty-256color b/.terminfo/p/putty-256color
new file mode 100644 (file)
index 0000000..377be35
Binary files /dev/null and b/.terminfo/p/putty-256color differ

diff --git a/.terminfo/r/rxvt-unicode b/.terminfo/r/rxvt-unicode
index e4ea203..3970893 100644 (file)
Binary files a/.terminfo/r/rxvt-unicode and b/.terminfo/r/rxvt-unicode differ

diff --git a/.terminfo/s/screen b/.terminfo/s/screen
new file mode 100644 (file)
index 0000000..3ee715a
Binary files /dev/null and b/.terminfo/s/screen differ

diff --git a/.terminfo/s/screen-bce b/.terminfo/s/screen-bce
new file mode 100644 (file)
index 0000000..5e50b45
Binary files /dev/null and b/.terminfo/s/screen-bce differ