From 57120b3a90eaccd38b2c94dd16efee8c5eac05e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Mon, 10 Sep 2012 23:48:09 +0200
Subject: Some renaming

---
 play.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'play.sh')

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
-- 
cgit v1.2.3