RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Perform refactoring of pads to remove the ugly pad initialization.

Browse source
This commit is contained in:
Robbie 2017-07-12 09:07:40 -05:00 • committed by Ivan
parent b01e7e3362
commit d1cde4d0a7
8 changed files with 127 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rpcs3/basic_keyboard_handler.cpp
View file

@ -1,5 +1,6 @@
#include "basic_keyboard_handler.h"
#include <QApplication>
#include <QKeyEvent>
void basic_keyboard_handler::Init(const u32 max_connect)
@ -17,16 +18,33 @@ void basic_keyboard_handler::Init(const u32 max_connect)
m_info.status[0] = CELL_KB_STATUS_CONNECTED; // (TODO: Support for more keyboards)
}
basic_keyboard_handler::basic_keyboard_handler(QObject* target, QObject* parent) : QObject(parent), m_target(target)
basic_keyboard_handler::basic_keyboard_handler() : QObject()
{
// Adds event filter to the target to filter keyevents.
target->installEventFilter(this);
}
/* Sets the target window for the event handler, and also installs an event filter on the target. */
void basic_keyboard_handler::SetTargetWindow(QWindow* target)
{
if (target != nullptr)
{
m_target = target;
target->installEventFilter(this);
}
else
{
// If this is hit, it probably means that some refactoring occurs because currently a gsframe is created in Load.
// We still want events so filter from application instead since target is null.
QApplication::instance()->installEventFilter(this);
LOG_ERROR(GENERAL, "Trying to set keyboard handler to a null target window.");
}
}
bool basic_keyboard_handler::eventFilter(QObject* target, QEvent* ev)
{
// Commenting target since I don't know how to target game window yet.
//if (target == m_target)
// !m_target is for future proofing when gsrender isn't automatically initialized on load.
// !m_target->isVisible() is a hack since currently a guiless application will STILL inititialize a gsrender (providing a valid target)
if (!m_target || !m_target->isVisible() || target == m_target)
{
if (ev->type() == QEvent::KeyPress)
{