thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KEYMAPPER: Rework HardwareInputSet not to allocate all possible inputs

Browse source
This commit is contained in:
Bastien Bouclet 2020-01-26 12:18:52 +01:00
parent 0995f40677
commit df7ce0c55f
12 changed files with 324 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

15
backends/keymapper/input-watcher.cpp
View file

@ -30,14 +30,13 @@ namespace Common {
InputWatcher::InputWatcher(EventDispatcher *eventDispatcher, Keymapper *keymapper) :
_eventDispatcher(eventDispatcher),
_keymapper(keymapper),
_watching(false),
_hwInput(nullptr) {
_watching(false) {
}
void InputWatcher::startWatching() {
assert(!_watching);
assert(!_hwInput);
assert(_hwInput.type == kHardwareInputTypeInvalid);
_keymapper->setEnabled(false);
_eventDispatcher->registerObserver(this, EventManager::kEventRemapperPriority, false);
@ -56,7 +55,7 @@ bool InputWatcher::isWatching() const {
bool InputWatcher::notifyEvent(const Event &event) {
assert(_watching);
assert(!_hwInput);
assert(_hwInput.type == kHardwareInputTypeInvalid);
switch (event.type) {
case EVENT_KEYDOWN:
@ -64,7 +63,7 @@ bool InputWatcher::notifyEvent(const Event &event) {
case EVENT_KEYUP:
case EVENT_CUSTOM_BACKEND_HARDWARE:
_hwInput = _keymapper->findHardwareInput(event);
if (_hwInput) {
if (_hwInput.type != kHardwareInputTypeInvalid) {
stopWatching();
}
return true;
@ -75,9 +74,9 @@ bool InputWatcher::notifyEvent(const Event &event) {
return false;
}
const HardwareInput *InputWatcher::checkForCapturedInput() {
const HardwareInput *hwInput = _hwInput;
_hwInput = nullptr;
HardwareInput InputWatcher::checkForCapturedInput() {
HardwareInput hwInput = _hwInput;
_hwInput = HardwareInput();
return hwInput;
}