Compatibility rework

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

@@ -19,6 +19,7 @@
 using XIVLauncher.Core.Accounts;
 using XIVLauncher.Common.Game.Exceptions;
 using XIVLauncher.Core.Support;
+using XIVLauncher.Core.UnixCompatibility;
 
 namespace XIVLauncher.Core.Components.MainPage;
 
@@ -738,15 +739,15 @@ 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 == WineType.Custom)
             {
                 if (App.Settings.WineBinaryPath == null)
                     throw new Exception("Custom wine binary path wasn't set.");
                 else if (!Directory.Exists(App.Settings.WineBinaryPath))
                     throw new Exception("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 Exception("Custom wine binary path is invalid: no wine64 found at that location.\n" +
+                else if (!File.Exists(Path.Combine(App.Settings.WineBinaryPath, "wine64")) && !File.Exists(Path.Combine(App.Settings.WineBinaryPath, "wine")))
+                    throw new Exception("Custom wine binary path is invalid: no wine or wine64 found at that location.\n" +
                         "Check path carefully for typos: " + App.Settings.WineBinaryPath);
             }
 
@@ -756,12 +757,10 @@ 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);
+                var gameFixApply = new GameFixApply(App.Settings.GamePath, App.Settings.GameConfigPath, Program.CompatibilityTools.Prefix, tempPath);
                 gameFixApply.UpdateProgress += (text, hasProgress, progress) =>
                 {
                     App.LoadingPage.Line1 = "Applying game-specific fixes...";

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

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

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

@@ -16,9 +16,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,5 +1,7 @@
 using System.Collections;
 using ImGuiNET;
+using XIVLauncher.Common;
+using XIVLauncher.Core.UnixCompatibility;
 
 namespace XIVLauncher.Core.Components.SettingsPage.Tabs;
 
@@ -12,7 +14,10 @@ public override void Draw()
     {
         ImGui.TextUnformatted("Generic Information");
         ImGui.Separator();
-        ImGui.TextUnformatted($"Operating System: {Environment.OSVersion}");
+        if (Distro.Platform == Platform.Linux)
+            ImGui.TextUnformatted($"Operating System: {Distro.Name} - {Environment.OSVersion}");
+        else
+            ImGui.TextUnformatted($"Operating System: {Environment.OSVersion}");
         ImGui.TextUnformatted($"Runtime Version: {Environment.Version}"); 
 
         if (Program.IsSteamDeckHardware)
@@ -21,9 +26,8 @@ public override void Draw()
         if (Program.IsSteamDeckGamingMode)
             ImGui.Text("Steam Deck Gaming Mode Detected");
 
-#if FLATPAK
+        if (Distro.IsFlatpak)
             ImGui.Text("Running as a Flatpak");
-#endif
 
         ImGui.Spacing();
 

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

@@ -0,0 +1,99 @@
+using System.IO;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using ImGuiNET;
+using XIVLauncher.Common.Unix.Compatibility;
+using XIVLauncher.Common.Util;
+using XIVLauncher.Core.UnixCompatibility;
+
+namespace XIVLauncher.Core.Components.SettingsPage.Tabs;
+
+public class SettingsTabDxvk : SettingsTab
+{
+    private SettingsEntry<DxvkVersion> dxvkVersionSetting;
+    private SettingsEntry<bool> wineD3DUseVk;
+    private SettingsEntry<HudType> hudSetting;
+
+    public SettingsTabDxvk()
+    {
+        Entries = new SettingsEntry[]
+        {
+            dxvkVersionSetting = new SettingsEntry<DxvkVersion>("DXVK Version", "Choose which version of DXVK to use.", () => Program.Config.DxvkVersion ?? DxvkVersion.v1_10_3, type => Program.Config.DxvkVersion = type)
+            {
+                CheckWarning = type =>
+                {
+                    if (new [] {DxvkVersion.v2_1, DxvkVersion.v2_2}.Contains(type))
+                        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.", () => Program.Config.DxvkAsyncEnabled ?? true, b => Program.Config.DxvkAsyncEnabled = b)
+            {
+                CheckVisibility = () => (new [] {DxvkVersion.v1_10_3, DxvkVersion.v2_0}.Contains(dxvkVersionSetting.Value)),
+                CheckWarning = b =>
+                {
+                    if (!b && dxvkVersionSetting.Value == DxvkVersion.v2_0)
+                        return "AMD users may need to use env variable RADV_PERFTEST=gpl";
+                    return null;
+                },
+            },
+            hudSetting = new SettingsEntry<HudType>("DXVK Overlay", "DXVK Hud is included with Dxvk. It doesn't work if Dxvk is disabled.\nMangoHud must be installed separately. Flatpak XIVLauncher needs flatpak MangoHud.", () => Program.Config.HudType, x => Program.Config.HudType = x)
+            {
+                CheckVisibility = () => dxvkVersionSetting.Value != DxvkVersion.Disabled,
+                CheckValidity = x =>
+                {
+                    if ((x == HudType.MangoHud || x == HudType.MangoHudCustom || x == HudType.MangoHudFull)
+                        && (HudManager.FindMangoHud() is null))
+                        return "MangoHud not detected.";
+
+                    return null;
+                },
+                CheckWarning = x =>
+                {
+                    if ((x == HudType.MangoHud || x == HudType.MangoHudCustom || x == HudType.MangoHudFull)
+                        && (HudManager.FindMangoHud() is not null))
+                        return "WARNING! Using MangoHud, Dalamud AND ReShade all at the same time may result in crashes. Using any two should be safe.";
+
+                    return null;
+                } 
+            },
+            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, s => Program.Config.DxvkHudCustom = s)
+            {
+                CheckVisibility = () => hudSetting.Value == HudType.Custom && dxvkVersionSetting.Value != DxvkVersion.Disabled,
+                CheckWarning = s =>
+                {
+                    if(!HudManager.CheckDxvkHudString(s))
+                        return "That's not a valid hud string";
+                    return null;
+                },
+            },
+            new SettingsEntry<string>("MangoHud Custom Path", "Set a custom path for MangoHud config file.", () => Program.Config.MangoHudCustom, s => Program.Config.MangoHudCustom = s)
+            {
+                CheckVisibility = () => hudSetting.Value == HudType.MangoHudCustom  && !(dxvkVersionSetting.Value == DxvkVersion.Disabled && !wineD3DUseVk.Value),
+                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.DxvkFrameRate ?? 0, i => Program.Config.DxvkFrameRate = i, 0, 1000)
+            {
+                CheckVisibility = () => dxvkVersionSetting.Value != DxvkVersion.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

@@ -25,12 +25,6 @@ public override void Draw()
 
         ImGui.Separator();
 
-        ImGui.Text("\nReset settings to default.");
-        if (ImGui.Button("Clear Settings"))
-        {
-            Program.ClearSettings(true);
-        }        
-
         ImGui.Text("\nClear the Wine Prefix - delete the ~/.xlcore/wineprefix folder");
         if (ImGui.Button("Clear Prefix"))
         {
@@ -55,6 +49,12 @@ public override void Draw()
             Program.ClearLogs(true);
         }
 
+        ImGui.Text("\nReset settings to default.");
+        if (ImGui.Button("Clear Settings"))
+        {
+            Program.ClearSettings(true);
+        }     
+
         ImGui.Text("\nDo all of the above.");
         if (ImGui.Button("Clear Everything"))
         {

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

@@ -3,25 +3,31 @@
 using ImGuiNET;
 using XIVLauncher.Common.Unix.Compatibility;
 using XIVLauncher.Common.Util;
+using XIVLauncher.Core.UnixCompatibility;
 
 namespace XIVLauncher.Core.Components.SettingsPage.Tabs;
 
 public class SettingsTabWine : SettingsTab
 {
-    private SettingsEntry<WineStartupType> startupTypeSetting;
+    private SettingsEntry<WineType> startupTypeSetting;
 
     public SettingsTabWine()
     {
         Entries = new SettingsEntry[]
         {
-            startupTypeSetting = new SettingsEntry<WineStartupType>("Wine Version", "Choose how XIVLauncher will start and manage your wine installation.",
-                () => Program.Config.WineStartupType ?? WineStartupType.Managed, x => Program.Config.WineStartupType = x),
+            startupTypeSetting = new SettingsEntry<WineType>("Installation Type", "Choose how XIVLauncher will start and manage your game installation.",
+                () => Program.Config.WineType ?? WineType.Managed, x => Program.Config.WineType = x),
 
+            new SettingsEntry<WineVersion>("Wine Version", "Choose a patched wine version.", () => Program.Config.WineVersion ?? WineVersion.Wine7_10, x => Program.Config.WineVersion = x)
+            {
+                CheckVisibility = () => startupTypeSetting.Value == WineType.Managed
+            },
+
             new SettingsEntry<string>("Wine Binary Path",
                 "Set the path XIVLauncher will use to run applications via wine.\nIt should be an absolute path to a folder containing wine64 and wineserver binaries.",
                 () => Program.Config.WineBinaryPath, s => Program.Config.WineBinaryPath = s)
             {
-                CheckVisibility = () => startupTypeSetting.Value == WineStartupType.Custom
+                CheckVisibility = () => startupTypeSetting.Value == WineType.Custom
             },
 
             new SettingsEntry<bool>("Enable Feral's GameMode", "Enable launching with Feral Interactive's GameMode CPU optimizations.", () => Program.Config.GameModeEnabled ?? true, b => Program.Config.GameModeEnabled = b)
@@ -36,8 +42,8 @@ public SettingsTabWine()
                 }
             },
 
-            new SettingsEntry<bool>("Enable DXVK ASYNC", "Enable DXVK ASYNC patch.", () => Program.Config.DxvkAsyncEnabled ?? true, b => Program.Config.DxvkAsyncEnabled = b),
             new SettingsEntry<bool>("Enable ESync", "Enable eventfd-based synchronization.", () => Program.Config.ESyncEnabled ?? true, b => Program.Config.ESyncEnabled = b),
+
             new SettingsEntry<bool>("Enable FSync", "Enable fast user mutex (futex2).", () => Program.Config.FSyncEnabled ?? true, b => Program.Config.FSyncEnabled = b)
             {
                 CheckVisibility = () => RuntimeInformation.IsOSPlatform(OSPlatform.Linux),
@@ -49,10 +55,6 @@ public SettingsTabWine()
                     return null;
                 }
             },
-
-            new SettingsEntry<bool>("Set Windows version to 7", "Default for Wine 8.1+ is Windows 10, but this causes issues with some Dalamud plugins. Windows 7 is recommended for now.", () => Program.Config.SetWin7 ?? true, b => Program.Config.SetWin7 = b),
-
-            new SettingsEntry<Dxvk.DxvkHudType>("DXVK Overlay", "Configure how much of the DXVK overlay is to be shown.", () => Program.Config.DxvkHudType, type => Program.Config.DxvkHudType = type),
             new SettingsEntry<string>("WINEDEBUG Variables", "Configure debug logging for wine. Useful for troubleshooting.", () => Program.Config.WineDebugVars ?? string.Empty, s => Program.Config.WineDebugVars = s)
         };
     }
@@ -67,6 +69,10 @@ public override void Draw()
     {
         base.Draw();
 
+        ImGui.Separator();
+
+        ImGui.Dummy(new Vector2(10) * ImGuiHelpers.GlobalScale);
+
         if (!Program.CompatibilityTools.IsToolDownloaded)
         {
             ImGui.BeginDisabled();
@@ -77,7 +83,7 @@ public override void Draw()
 
         if (ImGui.Button("Open prefix"))
         {
-            PlatformHelpers.OpenBrowser(Program.CompatibilityTools.Settings.Prefix.FullName);
+            PlatformHelpers.OpenBrowser(Program.CompatibilityTools.Prefix.FullName);
         }
 
         ImGui.SameLine();
@@ -94,6 +100,31 @@ public override void Draw()
             Program.CompatibilityTools.RunInPrefix("explorer");
         }
 
+        ImGui.SameLine();
+
+        if (ImGui.Button("Open Wine explorer (use WineD3D"))
+        {
+            Program.CompatibilityTools.RunInPrefix("explorer", wineD3D: true);
+
+        }
+
+        ImGui.Dummy(new Vector2(10) * ImGuiHelpers.GlobalScale);
+
+
+        if (ImGui.Button("Set Wine to Windows 7"))
+        {
+            Program.CompatibilityTools.RunInPrefix($"winecfg /v win7", redirectOutput: true, writeLog: true);
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("Set Wine to Windows 10"))
+        {
+            Program.CompatibilityTools.RunInPrefix($"winecfg /v win10", redirectOutput: true, writeLog: true);
+        }
+
+        ImGui.Dummy(new Vector2(10) * ImGuiHelpers.GlobalScale);
+
         if (ImGui.Button("Kill all wine processes"))
         {
             Program.CompatibilityTools.Kill();

src/XIVLauncher.Core/Configuration/ILauncherConfig.cs

@@ -3,6 +3,7 @@
 using XIVLauncher.Common.Dalamud;
 using XIVLauncher.Common.Game.Patch.Acquisition;
 using XIVLauncher.Common.Unix.Compatibility;
+using XIVLauncher.Core.UnixCompatibility;
 
 namespace XIVLauncher.Core.Configuration;
 
@@ -62,7 +63,11 @@ public interface ILauncherConfig
 
     #region Linux
 
-    public WineStartupType? WineStartupType { get; set; }
+    public WineType? WineType { get; set; }
+
+    public WineVersion? WineVersion { get; set; }
+
+    public DxvkVersion? DxvkVersion { get; set; }
 
     public string? WineBinaryPath { get; set; }
 
@@ -74,16 +79,20 @@ public interface ILauncherConfig
 
     public bool? FSyncEnabled { get; set; }
 
-    public Dxvk.DxvkHudType DxvkHudType { get; set; }
+    public HudType HudType { get; set; }
+
+    public string? DxvkHudCustom { get; set; }
+
+    public string? MangoHudCustom { get; set; }
+
+    public int? DxvkFrameRate { get; set; }
 
     public string? WineDebugVars { get; set; }
 
     public bool? FixLDP { get; set; }
 
     public bool? FixIM { get; set; }
 
-    public bool? SetWin7 { get; set; }
-
     #endregion
 
     #region Dalamud