0x0ade/DP-CustomResolution
1
0
Fork 0
Code Pull requests Projects Releases Packages Wiki Activity

config: Add "Game hang protection" (auto-disable on 1s+ hangs)

Browse source
This commit is contained in:
Jade Macho 2025-07-06 16:04:03 +02:00
parent 23f5a22b2c
commit 103556bd5e
Signed by: 0x0ade
GPG key ID: E1960710FE4FBEEF
5 changed files with 49 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CustomResolution2782/Configuration.cs
View file

@ -59,7 +59,8 @@ public class Configuration : IPluginConfiguration
{
Service.PluginLog.Info("Migrating config V0 to V1");
V1 = new();
// V1.Display.IsEnabled = IsEnabled; // Was enabled by default before, but let's disable.
// V1.Display.IsEnabled = IsEnabled;
// ... was enabled by default before, but let's disable for the migration.
V1.Display.IsScale = IsScale;
V1.Display.Scale = Scale;
V1.Display.Width = Width;

2
CustomResolution2782/ConfigurationV1.cs
View file

@ -12,6 +12,7 @@ public struct ConfigurationV1
public ResolutionScalingMode ResolutionScalingMode = ResolutionScalingMode.FSR;
public DXVKDWMHackMode DXVKDWMHackMode = DXVKDWMHackMode.Off;
public MinSizeMode MinSizeMode = MinSizeMode.Unchanged;
public bool DisableOnHang = true;
public ConfigurationV1()
{
@ -38,7 +39,6 @@ public struct ConfigurationV1
public VirtualKey HotkeyKey = VirtualKey.NO_KEY;
public ModifierKey HotkeyModifier = ModifierKey.NONE;
[NonSerialized]
public bool HotkeyKeyDown = false;

53
CustomResolution2782/Plugin.cs
View file

@ -2,6 +2,7 @@
using Dalamud.Game.Config;
using Dalamud.Plugin;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.System.Framework;
using ImGuiNET;
using System;
using System.Collections.Generic;
@ -78,40 +79,46 @@ public sealed unsafe class Plugin : IDalamudPlugin
Service.PluginUI.Dispose();
}
private void OnFrameworkUpdateForSize(ref ConfigurationV1.SizeConfig size)
private void OnFrameworkUpdateForSize(IFramework framework, string type, ref ConfigurationV1.SizeConfig size)
{
if (size.HotkeyKey == VirtualKey.NO_KEY)
if (Service.ClientState.IsLoggedIn && framework.UpdateDelta.TotalSeconds >= 1 && Service.Config._.DisableOnHang && size.IsEnabled)
{
return;
}
var io = ImGui.GetIO();
var keyPressedIm = ImGuiNative.igIsKeyPressed((ImGuiKey) size.HotkeyKey, 0) != 0;
var keyDownXiv = Service.KeyState.GetRawValue(size.HotkeyKey) != 0;
if ((keyPressedIm || (keyDownXiv && !size.HotkeyKeyDown)) &&
(size.HotkeyModifier switch
{
ModifierKey.NONE => !io.KeyCtrl && !io.KeyAlt && !io.KeyShift,
ModifierKey.CTRL => io.KeyCtrl && !io.KeyAlt && !io.KeyShift,
ModifierKey.ALT => !io.KeyCtrl && io.KeyAlt && !io.KeyShift,
ModifierKey.SHIFT => !io.KeyCtrl && !io.KeyAlt && io.KeyShift,
_ => false,
}))
{
size.IsEnabled = !size.IsEnabled;
Service.PluginLog.Warning($"Disabling because hang: {type}");
Service.PrintChat($"Lag detected, \"{type}\" custom resolution disabled.");
size.IsEnabled = false;
Service.Config.Save();
}
size.HotkeyKeyDown = keyDownXiv;
if (size.HotkeyKey != VirtualKey.NO_KEY)
{
var io = ImGui.GetIO();
var keyPressedIm = ImGuiNative.igIsKeyPressed((ImGuiKey) size.HotkeyKey, 0) != 0;
var keyDownXiv = Service.KeyState.GetRawValue(size.HotkeyKey) != 0;
if ((keyPressedIm || (keyDownXiv && !size.HotkeyKeyDown)) &&
(size.HotkeyModifier switch
{
ModifierKey.NONE => !io.KeyCtrl && !io.KeyAlt && !io.KeyShift,
ModifierKey.CTRL => io.KeyCtrl && !io.KeyAlt && !io.KeyShift,
ModifierKey.ALT => !io.KeyCtrl && io.KeyAlt && !io.KeyShift,
ModifierKey.SHIFT => !io.KeyCtrl && !io.KeyAlt && io.KeyShift,
_ => false,
}))
{
size.IsEnabled = !size.IsEnabled;
Service.Config.Save();
}
size.HotkeyKeyDown = keyDownXiv;
}
}
private void OnFrameworkUpdate(IFramework framework)
{
lock (_disposeLock)
{
OnFrameworkUpdateForSize(ref Service.Config._.Display);
OnFrameworkUpdateForSize(ref Service.Config._.Game);
OnFrameworkUpdateForSize(framework, "Display", ref Service.Config._.Display);
OnFrameworkUpdateForSize(framework, "Gameplay", ref Service.Config._.Game);
Service.DisplaySize.Update();
Service.GameSize.Update();

3
CustomResolution2782/Service.cs
View file

@ -9,6 +9,9 @@ namespace CustomResolution;
public sealed class Service
{
public static readonly string PluginName = typeof(Plugin).Assembly.GetName().Name!;
public static Plugin Plugin { get; internal set; } = null!;
public static DisplaySizeState DisplaySize { get; internal set; } = null!;

13
CustomResolution2782/Windows/ConfigWindow.cs
View file

@ -304,5 +304,18 @@ Not intended to be used with proper fullscreen.");
ImGui.EndCombo();
}
ImGui.Checkbox("Game hang protection", ref _.DisableOnHang);
if (ImGui.IsItemHovered())
{
ImGui.SetTooltip(@$"Automatically disables scaling if the game hangs for more than a second.
Leave this option enabled if you want this plugin to disable itself as a protection
in case the resolution changes unexpectedly, or in case the resolution goes too high.
In the absolute worst case, delete the following file to reset your settings:
%%AppData%%\XIVLauncher\pluginConfigs\{Service.PluginName}.json");
}
}
}