kevin/vnotes
1
0
Fork 0
mirror of https://github.com/prurigro/vnotes.git synced 2024-11-24 18:11:27 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve the tty state restoration logic:

Browse source 
* Restore the tty state with a reusable function
* Add tty_state as a global
* Declare globals (including tty_state) as empty variables
This commit is contained in:
Kevin MacMartin 2023-08-23 23:30:45 -04:00
parent 4057ab8d0e
commit bc28cfdf8f
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
vnotes
View file

@ -20,9 +20,10 @@ VNOTES_EXTENSION=${NOTES_SUFFIX:='md'}
deps=('getkeycodes' 'stty' 'tput') deps=('getkeycodes' 'stty' 'tput')
declare -a documents=() declare -a documents=()
declare one_display declare one_display=''
declare upto declare upto=''
max_docwidth=0 declare tty_state=''
declare max_docwidth=0
# Colour Scheme # Colour Scheme
[[ -t 1 ]] && { [[ -t 1 ]] && {
@ -106,10 +107,15 @@ function power {
printf '%s\n' "$total" printf '%s\n' "$total"
} }
# Restore the tty state
function restore_tty_state {
[[ -n "$tty_state" ]] && stty "$tty_state"
}
# Opens a note # Opens a note
function open_note { function open_note {
printf '%s %s\n' "${c_y}Opening:" "$c_m${documents[$1]}$c_c" printf '%s %s\n' "${c_y}Opening:" "$c_m${documents[$1]}$c_c"
[[ -n "$tty_state" ]] && stty "$tty_state" restore_tty_state
"$EDITOR" "$VNOTES_FOLDER/${documents[$1]}.$VNOTES_EXTENSION" "$EDITOR" "$VNOTES_FOLDER/${documents[$1]}.$VNOTES_EXTENSION"
exit exit
} }
@ -234,7 +240,7 @@ function search_notes {
tty_state="$(stty -g)" tty_state="$(stty -g)"
# Trap a function to restore the tty on exit # Trap a function to restore the tty on exit
trap 'stty "$tty_state"; exit' SIGINT SIGQUIT SIGTERM trap 'restore_tty_state; exit' SIGINT SIGQUIT SIGTERM
# Begin to capture input # Begin to capture input
stty cs8 -icanon -echo min 1 time 1 stty cs8 -icanon -echo min 1 time 1
@ -287,7 +293,7 @@ function search_notes {
# Quit if input was given to do so # Quit if input was given to do so
(( value == -1 )) && { (( value == -1 )) && {
printf '\n%s\n' "${c_r}Quitting!$c_c" printf '\n%s\n' "${c_r}Quitting!$c_c"
[[ -n "$tty_state" ]] && stty "$tty_state" restore_tty_state
exit exit
} }
@ -307,8 +313,7 @@ function search_notes {
done done
fi fi
# Restore the tty state restore_tty_state
[[ -n "$tty_state" ]] && stty "$tty_state"
} }
# Check for missing dependencies # Check for missing dependencies