diff options
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 22 | ||||
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.h | 4 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 81231e1e5..8a0cd9b5a 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -16,6 +16,26 @@ EmuWindow_GLFW* EmuWindow_GLFW::GetEmuWindow(GLFWwindow* win) { return static_cast<EmuWindow_GLFW*>(glfwGetWindowUserPointer(win)); } +void EmuWindow_GLFW::OnMouseButtonEvent(GLFWwindow* window, int button, int action, int mods) { + if (button == GLFW_MOUSE_BUTTON_LEFT) { + auto layout = GetEmuWindow(window)->GetFramebufferLayout(); + double x, y; + glfwGetCursorPos(window, &x, &y); + + if (action == GLFW_PRESS) { + EmuWindow::TouchPressed(layout, static_cast<u16>(x), static_cast<u16>(y)); + } else if (action == GLFW_RELEASE) { + EmuWindow::TouchReleased(layout, static_cast<u16>(x), static_cast<u16>(y)); + } + } +} + +void EmuWindow_GLFW::OnCursorPosEvent(GLFWwindow* window, double x, double y) { + + auto layout = GetEmuWindow(window)->GetFramebufferLayout(); + EmuWindow::TouchMoved(layout, static_cast<u16>(x), static_cast<u16>(y)); +} + /// Called by GLFW when a key event occurs void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) { @@ -88,6 +108,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); diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index 5252fccc8..16c109b79 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h @@ -27,6 +27,10 @@ public: static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods); + static void OnMouseButtonEvent(GLFWwindow* window, int button, int action, int mods); + + static void OnCursorPosEvent(GLFWwindow* window, double x, double y); + /// Whether the window is still open, and a close request hasn't yet been sent const bool IsOpen(); |