From 6c07d992d8fccf1e25929efaf0ff44c3d485463e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Thu, 12 Oct 2023 15:06:13 +0800
Subject: [PATCH] Resolution: actually support wayland protocol

Format `${scaled_width}x${scaled_height} @${scale_factor}x @ ${refresh_rate} Hz`
is used to match the format of macOS

Note: current implementation requires `wayland-info`, which is usually
provided by package
[`wayland-utils`](https://gitlab.freedesktop.org/wayland/wayland-utils)

Ref: https://github.com/hykilpikonna/hyfetch/issues/196#issuecomment-1757046939
---
 neofetch | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index 48b96d215..071b0b90b 100755
--- a/neofetch
+++ b/neofetch
@@ -3079,7 +3079,34 @@ get_resolution() {
         ;;
 
         *)
-            if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
+            if type -p wayland-info >/dev/null && [[ $WAYLAND_DISPLAY ]]; then
+                resolution=""
+                # `wayland-info` prints one interface per display
+                num_displays="$(wayland-info -i wl_output | csplit - '/interface: /' '{*}' --suppress-matched -z -n 1 --prefix '/tmp/neofetch-wayland-info-display-' | wc -l)"
+                for ((display=0; display<$num_displays; display++)); do
+                    scale_factor="$(grep -Po 'scale: \K\d+' < /tmp/neofetch-wayland-info-display-$display)"
+                    # `wayland-info` prints all modes supported by the display, and current mode is flagged as `current`
+                    mode="$(grep 'flags: .*current' -B1 < /tmp/neofetch-wayland-info-display-$display | head -1)"
+                    # width: 3456 px, height: 2160 px, refresh: 59.996 Hz,
+                    width="$(echo $mode | grep -Po 'width: \K\d+')"
+                    height="$(echo $mode |  grep -Po 'height: \K\d+')"
+                    if [[ $scale_factor -gt 1 ]]; then
+                        (( width=width/scale_factor))
+                        (( height=height/scale_factor ))
+                        resolution="$resolution${width}x${height} @${scale_factor}x"
+                    else
+                        resolution="$resolution${width}x${height}"
+                    fi;
+
+                    if [[ "$refresh_rate" == "on" ]]; then
+                        refresh="$(echo $mode | grep -Po 'refresh: \K[\d\.]+')"
+                        [[ $refresh ]] && resolution="$resolution @ $refresh Hz"
+                    fi
+
+                    resolution="$resolution, "
+                done
+                rm /tmp/neofetch-wayland-info-display-*
+            elif type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
                 case $refresh_rate in
                     "on")
                         resolution="$(xrandr --nograb --current |\