From 95223a6a11cbea7cd3fe69b4a95a4c4ad8ff9797 Mon Sep 17 00:00:00 2001
From: Michael Straube <michael.straube@posteo.de>
Date: Thu, 12 Dec 2019 10:59:42 +0100
Subject: [PATCH 1/5] wm: Detect Mutter on GNOME Wayland

---
 neofetch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/neofetch b/neofetch
index 9e94c28a..585e4f8c 100755
--- a/neofetch
+++ b/neofetch
@@ -1646,6 +1646,7 @@ get_wm() {
                            -e clayland \
                            -e dwc \
                            -e fireplace \
+                           -e gnome-shell \
                            -e greenfield \
                            -e grefsen \
                            -e kwin \
@@ -1678,10 +1679,6 @@ get_wm() {
             wm=${wm/\"*}
         }
 
-        # Rename window managers to their proper values.
-        [[ $wm == *WINDOWMAKER* ]]   && wm=wmaker
-        [[ $wm == *"GNOME Shell"* ]] && wm=Mutter
-
         # Fallback for non-EWMH WMs.
         [[ $wm ]] ||
             wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \
@@ -1741,6 +1738,10 @@ get_wm() {
         esac
     fi
 
+    # Rename window managers to their proper values.
+    [[ $wm == *WINDOWMAKER* ]] && wm=wmaker
+    [[ $wm == *GNOME*Shell* ]] && wm=Mutter
+
     wm_run=1
 }
 

From 5eafef80dc488f22bc0a06c6f0a0dbc9af646a4e Mon Sep 17 00:00:00 2001
From: Michael Straube <michael.straube@posteo.de>
Date: Thu, 12 Dec 2019 11:03:06 +0100
Subject: [PATCH 2/5] wm_theme: Remove 'GNOME Shell' from wm case

---
 neofetch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index 585e4f8c..b2ddd97e 100755
--- a/neofetch
+++ b/neofetch
@@ -1765,7 +1765,7 @@ get_wm_theme() {
             wm_theme="$detheme (${wm_theme})"
         ;;
 
-        "Compiz" | "Mutter" | "GNOME Shell" | "Gala")
+        "Compiz" | "Mutter" | "Gala")
             if type -p gsettings >/dev/null; then
                 wm_theme="$(gsettings get org.gnome.shell.extensions.user-theme name)"
 

From 4204f79e5d050fd17400d00d61e99197c1d33c53 Mon Sep 17 00:00:00 2001
From: Michael Straube <michael.straube@posteo.de>
Date: Thu, 12 Dec 2019 11:10:49 +0100
Subject: [PATCH 3/5] wm_theme: Make Openbox config file parsing more robust

---
 neofetch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index b2ddd97e..e611308e 100755
--- a/neofetch
+++ b/neofetch
@@ -1816,7 +1816,8 @@ get_wm_theme() {
                 ob_file="rc"
             fi
 
-            wm_theme="$(awk -F "[<,>]" '/<theme/ {getline; print $3}' \
+            wm_theme="$(awk '/<theme>/ {while (getline n) {if (match(n, /<name>/)) {l=n; exit}}}
+                        END {split(l, a, "[<>]"); print a[3]}' \
                         "${XDG_CONFIG_HOME}/openbox/${ob_file}.xml")";
         ;;
 

From 5c740aa4f2b8549eabffc019184ac723cf8e8ae4 Mon Sep 17 00:00:00 2001
From: Michael Straube <michael.straube@posteo.de>
Date: Thu, 12 Dec 2019 11:14:35 +0100
Subject: [PATCH 4/5] wm_theme: Add support for Openbox on LXQt

---
 neofetch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/neofetch b/neofetch
index e611308e..28ddb0ed 100755
--- a/neofetch
+++ b/neofetch
@@ -1812,6 +1812,9 @@ get_wm_theme() {
             if [[ "$de" == "LXDE" && -f "${HOME}/.config/openbox/lxde-rc.xml" ]]; then
                 ob_file="lxde-rc"
 
+            elif [[ "$de" == "LXQt" && -f "${HOME}/.config/openbox/lxqt-rc.xml" ]]; then
+                ob_file="lxqt-rc"
+
             elif [[ -f "${HOME}/.config/openbox/rc.xml" ]]; then
                 ob_file="rc"
             fi

From 00f1dadb85e1917d963307e534720f951fae707c Mon Sep 17 00:00:00 2001
From: Michael Straube <michael.straube@posteo.de>
Date: Thu, 12 Dec 2019 11:54:24 +0100
Subject: [PATCH 5/5] wm_theme: Refactor Openbox theme detection

---
 neofetch | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/neofetch b/neofetch
index 28ddb0ed..efcea319 100755
--- a/neofetch
+++ b/neofetch
@@ -1809,19 +1809,17 @@ get_wm_theme() {
         ;;
 
         "Openbox")
-            if [[ "$de" == "LXDE" && -f "${HOME}/.config/openbox/lxde-rc.xml" ]]; then
-                ob_file="lxde-rc"
+            case $de in
+                "LXDE"*) ob_file="lxde-rc" ;;
+                "LXQt"*) ob_file="lxqt-rc" ;;
+                      *) ob_file="rc" ;;
+            esac
 
-            elif [[ "$de" == "LXQt" && -f "${HOME}/.config/openbox/lxqt-rc.xml" ]]; then
-                ob_file="lxqt-rc"
+            ob_file="${XDG_CONFIG_HOME}/openbox/${ob_file}.xml"
 
-            elif [[ -f "${HOME}/.config/openbox/rc.xml" ]]; then
-                ob_file="rc"
-            fi
-
-            wm_theme="$(awk '/<theme>/ {while (getline n) {if (match(n, /<name>/)) {l=n; exit}}}
-                        END {split(l, a, "[<>]"); print a[3]}' \
-                        "${XDG_CONFIG_HOME}/openbox/${ob_file}.xml")";
+            [[ -f "$ob_file" ]] && \
+                wm_theme="$(awk '/<theme>/ {while (getline n) {if (match(n, /<name>/))
+                            {l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")"
         ;;
 
         "PekWM")