@@ -5,13 +5,15 @@ | |||||
# with the name of the image file as its first argument. | # with the name of the image file as its first argument. | ||||
# The output is displayed in sxiv's status bar. | # The output is displayed in sxiv's status bar. | ||||
s=" | " # field separator | |||||
filename=$(basename "$1") | filename=$(basename "$1") | ||||
filesize=$(du -h "$1" | cut -f 1) | filesize=$(du -h "$1" | cut -f 1) | ||||
geometry=$(identify -format '%wx%h' "$1[0]") | geometry=$(identify -format '%wx%h' "$1[0]") | ||||
tags=$(exiv2 -q pr -pi "$1" | awk '$1~"Keywords" { printf("%s,", $4); }') | tags=$(exiv2 -q pr -pi "$1" | awk '$1~"Keywords" { printf("%s,", $4); }') | ||||
tags=${tags:+|}${tags%,} | |||||
tags=${tags%,} | |||||
echo "[$filesize|$geometry$tags] $filename" | |||||
echo "${filesize}${s}${geometry}${tags:+$s}${tags}${s}${filename}" | |||||
@@ -338,10 +338,10 @@ void update_info(void) | |||||
ow_info = false; | ow_info = false; | ||||
} | } | ||||
} else { | } else { | ||||
n = snprintf(rt, rlen, "%3d%% ", (int) (img.zoom * 100.0)); | |||||
n = snprintf(rt, rlen, "%3d%% | ", (int) (img.zoom * 100.0)); | |||||
if (img.multi.cnt > 0) { | if (img.multi.cnt > 0) { | ||||
for (fn = 0, i = img.multi.cnt; i > 0; fn++, i /= 10); | for (fn = 0, i = img.multi.cnt; i > 0; fn++, i /= 10); | ||||
n += snprintf(rt + n, rlen - n, "(%0*d/%d) ", | |||||
n += snprintf(rt + n, rlen - n, "%0*d/%d | ", | |||||
fn, img.multi.sel + 1, img.multi.cnt); | fn, img.multi.sel + 1, img.multi.cnt); | ||||
} | } | ||||
n += snprintf(rt + n, rlen - n, "%0*d/%d", fw, sel + 1, filecnt); | n += snprintf(rt + n, rlen - n, "%0*d/%d", fw, sel + 1, filecnt); | ||||