EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the .25s delay when falling back to ascii mode

This commit is contained in:
Dylan 2016-02-21 15:35:13 +11:00
parent 72e7b1103d
commit fbf313b7ea
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fetch
View File

@ -1794,10 +1794,6 @@ getimage () {
# Get terminal lines # Get terminal lines
lines=$(tput lines) lines=$(tput lines)
# If we're in a screen session, fallback to
# ascii mode.
[ -n "$STY" ] && image="ascii"
# Call function based on $image # Call function based on $image
case "$image" in case "$image" in
"wall") getwallpaper ;; "wall") getwallpaper ;;
@ -1808,30 +1804,32 @@ getimage () {
# Get terminal width and height # Get terminal width and height
if [ -n "$TMUX" ]; then if [ -n "$TMUX" ]; then
printf "%b%s" "\033Ptmux;\033\033[14t\033\\" printf "%b%s" "\033Ptmux;\033\033[14t\033\033[c\033\\"
else else
printf "%b%s" "\033[14t" printf "%b%s" "\033[14t\033[c"
fi fi
# The ascape code above prints the output AFTER the prompt so this # The ascape code above prints the output AFTER the prompt so this
# loop below reads it as input. wtf xterm # loop below reads it as input. wtf xterm
IFS= read -d t -s -r term_size read -d c -s -r term_size
# If $img isn't a file or the terminal doesn't support xterm escape sequences,
# fallback to ascii mode.
if [ ! -f "$img" ] || [ -z "$term_size" ]; then
image="ascii"
getascii
return
fi
# Split the string # Split the string
term_size=${term_size//'['} term_size=${term_size//'['}
term_size=${term_size/';'} term_size=${term_size/';'}
term_size=${term_size/$'\E4'} term_size=${term_size/$'\E4'}
term_size=${term_size/t*}
term_height=${term_size/';'*} term_height=${term_size/';'*}
term_width=${term_size/*';'} term_width=${term_size/*';'}
# If $img isn't a file or the terminal doesn't support xterm escape sequences,
# fallback to ascii mode.
if [ ! -f "$img" ] || [ ${#term_size} -le 5 ]; then
image="ascii"
getascii
return
fi
# Get terminal columns # Get terminal columns
columns=$(tput cols) columns=$(tput cols)