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

Only move cursor to the bottom of the terminal if w3m/iterm2 rendering is on

This commit is contained in:
Dylan 2016-01-29 10:11:34 +11:00
parent 55fcf79796
commit fcd4bad3c5
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fetch
View File

@ -83,6 +83,7 @@ printinfo () {
info linebreak info linebreak
info cols info cols
info linebreak
} }
@ -1400,6 +1401,9 @@ getascii () {
# Get length of longest line # Get length of longest line
length="$(LC_ALL="en_US.UTF8" wc -L 2>/dev/null <<< "$ascii_strip")" length="$(LC_ALL="en_US.UTF8" wc -L 2>/dev/null <<< "$ascii_strip")"
# Get the height in lines
lines="$(($(LC_ALL="en_US.UTF8" wc -l 2>/dev/null <<< "$ascii_strip") + 1))"
# Fallback to using awk on systems without 'wc -L' # Fallback to using awk on systems without 'wc -L'
[ -z "$length" ] && \ [ -z "$length" ] && \
length="$(LC_ALL="en_US.UTF8" awk 'length>max{max=length}END{print max}' <<< "$ascii_strip")" length="$(LC_ALL="en_US.UTF8" awk 'length>max{max=length}END{print max}' <<< "$ascii_strip")"
@ -1538,6 +1542,9 @@ getimage () {
esac esac
fi fi
# Lines equals terminal height
lines=$(tput lines)
# The final image # The final image
img="$imgtempdir/$imgname" img="$imgtempdir/$imgname"
} }
@ -1842,8 +1849,7 @@ done
# Restore cursor and clear screen on ctrl+c # Restore cursor and clear screen on ctrl+c
trap 'printf "\033[?25h"; clear; exit' 2 trap 'printf "\033[?25h"; clear; exit' 2
# Get lines and columns # Get columns
lines=$(tput lines)
columns=$(tput cols) columns=$(tput cols)
# Clear the terminal and hide the cursor # Clear the terminal and hide the cursor
@ -1879,11 +1885,15 @@ printf "\033[0H"
printinfo printinfo
# Move the cursor to the bottom and Show the cursor # Move the cursor to the bottom and Show the cursor
printf "%b%s" "\033[${lines}H\033[${prompt_height}A\033[?25h" [ "$image" != "off" ] && \
printf "%b%s" "\033[${lines}H\033[${prompt_height}A"
# Enable line wrap again # Enable line wrap again
[ "$line_wrap" == "off" ] && printf "\033[?7h" [ "$line_wrap" == "off" ] && printf "\033[?7h"
# Show the cursor
printf "%b%s" "\033[?25h"
# If enabled take a screenshot # If enabled take a screenshot
[ "$scrot" == "on" ] && takescrot [ "$scrot" == "on" ] && takescrot