Assorted away-tpope updates

[tpope-extra.git] / bin / gamelaunch

diff --git a/bin/gamelaunch b/bin/gamelaunch
index baa8aa029071697a3773a799babc455632153df2..cb0a5c48a1a2bb31d0500c60ceec7374e831f7b8 100755 (executable)
--- a/bin/gamelaunch
+++ b/bin/gamelaunch
@@ -50,7 +50,7 @@ fi
 
 setxkbmap us
 xmodmap "$HOME/.Xmodmap" 2>/dev/null || xmodmap "$HOME/.xmodmap"
-pkill -STOP unclutter
+skill -STOP unclutter
 
 case "$basename" in
     ut2004|quake3|doom3|et|armyops)
@@ -60,34 +60,35 @@ case "$basename" in
     ;;
 esac
 
-tpope activity > "$HOME/.activity.$$.bak"
+activity="`tpope status activity`"
 if [ -n "$game" ]; then
-    tpope activity "Playing $game"
+    tpope status activity "Playing $game"
 fi
 
 if lspci 2>/dev/null|grep 'VT8233/A/8235/8237' >/dev/null; then
     SDL_DSP_NOSELECT=1
     export SDL_DSP_NOSELECT
-    sh -c "sleep 2; amixer sset IEC958 unmute >/dev/null &"
+    sh -c "(sleep 2; amixer sset IEC958 unmute >/dev/null) &"
 fi
 
 if lspci 2>/dev/null|grep 'Savage 3D' >/dev/null; then
     s3="`s3switch|grep 'Devices active:'|sed -e 's/Devices active: *//'`"
-    s3switch TV
+    s3switch TV >/dev/null
 fi
 
 on_exit() {
     [ -z "$sdpid" ] || kill "$sdpid"
-    pkill -CONT unclutter
+    skill -CONT unclutter
     setxkbmap us
     xmodmap "$HOME/.Xmodmap" 2>/dev/null || xmodmap "$HOME/.xmodmap"
     xset m 3 3
-    [ -z "$s3" ] || s3switch $s3
-
-    tpope activity "`cat "$HOME/.activity.$$.bak"`"
-    rm -f "$HOME/.activity.$$.bak"
+    [ -z "$s3" ] || s3switch $s3 >/dev/null
+    xvidtune -unlock
+    FvwmCommand "GoToDeskAndPage 0 0 0" >/dev/null 2>&1
+    tpope status activity -c
 }
 
 trap on_exit EXIT
 
+FvwmCommand "GoToDeskAndPage 0 2 2" >/dev/null 2>&1
 tpope display-manage $binary "$@" # 2>&1