X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=4adfc762acac0db944ac49aab90bbf04d2287495;hb=9798ee66524f411b640bcb5b302420fdfcae79d5;hp=0f1c4e7909faedcebeb8207110d206b66de5b64d;hpb=798aff79d41ca995ea455a6102037340384ef0d2;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index 0f1c4e7..4adfc76 100644
--- a/.bashrc
+++ b/.bashrc
@@ -15,17 +15,31 @@ xlock2() {
                 echo "starting xscreensaver..."
                 xscreensaver &
         fi
-        xscreensaver-command -lock
+        until xscreensaver-command -lock; do
+                sleep 1
+        done
 }
 
 case $- in
 *i*)
 	# interactive shell
-	alias ls='ls --color=auto'
+        ls --color /tmp &>/dev/null && alias ls='ls --color=auto'
 	alias mv='mv -i'
 	alias vi='vim'
 	alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
 	alias grep='grep --color=tty -d skip'
+        alias bterm='xterm -fn "-adobe-courier-bold-r-normal--34-240-100-100-m-200-iso8859-1" -geometry 60x30-50-50'
+	#alias mplayer3="mplayer -fs \
+#-vo gl2 \
+#-dr -noslices -xineramascreen 1 \
+#-ao jack,port=4444,estimate,noautostart"
+	alias mplayer="mplayer -fs \
+-vo gl2 \
+-ao pulse \
+-dr -noslices -xineramascreen 1"
+	#alias mplayer="mplayer -fs \
+#-vo gl:yuv=2:noati-hack:rectangle=0:noaspect \
+#-dr -noslices -xineramascreen 1"
 	export PATH="${PATH}:${HOME}/cmccabe-bin"
 	export EDITOR="/usr/bin/vim"
 	export CSCOPE_EDITOR="${EDITOR}"
@@ -34,3 +48,6 @@ case $- in
 	# non-interactive shell
 	;;
 esac
+
+# Perturb malloc so that we spot bugs quicker!
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))