diff options
author | bunnei <bunneidev@gmail.com> | 2014-09-12 23:44:25 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-09-12 23:44:25 +0200 |
commit | cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f (patch) | |
tree | c9c95671835d73b5ca7e52029de5bb27832e11a3 /src/citra | |
parent | Merge pull request #99 from archshift/ext-check (diff) | |
parent | Added support for multiple input device types for KeyMap and connected Qt. (diff) | |
download | yuzu-cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f.tar yuzu-cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f.tar.gz yuzu-cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f.tar.bz2 yuzu-cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f.tar.lz yuzu-cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f.tar.xz yuzu-cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f.tar.zst yuzu-cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f.zip |
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 54 | ||||
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.h | 5 |
2 files changed, 48 insertions, 11 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 02f524e03..b911e60c5 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -8,18 +8,55 @@ #include "citra/emu_window/emu_window_glfw.h" -static void OnKeyEvent(GLFWwindow* win, int key, int action) { - // TODO(bunnei): ImplementMe -} +static const std::pair<int, HID_User::PadState> default_key_map[] = { + { GLFW_KEY_A, HID_User::PAD_A }, + { GLFW_KEY_B, HID_User::PAD_B }, + { GLFW_KEY_BACKSLASH, HID_User::PAD_SELECT }, + { GLFW_KEY_ENTER, HID_User::PAD_START }, + { GLFW_KEY_RIGHT, HID_User::PAD_RIGHT }, + { GLFW_KEY_LEFT, HID_User::PAD_LEFT }, + { GLFW_KEY_UP, HID_User::PAD_UP }, + { GLFW_KEY_DOWN, HID_User::PAD_DOWN }, + { GLFW_KEY_R, HID_User::PAD_R }, + { GLFW_KEY_L, HID_User::PAD_L }, + { GLFW_KEY_X, HID_User::PAD_X }, + { GLFW_KEY_Y, HID_User::PAD_Y }, + { GLFW_KEY_H, HID_User::PAD_CIRCLE_RIGHT }, + { GLFW_KEY_F, HID_User::PAD_CIRCLE_LEFT }, + { GLFW_KEY_T, HID_User::PAD_CIRCLE_UP }, + { GLFW_KEY_G, HID_User::PAD_CIRCLE_DOWN }, +}; + +/// Called by GLFW when a key event occurs +void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) { + + if (!VideoCore::g_emu_window) { + return; + } + + int keyboard_id = ((EmuWindow_GLFW*)VideoCore::g_emu_window)->keyboard_id; + + if (action == GLFW_PRESS) { + EmuWindow::KeyPressed({key, keyboard_id}); + } -static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) { - EmuWindow_GLFW* emu_window = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); - emu_window->SetClientAreaWidth(width); - emu_window->SetClientAreaHeight(height); + if (action == GLFW_RELEASE) { + EmuWindow::KeyReleased({key, keyboard_id}); + } + HID_User::PadUpdateComplete(); } /// EmuWindow_GLFW constructor EmuWindow_GLFW::EmuWindow_GLFW() { + + // Register a new ID for the default keyboard + keyboard_id = KeyMap::NewDeviceId(); + + // Set default key mappings for keyboard + for (auto mapping : default_key_map) { + KeyMap::SetKeyMapping({mapping.first, keyboard_id}, mapping.second); + } + // Initialize the window if(glfwInit() != GL_TRUE) { printf("Failed to initialize GLFW! Exiting..."); @@ -45,8 +82,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() { // Setup callbacks glfwSetWindowUserPointer(m_render_window, this); - //glfwSetKeyCallback(m_render_window, OnKeyEvent); - //glfwSetWindowSizeCallback(m_render_window, OnWindowSizeEvent); + glfwSetKeyCallback(m_render_window, OnKeyEvent); DoneCurrent(); } diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index c1b41203b..29325bb75 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h @@ -25,8 +25,9 @@ public: /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread void DoneCurrent(); - GLFWwindow* m_render_window; ///< Internal GLFW render window + static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods); private: - + GLFWwindow* m_render_window; ///< Internal GLFW render window + int keyboard_id; ///< Device id of keyboard for use with KeyMap }; |