Fix broken dxvk version and improve steam deck detection

goatcorp · Nov 7, 2024 · f5e1981 · f5e1981
1 parent 5feaa62
commit f5e1981
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/XIVLauncher.Core/CoreEnvironmentSettings.cs b/src/XIVLauncher.Core/CoreEnvironmentSettings.cs
@@ -7,7 +7,9 @@ namespace XIVLauncher.Core;
 public static class CoreEnvironmentSettings
 {
     public static bool? IsDeck => CheckEnvBoolOrNull("XL_DECK");
+    public static bool IsSteamDeckVar => CheckEnvBool("SteamDeck");
     public static bool? IsDeckGameMode => CheckEnvBoolOrNull("XL_GAMEMODE");
+    public static bool IsSteamGamepadUIVar => CheckEnvBool("SteamGamepadUI");
     public static bool? IsDeckFirstRun => CheckEnvBoolOrNull("XL_FIRSTRUN");
     public static bool IsUpgrade => CheckEnvBool("XL_SHOW_UPGRADE");
     public static bool ClearSettings => CheckEnvBool("XL_CLEAR_SETTINGS");
@@ -21,6 +23,10 @@ public static class CoreEnvironmentSettings
     public static bool IsSteamCompatTool => CheckEnvBool("XL_SCT");
     public static uint SteamAppId => GetAppId(System.Environment.GetEnvironmentVariable("SteamAppId"));
     public static uint AltAppID => GetAppId(System.Environment.GetEnvironmentVariable("XL_APPID"));
+    public static string HOME => System.Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+    public static string XDG_CONFIG_HOME => string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("XDG_CONFIG_HOME")) ? Path.Combine(HOME, ".config") : System.Environment.GetEnvironmentVariable("XDG_CONFIG_HOME") ?? "";
+    public static string XDG_DATA_HOME => string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("XDG_DATA_HOME")) ? Path.Combine(HOME, ".local", "share") : System.Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? "";
+
 
     private static bool CheckEnvBool(string key)
     {

diff --git a/src/XIVLauncher.Core/Program.cs b/src/XIVLauncher.Core/Program.cs
@@ -59,12 +59,13 @@ sealed class Program
     public static DirectoryInfo DotnetRuntime => storage.GetFolder("runtime");
 
     // TODO: We don't have the steamworks api for this yet.
+    // SteamDeck=1 on Steam Deck by default. SteamGamepadUI=1 in Big Picture / Gaming Mode.
     public static bool IsSteamDeckHardware => CoreEnvironmentSettings.IsDeck.HasValue ?
         CoreEnvironmentSettings.IsDeck.Value :
-        Directory.Exists("/home/deck") || (CoreEnvironmentSettings.IsDeckGameMode ?? false) || (CoreEnvironmentSettings.IsDeckFirstRun ?? false);
+        CoreEnvironmentSettings.IsSteamDeckVar || (CoreEnvironmentSettings.IsDeckGameMode ?? false) || (CoreEnvironmentSettings.IsDeckFirstRun ?? false);
     public static bool IsSteamDeckGamingMode => CoreEnvironmentSettings.IsDeckGameMode.HasValue ?
         CoreEnvironmentSettings.IsDeckGameMode.Value :
-        Steam != null && Steam.IsValid && Steam.IsRunningOnSteamDeck();
+        Steam != null && Steam.IsValid && Steam.IsRunningOnSteamDeck() && CoreEnvironmentSettings.IsSteamGamepadUIVar;
 
     private const string APP_NAME = "xlcore";
 

diff --git a/src/XIVLauncher.Core/UnixCompatibility/Dxvk.cs b/src/XIVLauncher.Core/UnixCompatibility/Dxvk.cs
@@ -28,7 +28,7 @@ public static class Dxvk
     public static string DxvkHudString => Program.Config.DxvkHud switch
     {
         DxvkHud.None => "",
-        DxvkHud.Custom => Program.Config.DxvkHudCustom,
+        DxvkHud.Custom => Program.Config.DxvkHudCustom ?? "",
         DxvkHud.Default => "1",
         DxvkHud.Fps => "fps",
         DxvkHud.Full => "full",
@@ -46,16 +46,16 @@ public static class Dxvk
         MangoHud.None => "",
         MangoHud.Default => "",
         MangoHud.Full => "full",
-        MangoHud.CustomString => Program.Config.MangoHudCustomString,
-        MangoHud.CustomFile => Program.Config.MangoHudCustomFile,
+        MangoHud.CustomString => Program.Config.MangoHudCustomString ?? "",
+        MangoHud.CustomFile => Program.Config.MangoHudCustomFile ?? "",
         _ => throw new ArgumentOutOfRangeException(),
     };
 
     public static string DXVK_HUD => "fps,frametimes,gpuload,version";
 
     public static string MANGOHUD_CONFIG => "ram,vram,resolution,vulkan_driver,engine_version,wine,frame_timing=0";
 
-    public static string MANGOHUD_CONFIGFILE => Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".config", "MangoHud", "MangoHud.conf");
+    public static string MANGOHUD_CONFIGFILE => Path.Combine(CoreEnvironmentSettings.XDG_CONFIG_HOME, "MangoHud", "MangoHud.conf");
 
     public static Dictionary<string, Dictionary<string, string>> Versions { get; private set; }
 
@@ -68,7 +68,7 @@ static Dxvk()
     public static void Initialize()
     {
         // Add default versions.
-        Versions["dxvk-2.4"] = new Dictionary<string, string>()
+        Versions["dxvk-2.4.1"] = new Dictionary<string, string>()
         {
             {"name", "DXVK 2.4.1"}, {"desc", "Latest version, using Graphics Pipeline Libs. Async no longer needed."},
             {"label", "Current"}, {"url", "https://github.com/doitsujin/dxvk/releases/download/v2.4.1/dxvk-2.4.1.tar.gz"},