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

wm: Fix issue with dwm. Closes #1433

Browse source
This commit is contained in:
Dylan Araps 2020-10-04 14:50:26 +03:00
parent 566c8096da
commit c155bdecd1
No known key found for this signature in database
GPG key ID: 46D62DD9F1DE636E
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
neofetch
View file

@ -1860,7 +1860,19 @@ get_wm() {
fi fi
elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then
type -p xprop &>/dev/null && { # non-EWMH WMs.
wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \
-e "[s]owm" \
-e "[c]atwm" \
-e "[f]vwm" \
-e "[d]wm" \
-e "[2]bwm" \
-e "[m]onsterwm" \
-e "[t]inywm" \
-e "[x]11fs" \
-e "[x]monad")
[[ -z $wm ]] && type -p xprop &>/dev/null && {
id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK) id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)
id=${id##* } id=${id##* }
wm=$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t) wm=$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)
@ -1869,19 +1881,6 @@ get_wm() {
wm=${wm/\"*} wm=${wm/\"*}
} }
# Fallback for non-EWMH WMs.
[[ $wm ]] ||
wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \
-e "[s]owm" \
-e "[c]atwm" \
-e "[f]vwm" \
-e "[d]wm" \
-e "[2]bwm" \
-e "[m]onsterwm" \
-e "[t]inywm" \
-e "[x]11fs" \
-e "[x]monad")
else else
case $os in case $os in
"Mac OS X"|"macOS") "Mac OS X"|"macOS")