diff options
| author | bunnei <bunneidev@gmail.com> | 2014-09-12 17:44:25 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-09-12 17:44:25 -0400 |
| commit | cbdf4d4c8e11f8d1503b440eee1ed2d5f144a73f (patch) | |
| tree | c9c95671835d73b5ca7e52029de5bb27832e11a3 /src/citra/emu_window/emu_window_glfw.h | |
| parent | 532a9e80a0bd242d2937335063b719130405d6bc (diff) | |
| parent | 02fd19b2f60f4db8a683734e4300d7498c861309 (diff) | |
Merge pull request #105 from kevinhartman/hid
Digital user input and HID module implementation for PAD
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 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 }; |