IOS/KBD: Replace Windows implementation with SDL

Source/Core/Common/Keyboard.cpp

@@ -7,14 +7,10 @@
 #include <mutex>
 #include <utility>
 
-#ifdef _WIN32
+#ifdef HAVE_SDL3
-#include <windows.h>
-#elif defined(HAVE_SDL3)
 #include <SDL3/SDL_events.h>
 #include <SDL3/SDL_keyboard.h>
-#endif
 
-#ifdef HAVE_SDL3
 // Will be overridden by Dolphin's SDL InputBackend
 u32 Common::KeyboardContext::s_sdl_init_event_type(-1);
 u32 Common::KeyboardContext::s_sdl_update_event_type(-1);
@@ -25,171 +21,11 @@ u32 Common::KeyboardContext::s_sdl_quit_event_type(-1);
 
 namespace
 {
-// Crazy ugly
-#ifdef _WIN32
-constexpr std::size_t KEYBOARD_STATE_SIZE = 256;
-constexpr std::array<u8, KEYBOARD_STATE_SIZE> VK_HID_QWERTY{
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x2A,  // Backspace
-    0x2B,  // Tab
-    0x00, 0x00,
-    0x00,  // Clear
-    0x28,  // Return
-    0x00, 0x00,
-    0x00,  // Shift
-    0x00,  // Control
-    0x00,  // ALT
-    0x48,  // Pause
-    0x39,  // Capital
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x29,  // Escape
-    0x00, 0x00, 0x00, 0x00,
-    0x2C,  // Space
-    0x4B,  // Prior
-    0x4E,  // Next
-    0x4D,  // End
-    0x4A,  // Home
-    0x50,  // Left
-    0x52,  // Up
-    0x4F,  // Right
-    0x51,  // Down
-    0x00, 0x00, 0x00,
-    0x46,  // Print screen
-    0x49,  // Insert
-    0x4C,  // Delete
-    0x00,
-    // 0 -> 9
-    0x27, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00,
-    // A -> Z
-    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13,
-    0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
-    // Numpad 0 -> 9
-    0x62, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61,
-    0x55,  // Multiply
-    0x57,  // Add
-    0x00,  // Separator
-    0x56,  // Subtract
-    0x63,  // Decimal
-    0x54,  // Divide
-    // F1 -> F12
-    0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45,
-    // F13 -> F24
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    0x53,  // Numlock
-    0x47,  // Scroll lock
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    // Modifier keys
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x33,  // ';'
-    0x2E,  // Plus
-    0x36,  // Comma
-    0x2D,  // Minus
-    0x37,  // Period
-    0x38,  // '/'
-    0x35,  // '~'
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x2F,  // '['
-    0x32,  // '\'
-    0x30,  // ']'
-    0x34,  // '''
-    0x00,  //
-    0x00,  // Nothing interesting past this point.
-};
-
-constexpr std::array<u8, KEYBOARD_STATE_SIZE> VK_HID_AZERTY{
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x2A,  // Backspace
-    0x2B,  // Tab
-    0x00, 0x00,
-    0x00,  // Clear
-    0x28,  // Return
-    0x00, 0x00,
-    0x00,  // Shift
-    0x00,  // Control
-    0x00,  // ALT
-    0x48,  // Pause
-    0x39,  // Capital
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x29,  // Escape
-    0x00, 0x00, 0x00, 0x00,
-    0x2C,  // Space
-    0x4B,  // Prior
-    0x4E,  // Next
-    0x4D,  // End
-    0x4A,  // Home
-    0x50,  // Left
-    0x52,  // Up
-    0x4F,  // Right
-    0x51,  // Down
-    0x00, 0x00, 0x00,
-    0x46,  // Print screen
-    0x49,  // Insert
-    0x4C,  // Delete
-    0x00,
-    // 0 -> 9
-    0x27, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00,
-    // A -> Z
-    0x14, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x33, 0x11, 0x12, 0x13,
-    0x04, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1D, 0x1B, 0x1C, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00,
-    // Numpad 0 -> 9
-    0x62, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61,
-    0x55,  // Multiply
-    0x57,  // Add
-    0x00,  // Separator
-    0x56,  // Substract
-    0x63,  // Decimal
-    0x54,  // Divide
-    // F1 -> F12
-    0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45,
-    // F13 -> F24
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    0x53,  // Numlock
-    0x47,  // Scroll lock
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    // Modifier keys
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x30,  // '$'
-    0x2E,  // Plus
-    0x10,  // Comma
-    0x00,  // Minus
-    0x36,  // Period
-    0x37,  // '/'
-    0x34,  // ' '
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x2D,  // ')'
-    0x32,  // '\'
-    0x2F,  // '^'
-    0x00,  // ' '
-    0x38,  // '!'
-    0x00,  // Nothing interesting past this point.
-};
-
-u8 MapVirtualKeyToHID(u8 virtual_key, int keyboard_layout)
-{
-  switch (keyboard_layout)
-  {
-  case Common::KBD_LAYOUT_AZERTY:
-    return VK_HID_AZERTY[virtual_key];
-  case Common::KBD_LAYOUT_QWERTY:
-  default:
-    return VK_HID_QWERTY[virtual_key];
-  }
-}
-#else
 u8 MapVirtualKeyToHID(u8 virtual_key, int keyboard_layout)
 {
   // SDL3 keyboard state uses scan codes already based on HID usage id
   return virtual_key;
 }
-#endif
 
 std::weak_ptr<Common::KeyboardContext> s_keyboard_context;
 std::mutex s_keyboard_context_mutex;
@@ -216,7 +52,7 @@ KeyboardContext::~KeyboardContext()
 
 void KeyboardContext::Init()
 {
-#if !defined(_WIN32) && defined(HAVE_SDL3)
+#ifdef HAVE_SDL3
   SDL_Event event{s_sdl_init_event_type};
   SDL_PushEvent(&event);
   m_keyboard_state = SDL_GetKeyboardState(nullptr);
@@ -227,7 +63,7 @@ void KeyboardContext::Init()
 void KeyboardContext::Quit()
 {
   m_is_ready = false;
-#if !defined(_WIN32) && defined(HAVE_SDL3)
+#ifdef HAVE_SDL3
   SDL_Event event{s_sdl_quit_event_type};
   SDL_PushEvent(&event);
 #endif
@@ -253,7 +89,7 @@ void KeyboardContext::NotifyHandlerChanged(const KeyboardContext::HandlerState&
   s_handler_state = state;
   if (s_keyboard_context.expired())
     return;
-#if !defined(_WIN32) && defined(HAVE_SDL3)
+#ifdef HAVE_SDL3
   SDL_Event event{s_sdl_update_event_type};
   SDL_PushEvent(&event);
 #endif
@@ -291,9 +127,7 @@ HIDPressedState KeyboardContext::GetPressedState(int keyboard_layout) const
 
 bool KeyboardContext::IsVirtualKeyPressed(int virtual_key) const
 {
-#ifdef _WIN32
+#ifdef HAVE_SDL3
-  return (GetAsyncKeyState(virtual_key) & 0x8000) != 0;
-#elif defined(HAVE_SDL3)
   if (virtual_key >= SDL_SCANCODE_COUNT)
     return false;
   return m_keyboard_state[virtual_key];
@@ -310,7 +144,6 @@ u8 KeyboardContext::PollHIDModifiers() const
   using VkHidPair = std::pair<int, u8>;
 
   // References:
-  // https://learn.microsoft.com/windows/win32/inputdev/virtual-key-codes
   // https://wiki.libsdl.org/SDL3/SDL_Scancode
   // https://www.usb.org/document-library/device-class-definition-hid-111
   //
@@ -324,11 +157,7 @@ u8 KeyboardContext::PollHIDModifiers() const
   // Bit 6 - RIGHT ALT
   // Bit 7 - RIGHT GUI
   static const std::vector<VkHidPair> MODIFIERS_MAP{
-#ifdef _WIN32
+#ifdef HAVE_SDL3
-      {VK_LCONTROL, 0x01}, {VK_LSHIFT, 0x02},   {VK_LMENU, 0x04},
-      {VK_LWIN, 0x08},     {VK_RCONTROL, 0x10}, {VK_RSHIFT, 0x20},
-      {VK_RMENU, 0x40},    {VK_RWIN, 0x80}
-#elif defined(HAVE_SDL3)
       {SDL_SCANCODE_LCTRL, 0x01}, {SDL_SCANCODE_LSHIFT, 0x02}, {SDL_SCANCODE_LALT, 0x04},
       {SDL_SCANCODE_LGUI, 0x08},  {SDL_SCANCODE_RCTRL, 0x10},  {SDL_SCANCODE_RSHIFT, 0x20},
       {SDL_SCANCODE_RALT, 0x40},  {SDL_SCANCODE_RGUI, 0x80}
@@ -351,10 +180,7 @@ HIDPressedKeys KeyboardContext::PollHIDPressedKeys(int keyboard_layout) const
   HIDPressedKeys pressed_keys{};
   auto it = pressed_keys.begin();
 
-#ifdef _WIN32
+#ifdef HAVE_SDL3
-  const std::size_t begin = 0;
-  const std::size_t end = KEYBOARD_STATE_SIZE;
-#elif defined(HAVE_SDL3)
   const std::size_t begin = SDL_SCANCODE_A;
   const std::size_t end = SDL_SCANCODE_LCTRL;
 #else