Compatibility rework 2

src/XIVLauncher.Core/Components/MainPage/MainPage.cs

@@ -23,6 +23,7 @@
 using XIVLauncher.Common.Windows;
 using XIVLauncher.Core.Accounts;
 using XIVLauncher.Core.Support;
+using XIVLauncher.Core.UnixCompatibility;
 
 namespace XIVLauncher.Core.Components.MainPage;
 
@@ -751,16 +752,16 @@ public async Task<Process> StartGameAndAddon(Launcher.LoginResult loginResult, b
         }
         else if (Environment.OSVersion.Platform == PlatformID.Unix)
         {
-            if (App.Settings.WineStartupType == WineStartupType.Custom)
+            if (App.Settings.WineType.Value == WineType.Custom)
             {
                 if (App.Settings.WineBinaryPath == null)
                     throw new InvalidOperationException("Custom wine binary path wasn't set.");
                 else if (!Directory.Exists(App.Settings.WineBinaryPath))
                     throw new InvalidOperationException("Custom wine binary path is invalid: no such directory.\n" +
-                                                        "Check path carefully for typos: " + App.Settings.WineBinaryPath);
-                else if (!File.Exists(Path.Combine(App.Settings.WineBinaryPath, "wine64")))
-                    throw new InvalidOperationException("Custom wine binary path is invalid: no wine64 found at that location.\n" +
-                                                        "Check path carefully for typos: " + App.Settings.WineBinaryPath);
+                        "Check path carefully for typos: " + App.Settings.WineBinaryPath);
+                else if (!File.Exists(Path.Combine(App.Settings.WineBinaryPath, "wine64")) && !File.Exists(Path.Combine(App.Settings.WineBinaryPath, "wine")))
+                    throw new InvalidOperationException("Custom wine binary path is invalid: no wine or wine64 found at that location.\n" +
+                        "Check path carefully for typos: " + App.Settings.WineBinaryPath);
             }
 
             var signal = new ManualResetEvent(false);
@@ -769,10 +770,8 @@ public async Task<Process> StartGameAndAddon(Launcher.LoginResult loginResult, b
             var _ = Task.Run(async () =>
             {
                 var tempPath = App.Storage.GetFolder("temp");
-                var winver = (App.Settings.SetWin7 ?? true) ? "win7" : "win10";
 
                 await Program.CompatibilityTools.EnsureTool(tempPath).ConfigureAwait(false);
-                Program.CompatibilityTools.RunInPrefix($"winecfg /v {winver}");
 
                 var gameFixApply = new GameFixApply(App.Settings.GamePath, App.Settings.GameConfigPath, Program.CompatibilityTools.Settings.Prefix, tempPath);
                 gameFixApply.UpdateProgress += (text, hasProgress, progress) =>

src/XIVLauncher.Core/Components/SettingsPage/DictionarySettingsEntry.cs

@@ -0,0 +1,86 @@
+using ImGuiNET;
+using XIVLauncher.Core.UnixCompatibility;
+
+namespace XIVLauncher.Core.Components.SettingsPage;
+
+public class DictionarySettingsEntry : SettingsEntry<string>
+{
+    public Dictionary<string, Dictionary<string, string>> Pairs;
+
+    public string DefaultValue;
+
+    public bool ShowDescription;
+
+    public bool ShowItemDescription;
+
+    public DictionarySettingsEntry(string name, string description, Dictionary<string, Dictionary<string, string>> pairs, Func<string> load, Action<string?> save, string defaultValue, bool showSelectedDesc = false, bool showItemDesc = true)
+        : base(name, description, load, save)
+    { 
+        this.Pairs = pairs;
+        this.DefaultValue = defaultValue;
+        this.ShowDescription = showSelectedDesc;
+        this.ShowItemDescription = showItemDesc;
+    }
+
+
+    public override void Draw()
+    {
+        var nativeValue = this.Value;
+        string idx = (string)(this.InternalValue ?? DefaultValue);
+
+        ImGuiHelpers.TextWrapped(this.Name);
+
+        Dictionary<string, Dictionary<string, string>>.KeyCollection keys = Pairs.Keys;
+        var label = Pairs[idx].ContainsKey("label") ? $"[{Pairs[idx]["label"]}] " : "";
+        var name = Pairs[idx].ContainsKey("name") ? Pairs[idx]["name"] : idx;
+        var desc = ShowDescription && Pairs[idx].ContainsKey("desc") ? $" - {Pairs[idx]["desc"]}" : "";
+        var mark = Pairs[idx].ContainsKey("mark") ? $" *{Pairs[idx]["mark"]}*" : "";
+
+        if (ImGui.BeginCombo($"###{Id.ToString()}", $"{label}{name}{desc}{mark}"))
+        {
+            foreach ( string key in keys )
+            {
+                var itemlabel = Pairs[key].ContainsKey("label") ? $"[{Pairs[key]["label"]}] " : "";
+                var itemname = Pairs[key].ContainsKey("name") ? Pairs[key]["name"] : key;
+                var itemdesc = ShowItemDescription && Pairs[key].ContainsKey("desc") ? $" - {Pairs[key]["desc"]}" : "";
+                var itemmark = Pairs[key].ContainsKey("mark") ? $" *{Pairs[key]["mark"]}*" : "";
+                if (ImGui.Selectable($"{itemlabel}{itemname}{itemdesc}{itemmark}", idx == key))
+                {
+                    this.InternalValue = key;
+                }
+            }
+            ImGui.EndCombo();
+        }
+
+        ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudGrey);
+        if (!string.IsNullOrEmpty(this.Description)) ImGuiHelpers.TextWrapped(this.Description);
+        ImGui.PopStyleColor();
+
+        if (this.CheckValidity != null)
+        {
+            var validityMsg = this.CheckValidity.Invoke(this.Value);
+            this.IsValid = string.IsNullOrEmpty(validityMsg);
+
+            if (!this.IsValid)
+            {
+                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+                ImGui.Text(validityMsg);
+                ImGui.PopStyleColor();
+            }
+        }
+        else
+        {
+            this.IsValid = true;
+        }
+
+        var warningMessage = this.CheckWarning?.Invoke(this.Value);
+
+        if (warningMessage != null)
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            ImGui.Text(warningMessage);
+            ImGui.PopStyleColor();
+        }
+
+    }
+}

src/XIVLauncher.Core/Components/SettingsPage/SettingsEntry{T}.cs

@@ -93,7 +93,7 @@ public override void Draw()
         }
 
         ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudGrey);
-        ImGuiHelpers.TextWrapped(this.Description);
+        if (!string.IsNullOrWhiteSpace(this.Description)) ImGuiHelpers.TextWrapped(this.Description);
         ImGui.PopStyleColor();
 
         if (this.CheckValidity != null)

src/XIVLauncher.Core/Components/SettingsPage/SettingsPage.cs

@@ -13,6 +13,7 @@ public class SettingsPage : Page
         new SettingsTabGame(),
         new SettingsTabPatching(),
         new SettingsTabWine(),
+        new SettingsTabDxvk(),
         new SettingsTabDalamud(),
         new SettingsTabAbout(),
         new SettingsTabDebug(),

src/XIVLauncher.Core/Components/SettingsPage/SettingsTab.cs

@@ -17,9 +17,10 @@ public override void Draw()
         foreach (SettingsEntry settingsEntry in Entries)
         {
             if (settingsEntry.IsVisible)
+            {
                 settingsEntry.Draw();
-
-            ImGui.Dummy(new Vector2(10) * ImGuiHelpers.GlobalScale);
+                ImGui.Dummy(new Vector2(10) * ImGuiHelpers.GlobalScale);
+            }
         }
 
         base.Draw();

src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabDebug.cs

@@ -1,6 +1,8 @@
 using System.Collections;
 
 using ImGuiNET;
+using XIVLauncher.Core;
+using XIVLauncher.Common;
 
 namespace XIVLauncher.Core.Components.SettingsPage.Tabs;
 
@@ -13,18 +15,21 @@ public override void Draw()
     {
         ImGui.TextUnformatted("Generic Information");
         ImGui.Separator();
-        ImGui.TextUnformatted($"Operating System: {Environment.OSVersion}");
-        ImGui.TextUnformatted($"Runtime Version: {Environment.Version}");
-
+        if (OSInfo.Platform == Platform.Linux)
+            ImGui.TextUnformatted($"Operating System: {OSInfo.Name} - {Environment.OSVersion}");
+        else
+            ImGui.TextUnformatted($"Operating System: {Environment.OSVersion}");
+        ImGui.TextUnformatted($"Runtime Version: {Environment.Version}"); 
+
         if (Program.IsSteamDeckHardware)
             ImGui.Text("Steam Deck Hardware Detected");
 
         if (Program.IsSteamDeckGamingMode)
             ImGui.Text("Steam Deck Gaming Mode Detected");
 
-#if FLATPAK
+        if (OSInfo.IsFlatpak)
             ImGui.Text("Running as a Flatpak");
-#endif
+
 
         ImGui.Spacing();
 

src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabDxvk.cs

@@ -0,0 +1,99 @@
+using System.Runtime.InteropServices;
+using ImGuiNET;
+using XIVLauncher.Common.Unix.Compatibility;
+using XIVLauncher.Core.UnixCompatibility;
+
+namespace XIVLauncher.Core.Components.SettingsPage.Tabs;
+
+public class SettingsTabDxvk : SettingsTab
+{
+    private DictionarySettingsEntry dxvkVersionSetting;
+    private SettingsEntry<DxvkHud> dxvkHudSetting;
+    private SettingsEntry<MangoHud> mangoHudSetting;
+
+    private string dxvkPath = Path.Combine(Program.storage.Root.FullName, "compatibilitytool", "dxvk");
+
+    public SettingsTabDxvk()
+    {
+        Entries = new SettingsEntry[]
+        {
+            dxvkVersionSetting = new DictionarySettingsEntry("DXVK Version", $"Choose which version of DXVK to use. Put your custom DXVK in {dxvkPath}\nEntries marked with *Download* will be downloaded when you log in.", Dxvk.Versions, () => Program.Config.DxvkVersion ?? "dxvk-async-1.10.3", s => Program.Config.DxvkVersion = s, Dxvk.GetDefaultVersion())
+            {
+                CheckWarning = s =>
+                {
+                    if (s is null) return null;
+                    if (s.StartsWith("dxvk-2") || s.StartsWith("dxvk-async-2") || s.StartsWith("dxvk-gplasync-v2"))
+                        return "May not work with older graphics cards. AMD users may need to use env variable RADV_PERFTEST=gpl";
+                    return null;
+                },
+            },
+            new SettingsEntry<bool>("Enable DXVK ASYNC", "Enable DXVK ASYNC patch. May not be available on DXVK >= 2.0", () => Program.Config.DxvkAsyncEnabled ?? true, b => Program.Config.DxvkAsyncEnabled = b)
+            {
+                CheckVisibility = () => dxvkVersionSetting.Value != "DISABLED",
+            },
+
+            dxvkHudSetting = new SettingsEntry<DxvkHud>("DXVK Overlay", "DXVK Hud is included with DXVK. MangoHud must be installed separately.\nFlatpak users need the flatpak version of MangoHud.", () => Program.Config.DxvkHud ?? DxvkHud.None, x => Program.Config.DxvkHud = x)
+            {
+                CheckVisibility = () => dxvkVersionSetting.Value != "DISABLED",
+            },
+
+            new SettingsEntry<string>("DXVK Hud Custom String", "Set a custom string for the built in DXVK Hud. Warning: If it's invalid, the game may hang.", () => Program.Config.DxvkHudCustom ?? Dxvk.DXVK_HUD, s => Program.Config.DxvkHudCustom = s)
+            {
+                CheckVisibility = () => dxvkHudSetting.Value == DxvkHud.Custom && dxvkVersionSetting.Value != "DISABLED",
+                CheckWarning = s =>
+                {
+                    if(!DxvkSettings.DxvkHudStringIsValid(s))
+                        return "That's not a valid hud string";
+                    return null;
+                },
+            },
+            mangoHudSetting = new SettingsEntry<MangoHud>("MangoHud Overlay", "MangoHud is installed. It is recommended to set Dxvk Overlay to None if using MangoHud.", () => Program.Config.MangoHud ?? MangoHud.None, x => Program.Config.MangoHud = x)
+            {
+                CheckVisibility = () => dxvkVersionSetting.Value != "DISABLED" && Dxvk.MangoHudInstalled,
+                CheckWarning = x =>
+                {
+                    if (dxvkHudSetting.Value != DxvkHud.None && x != MangoHud.None)
+                        return "Warning! You can run Dxvk Hud and MangoHud at the same time, but you probably shouldn't.\nSet one of them to None.";
+                    return null;
+                }
+            },
+            new SettingsEntry<string>("MangoHud Custom String", "Set a custom string for MangoHud config.", () => Program.Config.MangoHudCustomString ?? Dxvk.MANGOHUD_CONFIG, s => Program.Config.MangoHudCustomString = s)
+            {
+                CheckVisibility = () => mangoHudSetting.Value == MangoHud.CustomString && dxvkVersionSetting.Value != "DISABLED" && Dxvk.MangoHudInstalled,
+                CheckWarning = s =>
+                {
+                    if (s.Contains(' '))
+                        return "No spaces allowed in MangoHud config";
+                    return null;
+                }
+            },
+            new SettingsEntry<string>("MangoHud Custom Path", "Set a custom path for MangoHud config file.", () => Program.Config.MangoHudCustomFile ?? Dxvk.MANGOHUD_CONFIGFILE, s => Program.Config.MangoHudCustomFile = s)
+            {
+                CheckVisibility = () => mangoHudSetting.Value == MangoHud.CustomFile && dxvkVersionSetting.Value != "DISABLED" && Dxvk.MangoHudInstalled,
+                CheckWarning = s =>
+                {
+                    if(!File.Exists(s))
+                        return "That's not a valid file.";
+                    return null;
+                },
+            },
+            new NumericSettingsEntry("Frame Rate Limit", "Set a frame rate limit, and DXVK will try not exceed it. Use 0 for unlimited.", () => Program.Config.DxvkFrameRateLimit ?? 0, i => Program.Config.DxvkFrameRateLimit = i, 0, 1000)
+            {
+                CheckVisibility = () => dxvkVersionSetting.Value != "DISABLED",
+            },
+        };
+    }
+
+    public override SettingsEntry[] Entries { get; }
+
+    public override bool IsUnixExclusive => true;
+
+    public override string Title => "DXVK";
+
+    public override void Save()
+    {
+        base.Save();
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            Program.CreateCompatToolsInstance();
+    }
+}

src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs

@@ -38,16 +38,22 @@ public override void Draw()
             Program.ClearPrefix();
         }
 
-        ImGui.Text("\nClear the managed Wine install and DXVK");
+        ImGui.Text("\nClear the managed Wine and DXVK installs. Custom versions won't be touched.");
         if (ImGui.Button("Clear Wine & DXVK"))
         {
             Program.ClearTools(true);
         }
 
-        ImGui.Text("\nClear all the files and folders related to Dalamud. Your settings will not be touched,\nbut all your plugins will be uninstalled, including custom repos.");
+        ImGui.Text("\nClear all the files and folders related to Dalamud. This will not uninstall your plugins or their configurations.");
         if (ImGui.Button("Clear Dalamud"))
         {
-            Program.ClearPlugins(true);
+            Program.ClearDalamud(true);
+        }
+
+        ImGui.Text("\nClear the installedPlugins folder. This will uninstall your plugins, but will not remove their configurations.");
+        if (ImGui.Button("Clear Plugins"))
+        {
+            Program.ClearPlugins();
         }
 
         ImGui.Text("\nClear all the log files.");
@@ -68,6 +74,12 @@ public override void Draw()
             Program.ClearAll(true);
         }
 
+        ImGui.Text("\nOpen the .xlcore folder in your file browser.");
+        if (ImGui.Button("Open .xlcore"))
+        {
+            PlatformHelpers.OpenBrowser(Program.storage.Root.FullName);
+        }
+
         ImGui.Text("\nGenerate a troubleshooting pack to upload to the official Discord channel");
         if (ImGui.Button("Generate tspack"))
         {