diff options
author | bunnei <bunneidev@gmail.com> | 2015-03-12 02:28:57 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-03-12 02:28:57 +0100 |
commit | ed5b275d21612906e6eeb4b1f344aa0f1eb31c10 (patch) | |
tree | 54ffc1fe7163996fdaed1cb5cd948015409dcac6 /src/citra/emu_window/emu_window_glfw.cpp | |
parent | Merge pull request #629 from archshift/lcdfb (diff) | |
parent | hid_user: Removed unnecessary includes. (diff) | |
download | yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar.gz yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar.bz2 yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar.lz yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar.xz yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar.zst yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.zip |
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.cpp')
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 81231e1e5..997e3bc7d 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -16,18 +16,34 @@ EmuWindow_GLFW* EmuWindow_GLFW::GetEmuWindow(GLFWwindow* win) { return static_cast<EmuWindow_GLFW*>(glfwGetWindowUserPointer(win)); } +void EmuWindow_GLFW::OnMouseButtonEvent(GLFWwindow* win, int button, int action, int mods) { + if (button == GLFW_MOUSE_BUTTON_LEFT) { + auto emu_window = GetEmuWindow(win); + auto layout = emu_window->GetFramebufferLayout(); + double x, y; + glfwGetCursorPos(win, &x, &y); + + if (action == GLFW_PRESS) + emu_window->TouchPressed(static_cast<unsigned>(x), static_cast<unsigned>(y)); + else if (action == GLFW_RELEASE) + emu_window->TouchReleased(); + } +} + +void EmuWindow_GLFW::OnCursorPosEvent(GLFWwindow* win, double x, double y) { + GetEmuWindow(win)->TouchMoved(static_cast<unsigned>(x), static_cast<unsigned>(y)); +} + /// Called by GLFW when a key event occurs void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) { - - int keyboard_id = GetEmuWindow(win)->keyboard_id; + auto emu_window = GetEmuWindow(win); + int keyboard_id = emu_window->keyboard_id; if (action == GLFW_PRESS) { - EmuWindow::KeyPressed({key, keyboard_id}); + emu_window->KeyPressed({key, keyboard_id}); } else if (action == GLFW_RELEASE) { - EmuWindow::KeyReleased({key, keyboard_id}); + emu_window->KeyReleased({key, keyboard_id}); } - - Service::HID::PadUpdateComplete(); } /// Whether the window is still open, and a close request hasn't yet been sent @@ -88,6 +104,8 @@ EmuWindow_GLFW::EmuWindow_GLFW() { // Setup callbacks glfwSetKeyCallback(m_render_window, OnKeyEvent); + glfwSetMouseButtonCallback(m_render_window, OnMouseButtonEvent); + glfwSetCursorPosCallback(m_render_window, OnCursorPosEvent); glfwSetFramebufferSizeCallback(m_render_window, OnFramebufferResizeEvent); glfwSetWindowSizeCallback(m_render_window, OnClientAreaResizeEvent); |