wm: cleanup

This commit is contained in:
dylan araps 2017-12-17 21:10:48 +11:00
parent 9ad9d4d75e
commit 4870a863ac
1 changed files with 25 additions and 26 deletions

View File

@ -704,11 +704,8 @@ get_wm() {
((wm_run == 1)) && return ((wm_run == 1)) && return
if [[ "$WAYLAND_DISPLAY" ]]; then if [[ "$WAYLAND_DISPLAY" ]]; then
if [[ "$SWAYSOCK" ]]; then wm="$(ps -e | grep -m 1 -o -F \
wm="sway" -e "asc" \
else
wm="$(ps -e | grep -m 1 -o -F -e "asc" \
-e "fireplace" \ -e "fireplace" \
-e "grefsen" \ -e "grefsen" \
-e "mazecompositor" \ -e "mazecompositor" \
@ -718,13 +715,13 @@ get_wm() {
-e "orbital" \ -e "orbital" \
-e "perceptia" \ -e "perceptia" \
-e "rustland" \ -e "rustland" \
-e "sway" \
-e "velox" \ -e "velox" \
-e "wavy" \ -e "wavy" \
-e "wayhouse" \ -e "wayhouse" \
-e "way-cooler" \ -e "way-cooler" \
-e "westford" \ -e "westford" \
-e "weston")" -e "weston")"
fi
elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then
id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)"
@ -752,11 +749,13 @@ get_wm() {
;; ;;
"Windows") "Windows")
wm="$(tasklist | grep -m 1 -o -F -e "bugn" \ wm="$(tasklist | grep -m 1 -o -F \
-e "bugn" \
-e "Windawesome" \ -e "Windawesome" \
-e "blackbox" \ -e "blackbox" \
-e "emerge" \ -e "emerge" \
-e "litestep")" -e "litestep")"
[[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)"
wm="${wm:+$wm, }Explorer" wm="${wm:+$wm, }Explorer"
;; ;;