luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

13
neofetch
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 case $refresh_rate in
"on") "on")
resolution="$(xrandr --nograb --current |\ resolution="$(xrandr --nograb --current |\
@ -2820,13 +2820,20 @@ get_resolution() {
esac esac
resolution="${resolution//\*}" resolution="${resolution//\*}"
elif type -p xwininfo >/dev/null; then elif type -p xwininfo >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
read -r w h \ read -r w h \
<<< "$(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}')" <<< "$(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}')"
resolution="${w}x${h}" 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}')" 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 fi
;; ;;
esac esac