1 files changed, 18 insertions, 36 deletions

diff --git a/src/read_chars.bash b/src/read_chars.bash
index 5856e92..557b972 100644
--- a/src/read_chars.bash
+++ b/src/read_chars.bash
@@ -42,7 +42,7 @@ x()
 
 readchar_init()
 {
-        declare -g SOCAT= SOCAT_PID=
+        declare -g INIT_TTY=y
         declare -g t
         declare -g -a readchar_termopts
 
@@ -53,11 +53,10 @@ readchar_init()
                 quit undef
         )
 
-        trap "i EXIT; kill $SOCAT_PID 2>/dev/null; kill -CONT $SOCAT_PID 2>/dev/null" EXIT
-        trap "i CONT; readchar_SIGCONT" CONT
+        trap "i CONT; INIT_TTY=y" CONT
         for sig in TSTP TTIN TTOU
         do
-                trap "i $sig; x kill -STOP \$BASHPID \$SOCAT_PID 2>/dev/null" $sig
+                trap "i $sig; stop_self" $sig
         done
         for sig in INT TERM
         do
@@ -65,18 +64,10 @@ readchar_init()
         done
 }
 
-readchar_SIGCONT()
+stop_self()
 {
-        if check_foreground
-        then
-                if [ -t 0 ]
-                then
-                        x cfmakeraw "${readchar_termopts[@]}"
-                fi
-                x kill -CONT $SOCAT_PID 2>/dev/null
-        else
-                x kill -STOP $BASHPID $SOCAT_PID 2>/dev/null
-        fi
+        INIT_TTY=y
+        kill -STOP $$ $BASHPID
 }
 
 check_foreground()
@@ -85,40 +76,26 @@ check_foreground()
         [ "$tpgid" = "$pgrp" ]
 }
 
-SOCAT()
-{
-        #BASH_ARGV0=socat-tty-sleeper
-        #echo -n "$0" >/proc/$BASHPID/comm
-        #trap 'sleep .25' SIGTSTP
-        #trap 'kill -INT $BASHPID 0' SIGTTIN SIGTTOU
-        exec -a user-ended-connection socat - -
-}
-
 readchar()
 {
         declare -n REPLY="${1:-CHARACTER}"
 
         if [ -t 0 ]
         then
-                if check_foreground
+                if ! check_foreground
                 then
-                        if ! [ "$SOCAT_PID" ]
-                        then
-                                x cfmakeraw "${readchar_termopts[@]}"
-                        fi
-                else
-                        sleep .25
+                        stop_self
                         return
                 fi
         fi
 
-        if ! [ "$SOCAT_PID" ]
+        if [ "$INIT_TTY" ]
         then
-                exec {SOCAT}< <(SOCAT)
-                SOCAT_PID=$!
+                x cfmakeraw "${readchar_termopts[@]}"
+                INIT_TTY=
         fi
 
-        if POSIXLY_CORRECT=y read -n 1 -d '' -r -s -u "$SOCAT"
+        if POSIXLY_CORRECT=y read -n 1 -d '' -r -s
         then
                 if [ "$t" ]
                 then
@@ -140,7 +117,12 @@ readchar()
                         fi
                 fi
         else
-                [ $? -gt 128 ]
+                r=$?
+                if [ "$r" = 148 ]
+                then
+                        INIT_TTY=y
+                fi
+                [ $r -gt 128 ]
         fi
 }