summaryrefslogtreecommitdiff
path: root/play.sh
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2012-09-10 23:48:09 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2012-09-10 23:48:09 +0200
commit57120b3a90eaccd38b2c94dd16efee8c5eac05e1 (patch)
tree683fe928ca3e1fcd0ae94a262a11bfb4e33c2e34 /play.sh
parentc6c87093d3d8857b44faa9c702b45e39c3e473c9 (diff)
downloadplay-57120b3a90eaccd38b2c94dd16efee8c5eac05e1.tar.gz
play-57120b3a90eaccd38b2c94dd16efee8c5eac05e1.tar.bz2
play-57120b3a90eaccd38b2c94dd16efee8c5eac05e1.zip
Some renaming
Diffstat (limited to 'play.sh')
-rwxr-xr-xplay.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/play.sh b/play.sh
index 736c81e..e683a7e 100755
--- a/play.sh
+++ b/play.sh
@@ -149,12 +149,13 @@ ENV[DISPLAY]=":1"
# phase functions {{{1
# Array of phases
-PHASES=(execute setenv run prepare cleanup)
+PHASES=(startX setenv run prepare cleanup)
declare -r PHASES
-# to be removed
-play_execute () {
- exc -e startx $BIN -x $GAME -- $DISPLAY -ac -br -quiet ${=EXARGS}
+# starts a new X
+# if overridden, this MUST call `$BIN --in-X`
+play_startX () {
+ exc -e startx $BIN --in-X $GAME -- $DISPLAY -ac -br -quiet ${=EXARGS}
}
# populate the environment
@@ -259,7 +260,7 @@ EOF
fi
}
-_execute () { # {{{2
+_continue_in_X () { # {{{2
_load
prepare
run
@@ -281,13 +282,13 @@ _run () { #{{{2
out "Launching '$GAME'"
_load
setenv
- execute
+ startX
fi
}
# main {{{1
-if [[ $1 == "-x" ]]; then
- _execute
+if [[ $1 == "--in-X" ]]; then
+ _continue_in_X
else
_run "$@"
fi