WMTheme (Linux): supports labwc on XFCE4

Author: CarterLi

src/detection/wmtheme/wmtheme_linux.c

@@ -135,9 +135,9 @@ static bool detectOpenbox(const FFstrbuf* dePrettyName, FFstrbuf* themeOrError)
 {
     FF_STRBUF_AUTO_DESTROY absolutePath = ffStrbufCreateA(64);
     const char *configFileSubpath = "openbox/rc.xml";
-    if (ffStrbufIgnCaseCompS(dePrettyName, "LXQt") == 0)
+    if (ffStrbufIgnCaseEqualS(dePrettyName, "LXQt"))
         configFileSubpath = "openbox/lxqt-rc.xml";
-    else if (ffStrbufIgnCaseCompS(dePrettyName, "LXDE") == 0)
+    else if (ffStrbufIgnCaseEqualS(dePrettyName, "LXDE"))
         configFileSubpath = "openbox/lxde-rc.xml";
 
     if (!ffSearchUserConfigFile(&instance.state.platform.configDirs, configFileSubpath, &absolutePath))
@@ -197,30 +197,33 @@ bool ffDetectWmTheme(FFstrbuf* themeOrError)
         return false;
     }
 
-    if(ffStrbufIgnCaseCompS(&wm->wmPrettyName, FF_WM_PRETTY_KWIN) == 0)
+    if(ffStrbufIgnCaseEqualS(&wm->wmPrettyName, FF_WM_PRETTY_KWIN))
         return detectWMThemeFromConfigFile("kwinrc", "theme =", "Breeze", themeOrError);
 
-    if(ffStrbufIgnCaseCompS(&wm->wmPrettyName, FF_WM_PRETTY_XFWM4) == 0)
+    if(
+        ffStrbufIgnCaseEqualS(&wm->wmPrettyName, FF_WM_PRETTY_XFWM4) ||
+        (ffStrbufIgnCaseEqualS(&wm->wmPrettyName, "labwc") && ffStrbufIgnCaseEqualS(&wm->dePrettyName, FF_DE_PRETTY_XFCE4))
+    )
         return detectXFWM4(themeOrError);
 
-    if(ffStrbufIgnCaseCompS(&wm->wmPrettyName, FF_WM_PRETTY_MUTTER) == 0)
+    if(ffStrbufIgnCaseEqualS(&wm->wmPrettyName, FF_WM_PRETTY_MUTTER))
     {
         if(
-            ffStrbufIgnCaseCompS(&wm->dePrettyName, FF_DE_PRETTY_GNOME) == 0 ||
+            ffStrbufIgnCaseEqualS(&wm->dePrettyName, FF_DE_PRETTY_GNOME) ||
             ffStrbufIgnCaseEqualS(&wm->dePrettyName, FF_DE_PRETTY_GNOME_CLASSIC)
         )
             return detectMutter(themeOrError);
         else
             return detectGTKThemeAsWMTheme(themeOrError);
     }
 
-    if(ffStrbufIgnCaseCompS(&wm->wmPrettyName, FF_WM_PRETTY_MUFFIN) == 0)
+    if(ffStrbufIgnCaseEqualS(&wm->wmPrettyName, FF_WM_PRETTY_MUFFIN))
         return detectMuffin(themeOrError);
 
-    if(ffStrbufIgnCaseCompS(&wm->wmPrettyName, FF_WM_PRETTY_MARCO) == 0)
+    if(ffStrbufIgnCaseEqualS(&wm->wmPrettyName, FF_WM_PRETTY_MARCO))
         return detectWMThemeFromSettings("/org/mate/Marco/general/theme", "org.mate.Marco.general", NULL, "theme", themeOrError);
 
-    if(ffStrbufIgnCaseCompS(&wm->wmPrettyName, FF_WM_PRETTY_OPENBOX) == 0)
+    if(ffStrbufIgnCaseEqualS(&wm->wmPrettyName, FF_WM_PRETTY_OPENBOX))
         return detectOpenbox(&wm->dePrettyName, themeOrError);
 
     ffStrbufAppendS(themeOrError, "Unknown WM: ");