Firehawk52-backup/dolphin
28
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-15 16:33:15 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14275 from JosJuice/hotkey-vector

Browse Source 
HotkeyManager: Don't allocate heap memory in GetInput
This commit is contained in:
JMC47
2026-01-11 15:41:03 -05:00
committed by GitHub
parent e065b34a64 3c771ade4b
commit 79255f550d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/HotkeyManager.cpp
View File

@@ -11,6 +11,7 @@
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ranges.h> #include <fmt/ranges.h>
#include "Common/Assert.h"
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
@@ -360,17 +361,18 @@ InputConfig* HotkeyManager::GetConfig() const
void HotkeyManager::GetInput(HotkeyStatus* kb, bool ignore_focus) void HotkeyManager::GetInput(HotkeyStatus* kb, bool ignore_focus)
{ {
std::array<u32, 32> bitmasks;
for (size_t key = 0; key < bitmasks.size(); key++)
bitmasks[key] = static_cast<u32>(1 << key);
const auto lock = GetStateLock(); const auto lock = GetStateLock();
for (std::size_t group = 0; group < s_groups_info.size(); group++) for (std::size_t group = 0; group < s_groups_info.size(); group++)
{ {
if (s_groups_info[group].ignore_focus != ignore_focus) if (s_groups_info[group].ignore_focus != ignore_focus)
continue; continue;
const int group_count = (s_groups_info[group].last - s_groups_info[group].first) + 1; const size_t group_count = (s_groups_info[group].last - s_groups_info[group].first) + 1;
std::vector<u32> bitmasks(group_count); ASSERT(group_count <= bitmasks.size());
for (size_t key = 0; key < bitmasks.size(); key++)
bitmasks[key] = static_cast<u32>(1 << key);
kb->button[group] = 0; kb->button[group] = 0;
m_keys[group]->GetState(&kb->button[group], bitmasks.data()); m_keys[group]->GetState(&kb->button[group], bitmasks.data());
} }