support restarting

1 files changed, 29 insertions, 10 deletions

diff --git a/twopane.bash b/twopane.bash
index 2b30a3b..f135d29 100644
--- a/twopane.bash
+++ b/twopane.bash
@@ -7,37 +7,55 @@ shopt -s lastpipe
 BOT_SIZE=8
 BOT_TITLE=input
 BOT_CMD='PS1="$BOT_TITLE\$ " bash --noprofile --norc -i'
-TOP_CMD='PS1="$TOP_TITLE\$ " bash --noprofile --norc -i; screen -X quit'
+TOP_CMD='PS1="$TOP_TITLE\$ " bash --noprofile --norc -i'
 TOP_TITLE=output
 
 TWOPANE=$(mktemp -d)
 export TWOPANE TOP_CMD BOT_CMD TOP_TITLE BOT_TITLE BOT_SIZE
 trap 'rm -r "$TWOPANE"' EXIT
 STY=twopane.${TWOPANE##*/}
-SCREENRC=$TWOPANE/screenrc
-cat > "$SCREENRC" <<'.'
+cat > "$TWOPANE"/screenrc <<'.'
 unbindall
 escape \0\0
-escape ``
 caption string '%t'
 layout new
 split
 focus bottom
 resize $BOT_SIZE
-screen -ln -t "$BOT_TITLE" 1 bash "$TWOPANE"/bashrc
+screen -ln -t "$BOT_TITLE" 0 bash "$TWOPANE"/bashrc
+
+source "$TWOPANE"/screenrc.startpane
+.
+
+cat > "$TWOPANE"/screenrc.startpane <<'.'
 focus top
-screen -ln -t "$TOP_TITLE" sh -c "$TOP_CMD"
+screen -ln -t "$TOP_TITLE" 1 sh -c "$TOP_CMD; screen -X focus top; screen -X remove"
 exec :!:| socat -u UNIX-RECV:"$TWOPANE"/socket STDOUT
 title 'output'
 focus bottom
 layout save 0
 .
 
+cat > "$TWOPANE"/screenrc.restart <<'.'
+layout new
+split
+focus bottom
+resize $BOT_SIZE
+select 0
+title 'input'
+
+source "$TWOPANE"/screenrc.startpane
+.
+
 cat > "$TWOPANE"/bashrc <<'.'
 trap "screen -X quit" EXIT
+restart()
+{
+        screen -X source "$TWOPANE"/screenrc.restart
+}
 sendp()
 {
-        socat -u STDIN UNIX-SENDTO:"$TWOPANE"/socket
+        socat -U UNIX-SENDTO:"$TWOPANE"/socket STDIN
 }
 sendc()
 {
@@ -47,8 +65,9 @@ send()
 {
         sendc "$*"$'\n'
 }
-export -f send sendc sendp
-eval "$BOT_CMD"
+export -f send sendc sendp restart
+bash -c "$BOT_CMD" || read -p "Error: process terminated with exit code $?
+Press enter to quit."
 .
 
-screen -c "$SCREENRC" -m -S "$STY" -ln
+screen -c "$TWOPANE"/screenrc -m -S "$STY" -ln