Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HID: Complete refactor of pad/touch input to fix threading issues.

Browse source
This commit is contained in:
bunnei 2015-03-09 00:14:59 -04:00
parent 953e09ddb5
commit d61b26b79f
7 changed files with 109 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/citra/emu_window/emu_window_glfw.cpp
View file

@ -23,18 +23,15 @@ void EmuWindow_GLFW::OnMouseButtonEvent(GLFWwindow* win, int button, int action,
double x, y;
glfwGetCursorPos(win, &x, &y);
if (action == GLFW_PRESS) {
emu_window->TouchPressed(layout, static_cast<u16>(x), static_cast<u16>(y));
} else if (action == GLFW_RELEASE) {
emu_window->TouchReleased(layout, static_cast<u16>(x), static_cast<u16>(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) {
auto emu_window = GetEmuWindow(win);
auto layout = emu_window->GetFramebufferLayout();
emu_window->TouchMoved(layout, static_cast<u16>(x), static_cast<u16>(y));
GetEmuWindow(win)->TouchMoved(static_cast<unsigned>(x), static_cast<unsigned>(y));
}
/// Called by GLFW when a key event occurs
@ -45,10 +42,8 @@ void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int acti
if (action == GLFW_PRESS) {
emu_window->KeyPressed({key, keyboard_id});
} else if (action == GLFW_RELEASE) {
emu_window->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