Mirror
/
shfm
mirror of https://github.com/dylanaraps/shfm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed tty issues. stopped using alt buf for keeping state. now used for its intended purpose. Closes #14

This commit is contained in:
Dylan Araps 2020-08-07 16:55:21 +03:00
parent e55cdf00ac
commit 33ce6cce78
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
shfm
View File

@ -24,6 +24,7 @@ esc() {
term_setup() { term_setup() {
stty=$(stty -g) stty=$(stty -g)
stty -icanon -echo stty -icanon -echo
esc screen_alt h
esc DECAWM l esc DECAWM l
esc DECTCEM l esc DECTCEM l
esc ED2 esc ED2
@ -31,10 +32,11 @@ term_setup() {
} }
term_reset() { term_reset() {
esc DECAWM h >&2 esc DECAWM h >&2
esc DECTCEM h >&2 esc DECTCEM h >&2
esc ED2 >&2 esc ED2 >&2
esc DECSTBM >&2 esc DECSTBM >&2
esc screen_alt l >&2
stty "$stty" stty "$stty"
# needed for cd-on-exit # needed for cd-on-exit
@ -88,16 +90,15 @@ term_scroll_up() {
} }
cmd_run() { cmd_run() {
esc screen_alt h stty "$stty"
esc DECTCEM h esc DECTCEM h
esc DECSTBM esc DECSTBM
stty "$stty" esc ED2
"$@" ||: "$@" ||:
esc DECSTBM 1 "$((LINES - 2))" esc DECSTBM 1 "$((LINES - 2))"
esc screen_alt l
esc DECTCEM l esc DECTCEM l
esc CUP "$y2"
stty -icanon -echo stty -icanon -echo
hist=2
} }
file_escape() { file_escape() {
@ -136,12 +137,16 @@ list_print() {
mid=$((bottom / 4 < 5 ? 1 : bottom / 4)) mid=$((bottom / 4 < 5 ? 1 : bottom / 4))
case $hist in case $hist in
1) 2) # redraw after cmd run
shift "$((y > y2 ? y - y2 : 0))"
;;
1) # redraw after go-to-parent
hist_search "$@" hist_search "$@"
shift "$((y >= bottom ? y - mid : 0))" shift "$((y >= bottom ? y - mid : 0))"
;; ;;
*) *) # everything else
shift "$((y >= bottom ? y - bottom : 0))" shift "$((y >= bottom ? y - bottom : 0))"
;; ;;
esac esac
@ -161,7 +166,7 @@ list_print() {
i=$((i + 1)) i=$((i + 1))
done done
esc CUP "$((y > bottom ? y2 : y))" esc CUP "$((y > y2 ? y2 : y))"
} }
redraw() { redraw() {
@ -287,6 +292,7 @@ main() {
elif [ -e "$cur" ]; then elif [ -e "$cur" ]; then
cmd_run "${SHFM_OPENER:="${EDITOR:=vi}"}" "$cur" cmd_run "${SHFM_OPENER:="${EDITOR:=vi}"}" "$cur"
redraw "$@"
fi fi
;; ;;
@ -370,6 +376,7 @@ main() {
export SHFM_LEVEL export SHFM_LEVEL
SHFM_LEVEL=$((SHFM_LEVEL + 1)) SHFM_LEVEL=$((SHFM_LEVEL + 1))
cmd_run "${SHELL:=/bin/sh}" cmd_run "${SHELL:=/bin/sh}"
redraw "$@"
;; ;;
\??) \??)