Reduce size of term_size format block
This commit is contained in:
parent
f09890ff33
commit
442c5d936b
1 changed files with 8 additions and 9 deletions
17
neofetch
17
neofetch
|
@ -2290,16 +2290,15 @@ getimage () {
|
||||||
read -t 1 ${read_flags} -s -r term_size
|
read -t 1 ${read_flags} -s -r term_size
|
||||||
stty echo
|
stty echo
|
||||||
|
|
||||||
|
|
||||||
|
# 83;28;8;15
|
||||||
|
|
||||||
# Split the string
|
# Split the string
|
||||||
if [ "$image_backend" == "tycat" ]; then
|
if [ "$image_backend" == "tycat" ]; then
|
||||||
lines=${term_size%%';'*}
|
term_size=(${term_size//;/ })
|
||||||
columns=${term_size%';'*';'*}
|
term_width=$((term_size[2] * term_size[0]))
|
||||||
columns=${columns#*';'}
|
term_height=$((term_size[3] * term_size[1]))
|
||||||
font_height=${term_size##*';'}
|
|
||||||
font_weight=${term_size#*';'*';'}
|
|
||||||
font_weight=${font_weight%';'*}
|
|
||||||
term_height=$((font_height * columns))
|
|
||||||
term_width=$((font_weight * lines))
|
|
||||||
else
|
else
|
||||||
term_size=${term_size//'['}
|
term_size=${term_size//'['}
|
||||||
term_size=${term_size/';'}
|
term_size=${term_size/';'}
|
||||||
|
@ -2311,7 +2310,7 @@ getimage () {
|
||||||
|
|
||||||
# If $img isn't a file or the terminal doesn't support xterm escape sequences,
|
# If $img isn't a file or the terminal doesn't support xterm escape sequences,
|
||||||
# fallback to ascii mode.
|
# fallback to ascii mode.
|
||||||
if [ ! -f "$img" ] || [ ${#term_size} -le 5 ]; then
|
if [ ! -f "$img" ] || [ ${#term_size} -le 5 ] && [ "$image_backend" != "tycat" ]; then
|
||||||
image="ascii"
|
image="ascii"
|
||||||
getascii
|
getascii
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue