all bugs have been removed

1 files changed, 72 insertions, 20 deletions

diff --git a/twopane.bash b/twopane.bash
index 8417022..2aacab2 100755
--- a/twopane.bash
+++ b/twopane.bash
@@ -7,9 +7,14 @@ PROGNAME=${0##*/}
 
 BOT_SIZE=8
 BOT_TITLE=input
-BOT_CMD=start
-TOP_CMD='PS1="$TOP_TITLE\$ " bash --noprofile --norc -i'
-TOP_TITLE=output
+BOT_CMD=sendstream
+if [ $# = 0 ]
+then
+        TOP_CMD="$SHELL -i"
+else
+        TOP_CMD=$*
+fi
+TOP_TITLE=$TOP_CMD
 
 TWOPANE=$(mktemp -d)
 export TWOPANE TOP_CMD BOT_CMD TOP_TITLE BOT_TITLE BOT_SIZE
@@ -26,8 +31,13 @@ save_screenrc()
 }
 
 save_screenrc <<'.'
+# Disable keybindings.
 unbindall
 escape \0\0
+# Disable messages.  This is needed for screen -X/-Q to work reasonably.
+msgwait 0
+msgminwait 0
+
 caption string '%t'
 layout new
 split
@@ -38,34 +48,35 @@ screen -ln -t "$BOT_TITLE" 0 bash --noprofile --rcfile "$TWOPANE"/bashrc -i
 source "$TWOPANE"/screenrc.startpane
 .
 
-save_screenrc 'startpane' <<'.'
+save_screenrc 'startpane' <<.
 focus top
-screen -ln -t "$TOP_TITLE" 1 sh -c "$TOP_CMD"
-exec .!. socat -u UNIX-RECV:"$TWOPANE"/socket STDOUT
+screen -ln -t "\$TOP_TITLE" 1 $TOP_CMD
+exec .!. sh -c 'socat -u UNIX-RECV:"\$TWOPANE"/socket STDOUT & socat -u STDIN,rawer UNIX-SEND:"\$TWOPANE"/socket'
 title 'output'
 focus bottom
 layout save 0
 .
 
 save_screenrc 'restart' <<.
-layout new
-split
+focus top
+screen -ln -t "\$TOP_TITLE" 1 $TOP_CMD
+exec .!. sh -c 'socat -u UNIX-RECV:"\$TWOPANE"/socket STDOUT & socat -u STDIN,rawer UNIX-SEND:"\$TWOPANE"/socket'
+title 'output'
 focus bottom
-resize $BOT_SIZE
-select 0
-title 'input'
-
-source "$TWOPANE"/screenrc.startpane
 .
 
 restart()
 {
+        while screen -p1 -Q info
+        do
+                screen -p1 -X kill
+        done
         screen -X source "$TWOPANE"/screenrc.restart
 }
 sendp()
 {
-        trap "kill -SIGUSR1 $1" EXIT
-        socat -u STDIN UNIX-SENDTO:"$TWOPANE"/socket || restart
+        trap "kill -SIGUSR1 ${1:-$$}" EXIT
+        socat -u STDIN UNIX-SENDTO:"$TWOPANE"/socket 2>&20 || restart
 }
 sendc()
 {
@@ -98,14 +109,47 @@ raw()
         stty "${stty_opts[@]}"
 }
 
+:()
+{
+        if [ "$#" -gt 0 ]
+        then
+                printf '%s: %s\r\n' "$0" "$*" >&2
+        fi
+}
+
 start()
 {
-        trap ': SIGPIPE ${SOCAT[@]@A}' SIGPIPE
-        trap ': SIGCHLD ${SOCAT[@]@A}' SIGCHLD
-        trap ': SIGUSR1 ${SOCAT[@]@A}; SOCAT=()' SIGUSR1
+        socat_stty_opts=(
+                echo=1
+                echoctl=1
+                intr=0
+                quit=0
+                eof=0
+                start=0
+                stop=0
+                susp=0
+                lnext=0
+        )
+        stty=$(printf %s, "${socat_stty_opts[@]}")
+        while ! socat -u \
+                STDIN,rawer,"${stty}" \
+                UNIX-SENDTO:"$TWOPANE"/socket
+        do
+                restart
+        done
+}
+
+sendstream()
+{
+        #trap ': SIGPIPE ;' SIGPIPE
+        #trap ': SIGCHLD ;' SIGCHLD
+        trap '' SIGPIPE SIGCHLD
+        trap 'SOCAT=(); RETRY=$REPLY;' SIGUSR1
         raw
-        while read -r -N1 || [ $? -gt 128 ]
+        while [ "$RETRY" ] || read -t 0.1 -r -N1 || [ $? -gt 128 ]
         do
+                REPLY=$RETRY$REPLY
+                RETRY=
                 if [ "$REPLY" ]
                 then
                         sendc "$REPLY"
@@ -120,7 +164,15 @@ set -o pipefail
 shopt -s lastpipe
 trap "screen -X quit" EXIT
 $(declare -f)
-export PS1="$BOT_TITLE\$ "
+export PS1="\$BOT_TITLE\$ "
+
+if [ "\$SHOW_SOCAT_ERRORS" ]
+then
+        exec 20>&2
+else
+        exec 20>/dev/null
+fi
+
 \$BOT_CMD
 .