From 02fd19b2f60f4db8a683734e4300d7498c861309 Mon Sep 17 00:00:00 2001
From: Kevin Hartman <kevin@hart.mn>
Date: Mon, 8 Sep 2014 21:46:02 -0700
Subject: Added support for multiple input device types for KeyMap and
 connected Qt.

---
 src/citra_qt/bootmanager.cpp | 49 ++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 18 deletions(-)

(limited to 'src/citra_qt/bootmanager.cpp')

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 573060d3..657e39be 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();
 }
 
-- 
cgit v1.2.3