lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-08-26 08:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add debouncing to shortcuts

Browse Source 
Just a workaround really, we probably would need to do a major overhaul to handle inputs well
This commit is contained in:
FakeMichau
2026-04-08 16:33:44 +02:00
parent 8cc0051215
commit df52ef4876
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/menu/menu_common.cpp
+16 -4
View File
@@ -36,11 +36,14 @@ static ImVec2 overlaySize(0.0f, 0.0f);
static ImVec2 overlayPosition(-1000.0f, -1000.0f);
static bool _hdrTonemapApplied = false;
static ImVec4 SdrColors[ImGuiCol_COUNT];
static bool receivingWmInputs = false;
static bool inputMenu = false;
static bool inputFG = false;
static bool inputFps = false;
static bool inputFpsCycle = false;
static uint64_t lastInputTick = 0;
constexpr uint64_t debounceThreshold = 60;
static bool hasGamepad = false;
static bool fsr31InitTried = false;
static bool xefgInitTried = false;
@@ -783,14 +786,17 @@ LRESULT MenuCommon::WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
RAWINPUT rawData {};
UINT rawDataSize = sizeof(rawData);
// More of a workaround than a fix, stop accepting inputs for {debounceThreshold} ms
const auto currentTick = GetTickCount64();
const bool canAcceptInputs = lastInputTick + debounceThreshold < currentTick;
if (msg == WM_INPUT && GetRawInputData(reinterpret_cast<HRAWINPUT>(lParam), RID_INPUT, &rawData, &rawDataSize,
sizeof(rawData.data)) != (UINT) -1)
{
auto rawCode = GET_RAWINPUT_CODE_WPARAM(wParam);
rawRead = true;
receivingWmInputs = true;
bool isKeyUp = (rawData.data.keyboard.Flags & RI_KEY_BREAK) != 0;
if (isKeyUp && rawData.header.dwType == RIM_TYPEKEYBOARD && rawData.data.keyboard.VKey != 0)
if (isKeyUp && rawData.header.dwType == RIM_TYPEKEYBOARD && rawData.data.keyboard.VKey != 0 && canAcceptInputs)
{
lastKey = rawData.data.keyboard.VKey;
@@ -806,13 +812,16 @@ LRESULT MenuCommon::WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (!inputFpsCycle)
inputFpsCycle =
rawData.data.keyboard.VKey == Config::Instance()->FpsCycleShortcutKey.value_or_default();
if (inputMenu || inputFps || inputFG || inputFpsCycle)
lastInputTick = currentTick;
}
}
if (!lastKey && msg == WM_KEYUP)
lastKey = static_cast<int>(wParam);
if (!receivingWmInputs)
if (canAcceptInputs)
{
if (!inputMenu)
inputMenu = msg == WM_KEYUP && wParam == Config::Instance()->ShortcutKey.value_or_default();
@@ -825,6 +834,9 @@ LRESULT MenuCommon::WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (!inputFpsCycle)
inputFpsCycle = msg == WM_KEYUP && wParam == Config::Instance()->FpsCycleShortcutKey.value_or_default();
if (inputMenu || inputFps || inputFG || inputFpsCycle)
lastInputTick = currentTick;
}
// SHIFT + DEL - Debug dump