Mirrors/yuzu
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

22
src/citra_qt/bootmanager.cpp
View file

@ -268,39 +268,33 @@ QByteArray GRenderWindow::saveGeometry()
void GRenderWindow::keyPressEvent(QKeyEvent* event)
{
EmuWindow::KeyPressed({event->key(), keyboard_id});
Service::HID::PadUpdateComplete();
this->KeyPressed({event->key(), keyboard_id});
}
void GRenderWindow::keyReleaseEvent(QKeyEvent* event)
{
EmuWindow::KeyReleased({event->key(), keyboard_id});
Service::HID::PadUpdateComplete();
this->KeyReleased({event->key(), keyboard_id});
}
void GRenderWindow::mousePressEvent(QMouseEvent *event)
{
if (event->button() == Qt::LeftButton) {
if (event->button() == Qt::LeftButton)
{
auto pos = event->pos();
EmuWindow::TouchPressed(GetFramebufferLayout(), static_cast<u16>(pos.x()),
static_cast<u16>(pos.y()));
this->TouchPressed(static_cast<unsigned>(pos.x()), static_cast<unsigned>(pos.y()));
}
}
void GRenderWindow::mouseMoveEvent(QMouseEvent *event)
{
auto pos = event->pos();
EmuWindow::TouchMoved(GetFramebufferLayout(), static_cast<u16>(pos.x()),
static_cast<u16>(pos.y()));
this->TouchMoved(static_cast<unsigned>(pos.x()), static_cast<unsigned>(pos.y()));
}
void GRenderWindow::mouseReleaseEvent(QMouseEvent *event)
{
if (event->button() == Qt::LeftButton) {
auto pos = event->pos();
EmuWindow::TouchReleased(GetFramebufferLayout(), static_cast<u16>(pos.x()),
static_cast<u16>(pos.y()));
}
if (event->button() == Qt::LeftButton)
this->TouchReleased();
}
void GRenderWindow::ReloadSetKeymaps()