fix all problems with signals?

1 files changed, 22 insertions, 10 deletions

diff --git a/src/twopane.bash b/src/twopane.bash
index 4c3ec62..7056053 100755
--- a/src/twopane.bash
+++ b/src/twopane.bash
@@ -89,14 +89,15 @@ kill_screen_pane()
 
 start_screen_pane()
 {
-        declare -g -a PANES
+#       declare -g -a PANES
         declare -i pane="${1:-1}"
         (( pane > 0 )) || return
-        PANES+=("$pane")
+#       PANES+=("$pane")
         if check_screen_pane "$pane"
         then
                 return
         fi
+        shift
         if [ $# = 0 ]
         then
                 set -f
@@ -105,7 +106,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-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!!STDOUT'
 }
 
 restart_screen_pane()
@@ -219,15 +220,25 @@ pid_to_jobspec()
 
 tty_forward()
 {
-        declare -i -n pid="$1"
+        declare -i pid="$1"
         read-tty
-        x kill $pid 2>/dev/null
+        x kill $pid
 }
 
 SOCAT()
 {
-        (exec -a bottom-tty-forward socat - UNIX-CONNECT:"$TWOPANE"/socket,forever)
-        x kill -USR1 $$
+        (exec -a bottom-pane-tty-forward socat - UNIX-CONNECT:"$TWOPANE"/socket,forever)
+        case "$TOP_EXIT" in
+                restart )
+                        start_screen_pane 1 "$@"
+                ;;
+                quit )
+                        quit
+                ;;
+                prompt | * )
+                ;;
+        esac
+        x screen -X quit
 }
 
 echosend()
@@ -256,11 +267,11 @@ quiet_bg()
 
 background()
 {
-        start_screen_pane "$@"
+        start_screen_pane 1 "$@"
         focus bottom
         echosend ECHOSEND
         {
-                tty_forward ECHOSEND_PID &
+                eval "tty_forward $ECHOSEND_PID &"
         } >&$ECHOSEND
         TTY_READER_PID=$!
         printf '%s\n' \
@@ -370,7 +381,7 @@ tokenize()
                         # If it is a non-printable, then we output a
                         # multi-character line. In this case we colorize it
                         # later so that it won't be confused with multiple
-                        # printable characters.
+                        # printable characters in the .
                         printf '\\%.3o\n' "'$REPLY"
                         continue
                 fi
@@ -401,6 +412,7 @@ our_bashrc_main()
         set -o pipefail
         #trap 'focus bottom; resize 90%; read -p "Exit> "; quit' EXIT
         #trap 'echo USR1 >&2; focus bottom; x kill -INT %tty_forward $TTY_READER_PID $ECHOSEND_PID' USR1
+        trap 'quit' USR1
         export PS1="$BOT_TITLE\\\$ "
 }