de/wm: Fix Windows 10 issues. Closes #1571, #1573

6 years ago · 4b5f4e33be
parent 5f8ce9bbc4
commit 4b5f4e33be
1 changed files with 26 additions and 11 deletions
--- a/37
+++ b/37
@ -1688,8 +1688,17 @@ get_de() {

        Windows)
            case $distro in
-                "Windows 8"*|"Windows 10"*) de="Modern UI/Metro" ;;
-                *) de=Aero
+                "Windows 10"*)
+                    de=Fluent
+                ;;
+
+                "Windows 8"*)
+                    de=Metro
+                ;;
+
+                *)
+                    de=Aero
+                ;;
            esac
        ;;

@ -1870,15 +1879,21 @@ get_wm() {
            ;;

            Windows)
-                wm=$(tasklist | grep -m 1 -o -F \
-                                     -e bugn \
-                                     -e Windawesome \
-                                     -e blackbox \
-                                     -e emerge \
-                                     -e litestep)
-
-                [[ $wm == blackbox ]] && wm="bbLean (Blackbox)"
-                wm=${wm:+$wm, }Explorer
+                wm=$(
+                    tasklist |
+
+                    grep -Fom 1 \
+                         -e bugn \
+                         -e Windawesome \
+                         -e blackbox \
+                         -e emerge \
+                         -e litestep
+                )
+
+                [[ $wm == blackbox ]] &&
+                    wm="bbLean (Blackbox)"
+
+                wm=${wm:+$wm, }DWM.exe
            ;;

            FreeMiNT)