still working

1 files changed, 79 insertions, 53 deletions

diff --git a/src/twopane.bash b/src/twopane.bash
index de42ba9..e2b12c9 100755
--- a/src/twopane.bash
+++ b/src/twopane.bash
@@ -17,8 +17,8 @@ then
         BOT_CMD=foreground
         #BOT_CMD=start
         #TOP_EXIT=quit
-        #TOP_EXIT=prompt
-        TOP_EXIT=restart
+        TOP_EXIT=prompt
+        #TOP_EXIT=restart
 else
         TOP_CMD=$*
         BOT_CMD=start
@@ -105,7 +105,7 @@ start_screen_pane()
         TOP_TITLE="Command: ${*@Q}"
         screen -X focus top
         screen -X screen -ln -t "$TOP_TITLE" 1 "$@"
-        screen -p "$pane" -X exec .!. bash -c 'exec -a top-pane-tty-forward socat UNIX-LISTEN:"$TWOPANE"/socket STDIN,cfmakeraw!!STDOUT'
+        screen -p "$pane" -X exec .!. bash -c 'exec -a top-pane-tty-forward socat UNIX-LISTEN:"$TWOPANE"/socket STDIN,cfmakeraw,opost=1,onlcr=1!!STDOUT'
 }
 
 restart_screen_pane()
@@ -135,7 +135,7 @@ connect_coproc()
                                 "$@"
                         } 2>&$STDERR {STDERR}>&-
                 } {STDERR}>&2 2>/dev/null
-                x disown
+                disown
         fi
         # The copied file descriptors (unlike the original coprocess
         # file descriptors, in ${coproc[0]} and ${coproc[1]}) can be
@@ -148,37 +148,36 @@ connect_coproc()
 
 disconnect_coproc()
 {
-        if [ $# = 1 ]
+        [ $# = 1 ] || return
+        declare -n coproc="$1"
+        declare -n std0="${!coproc}_STDIN"
+        declare -n std1="${!coproc}_STDOUT"
+        declare -n  pid="${!coproc}_PID"
+        if [ "$std0" -o "$std1" ]
         then
-                declare -n coproc="$1"
-                declare -n std1="${!coproc}_STDOUT"
-                declare -n std0="${!coproc}_STDIN"
-                declare -n  pid="${!coproc}_PID"
-                if [ "$std0" -o "$std1" ]
-                then
-                        exec {std0}<&- {std1}>&-
-                fi
-                if [ "$pid" ]
-                then
-                        x kill "$pid"
-                        x wait -f "$pid"
-                fi
-                unset std0 std1 coproc pid
+                exec {std0}<&- {std1}>&-
         fi
+        if [ "$pid" ]
+        then
+                kill "$pid" 2>/dev/null
+                wait -f "$pid" 2>/dev/null
+        fi
+        unset coproc std0 std1 pid
 }
 
 connect()
 {
-        x connect_coproc TOP_PANE
+        connect_coproc TOP_PANE
 }
 
 disconnect()
 {
-        i "${TOP_PANE_STDIN@A} ${TOP_PANE_STDOUT@A} ${TOP_PANE_PID@A} ${TOP_PANE[@]@A}"
-        x disconnect_coproc TOP_PANE
+        : "${TOP_PANE_STDIN@A} ${TOP_PANE_STDOUT@A} ${TOP_PANE_PID@A} ${TOP_PANE[@]@A}"
+        disconnect_coproc TOP_PANE
         if [ "$ECHOSEND" ]
         then
-                kill $ECHOSEND_PID
+                exec {ECHOSEND}>&-
+                kill $ECHOSEND_PID 2>/dev/null
                 unset ECHOSEND ECHOSEND_PID
         fi
 }
@@ -207,9 +206,9 @@ start()
 
 check_tty_reader()
 {
-        [ "$TTY_READER_PID" ] || return
-        TTY_READER_JOBSPEC=$(jobs -sl | pid_to_jobspec "$TTY_READER_PID")
-        [ "$TTY_READER_JOBSPEC" ]
+        [ "$TTY_FORWARD_PID" ] || return
+        TTY_FORWARD_JOBSPEC=$(jobs -sl | pid_to_jobspec "$TTY_FORWARD_PID")
+        [ "$TTY_FORWARD_JOBSPEC" ]
 }
 
 pid_to_jobspec()
@@ -227,20 +226,26 @@ pid_to_jobspec()
 
 tty_forward()
 {
-        declare -i pid="$1"
+        printf '%d\n' "$BASHPID" > "$TWOPANE"/tty_forward.pid
         read-tty
-        x kill "$pid"
+}
+
+kill_tty_forward()
+{
+        read pid < "$TWOPANE"/tty_forward.pid
+        /bin/kill -INT -- -$pid 2>/dev/null
 }
 
 TOP_PANE()
 {
         (exec -a bottom-pane-tty-forward socat - UNIX-CONNECT:"$TWOPANE"/socket,forever)
+        kill_tty_forward
         case "$TOP_EXIT" in
                 restart )
-                        start_screen_pane 1 "$@"
                         kill -USR1 $$
                 ;;
                 quit )
+                        kill -INT $$
                         quit
                 ;;
                 prompt | * )
@@ -249,20 +254,24 @@ TOP_PANE()
         esac
 }
 
-echosend()
+sink()
 {
         declare -n fd="$1"
         declare -n pid="${!fd}_PID"
-        if ! [ "$fd" ]
+        if [ "$fd" ]
         then
-                x connect
-                i "${TOP_PANE_STDIN@A} ${TOP_PANE_STDOUT@A} ${TOP_PANE_PID@A} ${TOP_PANE[@]@A}"
-                exec {fd}> >(
-                        (exec -a echosend socat - fd:${TOP_PANE_STDIN?e}!!-) |
-                        tee >(write-tty) >&${TOP_PANE_STDOUT?e}
-                )
-                pid=$!
+                exec {fd}>&-
+                kill $pid 2>/dev/null
+                unset fd pid
         fi
+        exec {fd}> >("${@:2}")
+        pid=$!
+}
+
+echo_sender()
+{
+        (exec -a echo_sender socat - fd:${TOP_PANE_STDIN?$0: Internal error}!!-) |
+        tee >(write-tty) >&${TOP_PANE_STDOUT?$0: Internal error}
 }
 
 quiet_bg()
@@ -275,47 +284,59 @@ quiet_bg()
 
 background()
 {
+        disconnect
         start_screen_pane 1 "$@"
         focus bottom
-        x echosend ECHOSEND
-        {
-                eval "tty_forward $ECHOSEND_PID &"
-        } >&$ECHOSEND
-        TTY_READER_PID=$!
+        connect
+        sink ECHOSEND echo_sender
+        quiet_bg tty_forward >&$ECHOSEND
+        TTY_FORWARD_PID=$!
+        printf '%d\n' "$TTY_FORWARD_PID" > "$TWOPANE"/tty_forward.pid
         printf '%s\n' \
                 "#!/bin/bash" \
-                "kill -TSTP $TTY_READER_PID" \
+                "kill -TSTP $TTY_FORWARD_PID" \
                 "screen -X focus bottom" \
                 > "$TWOPANE"/unforward
         chmod +x "$TWOPANE"/unforward
 }
 
-foreground()
+foreground_once()
 {
-        check_tty_reader || background
+        check_tty_reader || background "$@"
         focus top
-        fg %tty_forward >/dev/null
-        focus bottom
+        while jobs %tty_forward >/dev/null 2>&1
+        do
+                fg %tty_forward >/dev/null
+                kill %tty_forward 2>/dev/null
+        done
 }
 
 foreground_loop()
 {
         while true
         do
-                foreground
+                foreground_once "$@"
                 case "$TOP_EXIT" in
                         restart )
                                 start_screen_pane "$@"
-                                continue ;;
+                                continue
+                        ;;
                         quit )
-                                exit ;;
+                                quit
+                        ;;
                         prompt | * )
-                                break
+                                kill -INT 0
+                                break # unreached
                         ;;
                 esac
         done
 }
 
+foreground()
+{
+        foreground_loop "$@"
+}
+
 twopane()
 {
         start "$@"
@@ -336,13 +357,18 @@ resize()
         screen -X resize "$@"
 }
 
+SIGUSR1()
+{
+        i "${BASH_COMMAND@A}"
+}
+
 our_bashrc_main()
 {
         set -m
         set -f
         set -o pipefail
         #trap 'focus bottom; resize 90%; read -p "Exit> "; quit' EXIT
-        trap 'disconnect; focus bottom;' USR1
+        trap 'SIGUSR1' USR1
         export PS1="$BOT_TITLE\\\$ "
 }