From 80c177c858de9318b83e4491be0cba7854f9144f Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Wed, 8 Jul 2009 15:42:35 +0100
Subject: [PATCH] Use -bg for background colour.

Launch terminal with the correct background colour using the -bg option.
Force a black internal border for urxvt so that different coloured
terminals don't look weird with Vim marks and numbers.
---
 .Xdefaults            | 1 +
 opt/bin/sshcolourterm | 6 +++---
 opt/bin/sshterm       | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.Xdefaults b/.Xdefaults
index 1969367..b4d45b9 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -28,6 +28,7 @@ Dtterm*dtTermView.marginWidth: 0
 !rxvt.inheritPixmap:	True
 urxvt.foreground:	white
 urxvt.background:	black
+urxvt.borderColor:	black
 urxvt.scrollBar_right:	True
 urxvt.font: xft:DejaVu Sans Mono:pixelsize=12:aspect=0.9
 urxvt.multichar_encoding:	noenc
diff --git a/opt/bin/sshcolourterm b/opt/bin/sshcolourterm
index 0cf4b9f..4a5f302 100755
--- a/opt/bin/sshcolourterm
+++ b/opt/bin/sshcolourterm
@@ -28,8 +28,8 @@ fi
 if [ ! -z "$colour" ]; then
   colour=${colour##*/}
   colour=${colour##*:}
-  echo -e "\033]49;$colour\007"
-  clear
 fi
 
-exec ${SSHTERM_SSH:-ssh} ${1+"$@"}
+[ -n "$colour" ] && colour="-bg $colour"
+exec ${SSHTERM:-xterm} ${SSHTERM_TITLE:--title} "$1" \
+     $colour ${SSHTERM_EXEC:--e} ${SSHTERM_SSH:-ssh} ${1+"$@"}
diff --git a/opt/bin/sshterm b/opt/bin/sshterm
index eb209e6..4c9fdb1 100755
--- a/opt/bin/sshterm
+++ b/opt/bin/sshterm
@@ -3,6 +3,5 @@ cd /
 if [ "$SSHTERM" = "urxvtc" ]; then
   setlock -nx ${RXVT_SOCKET:-$HOME/rxvt-unicode-$HOSTNAME}.lock urxvtd -q -o -f &
 fi
-${SSHTERM:-xterm} ${SSHTERM_TITLE:--title} "$1" ${SSHTERM_EXEC:--e} \
 sshcolourterm ${1+"$@"} &
 disown
-- 
2.7.4