ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use a std::map instead of running through the AOS

This commit is contained in:
Michael Maltese 2016-08-09 19:54:59 -07:00
parent a5cc054bd1
commit d1594f9529
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
View File

@ -24,6 +24,7 @@ private:
private: private:
CGKeyCode m_keycode; CGKeyCode m_keycode;
std::string m_name;
}; };
class Cursor : public Input class Cursor : public Input

39
Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
View File

@ -13,20 +13,7 @@ namespace Quartz
{ {
KeyboardAndMouse::Key::Key(CGKeyCode keycode) : m_keycode(keycode) KeyboardAndMouse::Key::Key(CGKeyCode keycode) : m_keycode(keycode)
{ {
} static const std::map<CGKeyCode, std::string> named_keys = {
ControlState KeyboardAndMouse::Key::GetState() const
{
return CGEventSourceKeyState(kCGEventSourceStateHIDSystemState, m_keycode) != 0;
}
std::string KeyboardAndMouse::Key::GetName() const
{
static const struct
{
const CGKeyCode code;
const char* const name;
} named_keys[] = {
{kVK_ANSI_A, "A"}, {kVK_ANSI_A, "A"},
{kVK_ANSI_B, "B"}, {kVK_ANSI_B, "B"},
{kVK_ANSI_C, "C"}, {kVK_ANSI_C, "C"},
@ -127,18 +114,28 @@ std::string KeyboardAndMouse::Key::GetName() const
{kVK_RightOption, "Right Alt"}, {kVK_RightOption, "Right Alt"},
}; };
for (auto& named_key : named_keys) if (named_keys.find(m_keycode) != named_keys.end())
if (named_key.code == m_keycode) m_name = named_keys.at(m_keycode);
return named_key.name; else
m_name = "Key " + std::to_string(m_keycode);
}
return "Key " + std::to_string(m_keycode); ControlState KeyboardAndMouse::Key::GetState() const
{
return CGEventSourceKeyState(kCGEventSourceStateHIDSystemState, m_keycode) != 0;
}
std::string KeyboardAndMouse::Key::GetName() const
{
return m_name;
} }
KeyboardAndMouse::KeyboardAndMouse(void* window) KeyboardAndMouse::KeyboardAndMouse(void* window)
{ {
// All ANSI keycodes in <HIToolbox/Events.h> are 0x7e or lower // All keycodes in <HIToolbox/Events.h> are 0x7e or lower. If you notice
for (int i = 0; i < 0x80; i++) // keys that aren't being recognized, bump this number up!
AddInput(new Key(i)); for (int keycode = 0; keycode < 0x80; ++keycode)
AddInput(new Key(keycode));
m_windowid = [[reinterpret_cast<NSView*>(window) window] windowNumber]; m_windowid = [[reinterpret_cast<NSView*>(window) window] windowNumber];