4 files changed, 70 insertions, 51 deletions

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<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;
 
-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();
 }
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
 };
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 573060d30..657e39bea 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -109,8 +109,35 @@ EmuThread& GRenderWindow::GetEmuThread()
     return emu_thread;
 }
 
+static const std::pair<int, HID_User::PadState> default_key_map[] = {
+    { Qt::Key_A, HID_User::PAD_A },
+    { Qt::Key_B, HID_User::PAD_B },
+    { Qt::Key_Backslash, HID_User::PAD_SELECT },
+    { Qt::Key_Enter, HID_User::PAD_START },
+    { Qt::Key_Right, HID_User::PAD_RIGHT },
+    { Qt::Key_Left, HID_User::PAD_LEFT },
+    { Qt::Key_Up, HID_User::PAD_UP },
+    { Qt::Key_Down, HID_User::PAD_DOWN },
+    { Qt::Key_R, HID_User::PAD_R },
+    { Qt::Key_L, HID_User::PAD_L },
+    { Qt::Key_X, HID_User::PAD_X },
+    { Qt::Key_Y, HID_User::PAD_Y },
+    { Qt::Key_H, HID_User::PAD_CIRCLE_RIGHT },
+    { Qt::Key_F, HID_User::PAD_CIRCLE_LEFT },
+    { Qt::Key_T, HID_User::PAD_CIRCLE_UP },
+    { Qt::Key_G, HID_User::PAD_CIRCLE_DOWN },
+};
+
 GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this)
 {
+    // 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);
+    }
+
     // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose
     QGLFormat fmt;
     fmt.setProfile(QGLFormat::CoreProfile);
@@ -209,27 +236,13 @@ QByteArray GRenderWindow::saveGeometry()
 
 void GRenderWindow::keyPressEvent(QKeyEvent* event)
 {
-    /*
-    bool key_processed = false;
-    for (unsigned int channel = 0; channel < 4 && controller_interface(); ++channel)
-        if (controller_interface()->SetControllerStatus(channel, event->key(), input_common::GCController::PRESSED))
-            key_processed = true;
-
-    if (!key_processed)
-        QWidget::keyPressEvent(event);
-    */
+    EmuWindow::KeyPressed({event->key(), keyboard_id});
+    HID_User::PadUpdateComplete();
 }
 
 void GRenderWindow::keyReleaseEvent(QKeyEvent* event)
 {
-    /*
-    bool key_processed = false;
-    for (unsigned int channel = 0; channel < 4 && controller_interface(); ++channel)
-        if (controller_interface()->SetControllerStatus(channel, event->key(), input_common::GCController::RELEASED))
-            key_processed = true;
-
-    if (!key_processed)
-        QWidget::keyPressEvent(event);
-    */
+    EmuWindow::KeyReleased({event->key(), keyboard_id});
+    HID_User::PadUpdateComplete();
 }
 
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.hxx
index 51cb781e9..eedf19471 100644
--- a/src/citra_qt/bootmanager.hxx
+++ b/src/citra_qt/bootmanager.hxx
@@ -116,4 +116,6 @@ private:
     EmuThread emu_thread;
 
     QByteArray geometry;
+
+    int keyboard_id;
 };