Merge pull request #2475 from goatcorp/api14-rollup

[api14] Rollup changes from master

Dalamud/Configuration/Internal/DalamudConfiguration.cs

@@ -108,11 +108,6 @@ internal sealed class DalamudConfiguration : IInternalDisposableService
     /// </summary>
     public bool DoPluginTest { get; set; } = false;
 
-    /// <summary>
-    /// Gets or sets a key to opt into Dalamud staging builds.
-    /// </summary>
-    public string? DalamudBetaKey { get; set; } = null;
-
     /// <summary>
     /// Gets or sets a list of custom repos.
     /// </summary>
@@ -278,11 +273,6 @@ internal sealed class DalamudConfiguration : IInternalDisposableService
     /// </summary>
     public bool IsResumeGameAfterPluginLoad { get; set; } = false;
 
-    /// <summary>
-    /// Gets or sets the kind of beta to download when <see cref="DalamudBetaKey"/> matches the server value.
-    /// </summary>
-    public string? DalamudBetaKind { get; set; }
-
     /// <summary>
     /// Gets or sets a value indicating whether any plugin should be loaded when the game is started.
     /// It is reset immediately when read.

Dalamud/Data/DataManager.cs

@@ -41,7 +41,7 @@ internal sealed class DataManager : IInternalDisposableService, IDataManager
         try
         {
             Log.Verbose("Starting data load...");
-            
+
             using (Timings.Start("Lumina Init"))
             {
                 var luminaOptions = new LuminaOptions
@@ -53,12 +53,25 @@ internal sealed class DataManager : IInternalDisposableService, IDataManager
                     DefaultExcelLanguage = this.Language.ToLumina(),
                 };
 
-                this.GameData = new(
+                try
-                    Path.Combine(Path.GetDirectoryName(Environment.ProcessPath)!, "sqpack"),
-                    luminaOptions)
                 {
-                    StreamPool = new(),
+                    this.GameData = new(
-                };
+                        Path.Combine(Path.GetDirectoryName(Environment.ProcessPath)!, "sqpack"),
+                        luminaOptions)
+                    {
+                        StreamPool = new(),
+                    };
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, "Lumina GameData init failed");
+                    Util.Fatal(
+                        "Dalamud could not read required game data files. This likely means your game installation is corrupted or incomplete.\n\n" +
+                        "Please repair your installation by right-clicking the login button in XIVLauncher and choosing \"Repair game files\".",
+                        "Dalamud");
+
+                    return;
+                }
 
                 Log.Information("Lumina is ready: {0}", this.GameData.DataPath);
 
@@ -71,7 +84,7 @@ internal sealed class DataManager : IInternalDisposableService, IDataManager
                                 dalamud.StartInfo.TroubleshootingPackData);
                         this.HasModifiedGameDataFiles =
                             tsInfo?.IndexIntegrity is LauncherTroubleshootingInfo.IndexIntegrityResult.Failed or LauncherTroubleshootingInfo.IndexIntegrityResult.Exception;
-                        
+
                         if (this.HasModifiedGameDataFiles)
                             Log.Verbose("Game data integrity check failed!\n{TsData}", dalamud.StartInfo.TroubleshootingPackData);
                     }
@@ -130,7 +143,7 @@ internal sealed class DataManager : IInternalDisposableService, IDataManager
     #region Lumina Wrappers
 
     /// <inheritdoc/>
-    public ExcelSheet<T> GetExcelSheet<T>(ClientLanguage? language = null, string? name = null) where T : struct, IExcelRow<T> 
+    public ExcelSheet<T> GetExcelSheet<T>(ClientLanguage? language = null, string? name = null) where T : struct, IExcelRow<T>
         => this.Excel.GetSheet<T>(language?.ToLumina(), name);
 
     /// <inheritdoc/>
@@ -138,7 +151,7 @@ internal sealed class DataManager : IInternalDisposableService, IDataManager
         => this.Excel.GetSubrowSheet<T>(language?.ToLumina(), name);
 
     /// <inheritdoc/>
-    public FileResource? GetFile(string path) 
+    public FileResource? GetFile(string path)
         => this.GetFile<FileResource>(path);
 
     /// <inheritdoc/>
@@ -161,7 +174,7 @@ internal sealed class DataManager : IInternalDisposableService, IDataManager
             : Task.FromException<T>(new FileNotFoundException("The file could not be found."));
 
     /// <inheritdoc/>
-    public bool FileExists(string path) 
+    public bool FileExists(string path)
         => this.GameData.FileExists(path);
 
     #endregion

Dalamud/Game/Internal/DalamudAtkTweaks.cs

@@ -113,7 +113,7 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
     private void AtkUnitBaseReceiveGlobalEventDetour(AtkUnitBase* thisPtr, AtkEventType eventType, int eventParam, AtkEvent* atkEvent, AtkEventData* atkEventData)
     {
         // 3 == Close
-        if (eventType == AtkEventType.InputReceived && WindowSystem.HasAnyWindowSystemFocus && atkEventData != null && *(int*)atkEventData == 3 && this.configuration.IsFocusManagementEnabled)
+        if (eventType == AtkEventType.InputReceived && WindowSystem.ShouldInhibitAtkCloseEvents && atkEventData != null && *(int*)atkEventData == 3 && this.configuration.IsFocusManagementEnabled)
         {
             Log.Verbose($"Cancelling global event SendHotkey command due to WindowSystem {WindowSystem.FocusedWindowSystemNamespace}");
             return;
@@ -124,7 +124,7 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
 
     private void AgentHudOpenSystemMenuDetour(AgentHUD* thisPtr, AtkValue* atkValueArgs, uint menuSize)
     {
-        if (WindowSystem.HasAnyWindowSystemFocus && this.configuration.IsFocusManagementEnabled)
+        if (WindowSystem.ShouldInhibitAtkCloseEvents && this.configuration.IsFocusManagementEnabled)
         {
             Log.Verbose($"Cancelling OpenSystemMenu due to WindowSystem {WindowSystem.FocusedWindowSystemNamespace}");
             return;

Dalamud/Interface/Internal/DalamudInterface.cs

@@ -182,7 +182,7 @@ internal class DalamudInterface : IInternalDisposableService
                     () => Service<DalamudInterface>.GetNullable()?.ToggleDevMenu(),
                     VirtualKey.SHIFT);
 
-                if (!configuration.DalamudBetaKind.IsNullOrEmpty())
+                if (Util.GetActiveTrack() != "release")
                 {
                     titleScreenMenu.AddEntryCore(
                         Loc.Localize("TSMDalamudDevMenu", "Developer Menu"),

Dalamud/Interface/Internal/InterfaceManager.cs

@@ -1175,6 +1175,7 @@ internal partial class InterfaceManager : IInternalDisposableService
 
         WindowSystem.HasAnyWindowSystemFocus = false;
         WindowSystem.FocusedWindowSystemNamespace = string.Empty;
+        WindowSystem.ShouldInhibitAtkCloseEvents = false;
 
         if (this.IsDispatchingEvents)
         {

Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs

@@ -6,7 +6,6 @@ using System.Net.Http.Json;
 using System.Threading.Tasks;
 
 using Dalamud.Bindings.ImGui;
-using Dalamud.Configuration.Internal;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
@@ -15,6 +14,8 @@ using Dalamud.Utility;
 
 using Newtonsoft.Json;
 
+using Serilog;
+
 namespace Dalamud.Interface.Internal.Windows;
 
 /// <summary>
@@ -47,7 +48,7 @@ public class BranchSwitcherWindow : Window
             Debug.Assert(this.branches != null, "this.branches != null");
 
             var trackName = Util.GetActiveTrack();
-            this.selectedBranchIndex = this.branches.IndexOf(x => x.Value.Track != trackName);
+            this.selectedBranchIndex = this.branches.IndexOf(x => x.Value.Track == trackName);
             if (this.selectedBranchIndex == -1)
             {
                 this.selectedBranchIndex = 0;
@@ -86,12 +87,9 @@ public class BranchSwitcherWindow : Window
 
             if (ImGui.Button("Pick & Restart"u8))
             {
-                var config = Service<DalamudConfiguration>.Get();
+                var newTrackName = pickedBranch.Key;
-                config.DalamudBetaKind = pickedBranch.Key;
+                var newTrackKey = pickedBranch.Value.Key;
-                config.DalamudBetaKey = pickedBranch.Value.Key;
+                Log.Verbose("Switching to branch {Branch} with key {Key}", newTrackName, newTrackKey);
-
-                // If we exit immediately, we need to write out the new config now
-                config.ForceSave();
 
                 var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
                 var xlPath = Path.Combine(appData, "XIVLauncher", "current", "XIVLauncher.exe");
@@ -104,8 +102,8 @@ public class BranchSwitcherWindow : Window
                         UseShellExecute = false,
                     };
 
-                    ps.ArgumentList.Add($"--dalamud-beta-kind={config.DalamudBetaKind}");
+                    ps.ArgumentList.Add($"--dalamud-beta-kind={newTrackName}");
-                    ps.ArgumentList.Add($"--dalamud-beta-key={(config.DalamudBetaKey.IsNullOrEmpty() ? "invalid" : config.DalamudBetaKey)}");
+                    ps.ArgumentList.Add($"--dalamud-beta-key={(newTrackKey.IsNullOrEmpty() ? "invalid" : newTrackKey)}");
 
                     Process.Start(ps);
                     Environment.Exit(0);

Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs

@@ -302,8 +302,7 @@ internal class PluginInstallerWindow : Window, IDisposable
 
         this.profileManagerWidget.Reset();
 
-        var config = Service<DalamudConfiguration>.Get();
+        if (this.staleDalamudNewVersion == null && !Util.GetActiveTrack().IsNullOrEmpty())
-        if (this.staleDalamudNewVersion == null && !config.DalamudBetaKind.IsNullOrEmpty())
         {
             Service<DalamudReleases>.Get().GetVersionForCurrentTrack().ContinueWith(t =>
             {
@@ -311,10 +310,10 @@ internal class PluginInstallerWindow : Window, IDisposable
                     return;
 
                 var versionInfo = t.Result;
-                if (versionInfo.AssemblyVersion != Util.GetScmVersion() &&
+                if (versionInfo.AssemblyVersion != Util.GetScmVersion())
-                    versionInfo.Track != "release" &&
+                {
-                    string.Equals(versionInfo.Key, config.DalamudBetaKey, StringComparison.OrdinalIgnoreCase))
                     this.staleDalamudNewVersion = versionInfo.AssemblyVersion;
+                }
             });
         }
     }

Dalamud/Interface/Windowing/Window.cs

@@ -226,6 +226,16 @@ public abstract class Window
     /// </summary>
     public bool AllowClickthrough { get; set; } = true;
 
+    /// <summary>
+    /// Gets a value indicating whether this window is pinned.
+    /// </summary>
+    public bool IsPinned => this.internalIsPinned;
+
+    /// <summary>
+    /// Gets a value indicating whether this window is click-through.
+    /// </summary>
+    public bool IsClickthrough => this.internalIsClickthrough;
+
     /// <summary>
     /// Gets or sets a list of available title bar buttons.
     ///

Dalamud/Interface/Windowing/WindowSystem.cs

@@ -60,6 +60,12 @@ public class WindowSystem
     /// </summary>
     public string? Namespace { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether ATK close events should be inhibited while any window has focus.
+    /// Does not respect windows that are pinned or clickthrough.
+    /// </summary>
+    internal static bool ShouldInhibitAtkCloseEvents { get; set; }
+
     /// <summary>
     /// Add a window to this <see cref="WindowSystem"/>.
     /// The window system doesn't own your window, it just renders it
@@ -130,7 +136,7 @@ public class WindowSystem
             window.DrawInternal(flags, persistence);
         }
 
-        var focusedWindow = this.windows.FirstOrDefault(window => window.IsFocused && window.RespectCloseHotkey);
+        var focusedWindow = this.windows.FirstOrDefault(window => window.IsFocused);
         this.HasAnyFocus = focusedWindow != default;
 
         if (this.HasAnyFocus)
@@ -155,6 +161,11 @@ public class WindowSystem
             }
         }
 
+        ShouldInhibitAtkCloseEvents |= this.windows.Any(w => w.IsFocused &&
+                                                            w.RespectCloseHotkey &&
+                                                            !w.IsPinned &&
+                                                            !w.IsClickthrough);
+
         if (hasNamespace)
             ImGui.PopID();
     }

Dalamud/Support/DalamudReleases.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 
 using Dalamud.Configuration.Internal;
 using Dalamud.Networking.Http;
+using Dalamud.Utility;
 
 using Newtonsoft.Json;
 
@@ -15,7 +16,7 @@ namespace Dalamud.Support;
 internal class DalamudReleases : IServiceType
 {
     private const string VersionInfoUrl = "https://kamori.goats.dev/Dalamud/Release/VersionInfo?track={0}";
-    
+
     private readonly HappyHttpClient httpClient;
     private readonly DalamudConfiguration config;
 
@@ -30,20 +31,24 @@ internal class DalamudReleases : IServiceType
         this.httpClient = httpClient;
         this.config = config;
     }
-    
+
     /// <summary>
     /// Get the latest version info for the current track.
     /// </summary>
     /// <returns>The version info for the current track.</returns>
-    public async Task<DalamudVersionInfo> GetVersionForCurrentTrack()
+    public async Task<DalamudVersionInfo?> GetVersionForCurrentTrack()
     {
-        var url = string.Format(VersionInfoUrl, [this.config.DalamudBetaKind]);
+        var currentTrack = Util.GetActiveTrack();
+        if (currentTrack.IsNullOrEmpty())
+            return null;
+
+        var url = string.Format(VersionInfoUrl, [currentTrack]);
         var response = await this.httpClient.SharedHttpClient.GetAsync(url);
         response.EnsureSuccessStatusCode();
         var content = await response.Content.ReadAsStringAsync();
         return JsonConvert.DeserializeObject<DalamudVersionInfo>(content);
     }
-    
+
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "laziness")]
     public class DalamudVersionInfo
     {

Dalamud/Support/Troubleshooting.cs

@@ -73,7 +73,7 @@ public static class Troubleshooting
                 DalamudGitHash = Util.GetGitHash() ?? "Unknown",
                 GameVersion = startInfo.GameVersion?.ToString() ?? "Unknown",
                 Language = startInfo.Language.ToString(),
-                BetaKey = configuration.DalamudBetaKey,
+                BetaKey = Util.GetActiveTrack(),
                 DoPluginTest = configuration.DoPluginTest,
                 LoadAllApiLevels = pluginManager?.LoadAllApiLevels == true,
                 InterfaceLoaded = interfaceManager?.IsReady ?? false,

Directory.Build.props

@@ -6,6 +6,10 @@
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
         <LangVersion>13.0</LangVersion>
+
+        <!-- Disable Intel CET. Causes crashes on unpatched Windows 10 systems. -->
+        <!-- https://github.com/dotnet/runtime/issues/108589 -->
+        <CETCompat>false</CETCompat>
     </PropertyGroup>
 
     <!-- Code analysis settings for all Dalamud projects. -->

lib/FFXIVClientStructs

@@ -1 +1 @@
-Subproject commit 0769d1f180f859688f47a7a99610e9ce10da946c
+Subproject commit e5f586630ef06fa48d5dc0d8c0fa679323093c77