Merge branch 'master' of unix.club.cc.cmu.edu:~/git/pub/cmccabe-etc

[cmccabe-etc] / .bashrc

diff --git a/.bashrc b/.bashrc
index 9abe74b..6226e6d 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -9,6 +9,17 @@ if [ -f ~/.bashrc-local ]; then
        . ~/.bashrc-local
 fi
 
+xlock2() {
+        ps aux | grep -v grep | grep xscreensaver > /dev/null
+        if [ $? -ne 0 ]; then
+                echo "starting xscreensaver..."
+                xscreensaver &
+        fi
+        until xscreensaver-command -lock; do
+                sleep 1
+        done
+}
+
 case $- in
 *i*)
        # interactive shell
@@ -16,8 +27,13 @@ case $- in
        alias mv='mv -i'
        alias vi='vim'
        alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
-       alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
        alias grep='grep --color=tty -d skip'
+       alias mplayer2="mplayer -fs \
+-vo gl2 \
+-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}"