diff options
| author |  Kevin Hartman <kevin@hart.mn> | 2014-09-08 21:46:02 -0700 |
|---|---|---|
| committer | Kevin Hartman <kevin@hart.mn> | 2014-09-12 01:15:14 -0700 |
| commit | 02fd19b2f60f4db8a683734e4300d7498c861309 (patch) | |
| tree | c9c95671835d73b5ca7e52029de5bb27832e11a3 /src/citra/emu_window/emu_window_glfw.h | |
| parent | 4a94ec934ab1a2216f94e3fcc46f5dde1d6e2f02 (diff) | |
Added support for multiple input device types for KeyMap and connected Qt.
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.h')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index c1b41203..29325bb7 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 }; |