archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

improve cellKB keyreleases and autorepeat

Browse source
This commit is contained in:
Megamouse 2017-12-31 12:01:11 +01:00 • committed by Ivan
parent 9614fef4b9
commit bb5bdb2e8c
3 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
rpcs3/Emu/Io/KeyboardHandler.h
View file

@ -248,6 +248,7 @@ struct KbButton
struct Keyboard struct Keyboard
{ {
bool m_key_repeat; // for future use
KbData m_data; KbData m_data;
KbConfig m_config; KbConfig m_config;
std::vector<KbButton> m_buttons; std::vector<KbButton> m_buttons;
@ -255,6 +256,7 @@ struct Keyboard
Keyboard() Keyboard()
: m_data() : m_data()
, m_config() , m_config()
, m_key_repeat(false)
{ {
} }
}; };
@ -274,19 +276,20 @@ public:
{ {
for(Keyboard& keyboard : m_keyboards) for(Keyboard& keyboard : m_keyboards)
{ {
KbData& data = keyboard.m_data;
KbConfig& config = keyboard.m_config;
// TODO: handle read modes
for(KbButton& button : keyboard.m_buttons) for(KbButton& button : keyboard.m_buttons)
{ {
if(button.m_keyCode != code) if(button.m_keyCode != code)
continue; continue;
KbData& data = keyboard.m_data;
KbConfig& config = keyboard.m_config;
if (pressed) if (pressed)
{ {
// Meta Keys // Meta Keys
if (code == 308 || code == 307 || code == 306 || if (code == 308 || code == 307 || code == 306 || code == 393 || code == 396 || code == 394)
code == 393 || code == 396 || code == 394)
{ {
data.mkey |= button.m_outKeyCode; data.mkey |= button.m_outKeyCode;
} }
@ -310,17 +313,17 @@ public:
data.len++; data.len++;
} }
} }
else
if (!pressed)
{ {
// Meta Keys // Meta Keys
if (code == 308 || code == 307 || code == 306 || if (code == 308 || code == 307 || code == 306 || code == 393 || code == 396 || code == 394)
code == 393 || code == 396 || code == 394)
{ {
data.mkey &= ~button.m_outKeyCode; data.mkey &= ~button.m_outKeyCode;
} }
// Needed to indicate key releases. Without this you have to tap another key before using the same key again
data.keycode[0] = CELL_KEYC_NO_EVENT;
data.len = 1;
} }
} }
} }
} }

10
rpcs3/basic_keyboard_handler.cpp
View file

@ -60,11 +60,21 @@ bool basic_keyboard_handler::eventFilter(QObject* target, QEvent* ev)
void basic_keyboard_handler::keyPressEvent(QKeyEvent* keyEvent) void basic_keyboard_handler::keyPressEvent(QKeyEvent* keyEvent)
{ {
if (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat)
{
keyEvent->ignore();
return;
}
Key(keyEvent->key(), 1); Key(keyEvent->key(), 1);
} }
void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent) void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent)
{ {
if (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat)
{
keyEvent->ignore();
return;
}
Key(keyEvent->key(), 0); Key(keyEvent->key(), 0);
} }