From 4a94ec934ab1a2216f94e3fcc46f5dde1d6e2f02 Mon Sep 17 00:00:00 2001 From: Kevin Hartman Date: Wed, 3 Sep 2014 18:12:58 -0700 Subject: Initial HID PAD work, with GLFW only. --- src/citra/emu_window/emu_window_glfw.cpp | 39 +++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) (limited to 'src/citra/emu_window/emu_window_glfw.cpp') diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 02f524e03..0a861cff0 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -8,8 +8,35 @@ #include "citra/emu_window/emu_window_glfw.h" -static void OnKeyEvent(GLFWwindow* win, int key, int action) { - // TODO(bunnei): ImplementMe +static const KeyMap::DefaultKeyMapping default_key_map[] = { + { KeyMap::CitraKey(GLFW_KEY_A), HID_User::PAD_A }, + { KeyMap::CitraKey(GLFW_KEY_B), HID_User::PAD_B }, + { KeyMap::CitraKey(GLFW_KEY_BACKSLASH), HID_User::PAD_SELECT }, + { KeyMap::CitraKey(GLFW_KEY_ENTER), HID_User::PAD_START }, + { KeyMap::CitraKey(GLFW_KEY_RIGHT), HID_User::PAD_RIGHT }, + { KeyMap::CitraKey(GLFW_KEY_LEFT), HID_User::PAD_LEFT }, + { KeyMap::CitraKey(GLFW_KEY_UP), HID_User::PAD_UP }, + { KeyMap::CitraKey(GLFW_KEY_DOWN), HID_User::PAD_DOWN }, + { KeyMap::CitraKey(GLFW_KEY_R), HID_User::PAD_R }, + { KeyMap::CitraKey(GLFW_KEY_L), HID_User::PAD_L }, + { KeyMap::CitraKey(GLFW_KEY_X), HID_User::PAD_X }, + { KeyMap::CitraKey(GLFW_KEY_Y), HID_User::PAD_Y }, + { KeyMap::CitraKey(GLFW_KEY_H), HID_User::PAD_CIRCLE_RIGHT }, + { KeyMap::CitraKey(GLFW_KEY_F), HID_User::PAD_CIRCLE_LEFT }, + { KeyMap::CitraKey(GLFW_KEY_T), HID_User::PAD_CIRCLE_UP }, + { KeyMap::CitraKey(GLFW_KEY_G), HID_User::PAD_CIRCLE_DOWN }, +}; + + +static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) { + if (action == GLFW_PRESS) { + EmuWindow::KeyPressed(KeyMap::CitraKey(key)); + } + + if (action == GLFW_RELEASE) { + EmuWindow::KeyReleased(KeyMap::CitraKey(key)); + } + HID_User::PADUpdateComplete(); } static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) { @@ -20,6 +47,12 @@ static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) { /// EmuWindow_GLFW constructor EmuWindow_GLFW::EmuWindow_GLFW() { + + // Set default key mappings + for (int i = 0; i < ARRAY_SIZE(default_key_map); i++) { + KeyMap::SetKeyMapping(default_key_map[i].key, default_key_map[i].state); + } + // Initialize the window if(glfwInit() != GL_TRUE) { printf("Failed to initialize GLFW! Exiting..."); @@ -45,7 +78,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() { // Setup callbacks glfwSetWindowUserPointer(m_render_window, this); - //glfwSetKeyCallback(m_render_window, OnKeyEvent); + glfwSetKeyCallback(m_render_window, OnKeyEvent); //glfwSetWindowSizeCallback(m_render_window, OnWindowSizeEvent); DoneCurrent(); -- cgit v1.2.3 From 02fd19b2f60f4db8a683734e4300d7498c861309 Mon Sep 17 00:00:00 2001 From: Kevin Hartman Date: Mon, 8 Sep 2014 21:46:02 -0700 Subject: Added support for multiple input device types for KeyMap and connected Qt. --- src/citra/emu_window/emu_window_glfw.cpp | 65 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 31 deletions(-) (limited to 'src/citra/emu_window/emu_window_glfw.cpp') diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 0a861cff0..b911e60c5 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -8,49 +8,53 @@ #include "citra/emu_window/emu_window_glfw.h" -static const KeyMap::DefaultKeyMapping default_key_map[] = { - { KeyMap::CitraKey(GLFW_KEY_A), HID_User::PAD_A }, - { KeyMap::CitraKey(GLFW_KEY_B), HID_User::PAD_B }, - { KeyMap::CitraKey(GLFW_KEY_BACKSLASH), HID_User::PAD_SELECT }, - { KeyMap::CitraKey(GLFW_KEY_ENTER), HID_User::PAD_START }, - { KeyMap::CitraKey(GLFW_KEY_RIGHT), HID_User::PAD_RIGHT }, - { KeyMap::CitraKey(GLFW_KEY_LEFT), HID_User::PAD_LEFT }, - { KeyMap::CitraKey(GLFW_KEY_UP), HID_User::PAD_UP }, - { KeyMap::CitraKey(GLFW_KEY_DOWN), HID_User::PAD_DOWN }, - { KeyMap::CitraKey(GLFW_KEY_R), HID_User::PAD_R }, - { KeyMap::CitraKey(GLFW_KEY_L), HID_User::PAD_L }, - { KeyMap::CitraKey(GLFW_KEY_X), HID_User::PAD_X }, - { KeyMap::CitraKey(GLFW_KEY_Y), HID_User::PAD_Y }, - { KeyMap::CitraKey(GLFW_KEY_H), HID_User::PAD_CIRCLE_RIGHT }, - { KeyMap::CitraKey(GLFW_KEY_F), HID_User::PAD_CIRCLE_LEFT }, - { KeyMap::CitraKey(GLFW_KEY_T), HID_User::PAD_CIRCLE_UP }, - { KeyMap::CitraKey(GLFW_KEY_G), HID_User::PAD_CIRCLE_DOWN }, +static const std::pair 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; -static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) { if (action == GLFW_PRESS) { - EmuWindow::KeyPressed(KeyMap::CitraKey(key)); + EmuWindow::KeyPressed({key, keyboard_id}); } if (action == GLFW_RELEASE) { - EmuWindow::KeyReleased(KeyMap::CitraKey(key)); + EmuWindow::KeyReleased({key, keyboard_id}); } - HID_User::PADUpdateComplete(); -} - -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); + HID_User::PadUpdateComplete(); } /// EmuWindow_GLFW constructor EmuWindow_GLFW::EmuWindow_GLFW() { - // Set default key mappings - for (int i = 0; i < ARRAY_SIZE(default_key_map); i++) { - KeyMap::SetKeyMapping(default_key_map[i].key, default_key_map[i].state); + // 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 @@ -79,7 +83,6 @@ EmuWindow_GLFW::EmuWindow_GLFW() { // Setup callbacks glfwSetWindowUserPointer(m_render_window, this); glfwSetKeyCallback(m_render_window, OnKeyEvent); - //glfwSetWindowSizeCallback(m_render_window, OnWindowSizeEvent); DoneCurrent(); } -- cgit v1.2.3