1 files changed, 27 insertions, 5 deletions

diff --git a/src/twopane.bash b/src/twopane.bash
index 59077fe..327d246 100755
--- a/src/twopane.bash
+++ b/src/twopane.bash
@@ -22,8 +22,8 @@ then
         TOP_CMD="$SHELL -i"
         BOT_CMD=start
         #TOP_EXIT=quit
-        TOP_EXIT=prompt
-        #TOP_EXIT=restart
+        #TOP_EXIT=prompt
+        TOP_EXIT=restart
 elif [ "$TWOPANE" -a "$*" = detach ]
 then
         kill_tty_forward -TSTP
@@ -245,18 +245,19 @@ start()
 tty_forward()
 {
         printf '%d\n' "$BASHPID" > "$TWOPANE"/tty_forward.pid
+        trap 'kill -INT $$' INT
         read-tty
 }
 
 TOP_PANE()
 {
         (exec -a bottom-pane-tty-forward socat - UNIX-CONNECT:"$TWOPANE"/socket,forever)
-        x kill_tty_forward
+        x kill_tty_forward -STOP
         case "$TOP_EXIT" in
                 restart )
                         # x kill -USR1 $$
                         x kill -INT $$
-                        with_screen_pane 1 start_screen_pane "$@"
+                        # with_screen_pane 1 start_screen_pane "$@"
                 ;;
                 quit )
                         kill -INT $$
@@ -313,7 +314,7 @@ background()
         disconnect_sink ECHOSEND
         connect
         connect_sink ECHOSEND echo_sender
-        kill %tty_forward
+        kill %tty_forward 2>/dev/null
         %tty_forward &
         disown %tty_forward
         i 'starting tty_forward'
@@ -379,6 +380,26 @@ SIGCHLD()
         i "SIGCHILD: ${BASH_COMMAND@A}"
 }
 
+prompt_command()
+{
+        set -- 'unset PROMPT_COMMAND; restart'
+
+        exec {FINALLY_0}<&0 {FINALLY_1}>&1 {FINALLY_2}>&2
+        if ! [ "$DEBUG" ]
+        then
+                exec &>/dev/null
+        fi
+        cmd="history -d -1; exec <&$FINALLY_0 >&$FINALLY_1 >&$FINALLY_2; $*"
+        exec <<< "$cmd"
+}
+
+SIGINT()
+{
+        i INT "${BASH_COMMAND@A}"
+        kill $TOP_PANE_PID $ECHOSEND_PID 2>/dev/null
+        PROMPT_COMMAND=prompt_command
+}
+
 our_bashrc_main()
 {
         BASH_ARGV0=twopane
@@ -388,6 +409,7 @@ our_bashrc_main()
         set -o pipefail
         trap 'SIGUSR1' USR1
         # trap 'SIGCHLD' CHLD
+        trap 'SIGINT' INT
         trap '! [ "$DEBUG" ] || read -p "Exit> "; quit' EXIT
         export PS1="$BOT_TITLE\\\$ "
 }