1 files changed, 21 insertions, 47 deletions

diff --git a/read-character-from-terminal.bash b/read-character-from-terminal.bash
index 6abd2b6..ea08306 100755
--- a/read-character-from-terminal.bash
+++ b/read-character-from-terminal.bash
@@ -11,10 +11,7 @@ cfmakeraw()
 
 readchar_reset()
 {
-        if [ "$readchar_init_stty" ]
-        then
-                stty "$readchar_init_stty" 2>/dev/null
-        fi
+        :
 }
 
 i()
@@ -38,20 +35,17 @@ readchar_init()
 {
         [ $$ != $BASHPID ] || return
 
-        declare -g -a readchar_termopts
-        declare -g readchar_init_stty
-        declare -g SOCAT
+        declare -g SOCAT= SOCAT_PID=
         declare -g t
+        declare -g -a readchar_termopts
 
         [ -t 1 ] && t=y || t=
-        readchar_init_stty=$(stty --save)
         readchar_termopts=(
                 opost onlcr isig
                 intr undef
                 quit undef
         )
 
-        trap 'x readchar_reset' EXIT
         trap "i CONT; readchar_SIGCONT" CONT
         for sig in TSTP TTIN TTOU
         do
@@ -65,7 +59,10 @@ readchar_SIGCONT()
 {
         if check_foreground
         then
-                x cfmakeraw "${readchar_termopts[@]}"
+                if [ -t 0 ]
+                then
+                        cfmakeraw "${readchar_termopts[@]}"
+                fi
                 x kill -CONT $SOCAT_PID 2>/dev/null
         else
                 x kill -STOP $BASHPID $SOCAT_PID 2>/dev/null
@@ -82,20 +79,27 @@ readchar()
 {
         declare -n REPLY="${1:-CHARACTER}"
 
-        if ! check_foreground
+        if [ -t 0 ]
         then
-                sleep .25
-                return
+                if check_foreground
+                then
+                        if ! [ "$SOCAT_PID" ]
+                        then
+                                cfmakeraw "${readchar_termopts[@]}"
+                        fi
+                else
+                        sleep .25
+                        return
+                fi
         fi
 
-        if ! [ "$SOCAT_PID" ] || ! kill -CONT "$SOCAT_PID" 2>/dev/null
+        if ! [ "$SOCAT_PID" ]
         then
-                x cfmakeraw "${readchar_termopts[@]}"
                 exec {SOCAT}< <(trap 'sleep .25' SIGTSTP; socat - -)
                 SOCAT_PID=$!
         fi
 
-        if read -n1 -d '' -r -s -u "$SOCAT"
+        if read -n 1 -d '' -r -s -u "$SOCAT"
         then
                 if [ "$t" ]
                 then
@@ -112,8 +116,7 @@ readchar()
                         if [ "$REPLY" ]
                         then
                                 printf "%s" "$REPLY"
-                        elif [ "$OUTPUT_NULLS" ]
-                        then
+                        else
                                 printf "\0"
                         fi
                 fi
@@ -164,35 +167,6 @@ reader_process()
 
 run_test()
 {
-        enable -f sleep sleep || return
-        (
-                pid=$BASHPID
-                exec {HEAD1}> >(head -c1; kill -PIPE $pid)
-                read_chars >&$HEAD1
-        )
-}
-
-with_raw_tty_input()
-{
-        enable -f sleep sleep || return
-        (
-                pid=$BASHPID
-                if [ $# -gt 0 ]
-                then
-                        exec {CMD}> >("$@"; kill -PIPE $pid 2>/dev/null)
-                        exec >&$CMD
-                fi
-                read_chars
-        )
-}
-
-run_test()
-{
-        with_raw_tty_input head -c3 | sed -nel
-}
-
-run_test()
-{
         reader_process &
         kill -TSTP %reader_process
         bg %reader_process