neofetch: Add support for resolution in Wayland and TTY. Closes #1304 and #1301

This commit is contained in:
Dylan Araps 2020-01-23 10:49:47 +02:00
parent 0636706ecf
commit c323470f2f
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 10 additions and 3 deletions

View File

@ -2801,7 +2801,7 @@ get_resolution() {
;;
*)
if type -p xrandr >/dev/null; then
if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
case $refresh_rate in
"on")
resolution="$(xrandr --nograb --current |\
@ -2820,13 +2820,20 @@ get_resolution() {
esac
resolution="${resolution//\*}"
elif type -p xwininfo >/dev/null; then
elif type -p xwininfo >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
read -r w h \
<<< "$(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}')"
resolution="${w}x${h}"
elif type -p xdpyinfo >/dev/null; then
elif type -p xdpyinfo >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
resolution="$(xdpyinfo | awk '/dimensions:/ {printf $2}')"
elif [[ -d /sys/class/drm ]]; then
for dev in /sys/class/drm/*/modes; do
read -r resolution _ < "$dev"
[[ $resolution ]] && break
done
fi
;;
esac