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

Remove KeyboardDevice which was essentially useless

Browse source 
Refactor InputDevice to simplify it
This commit is contained in:
Silent 2019-06-29 00:55:45 +02:00
parent 1acaec2494
commit 0b5458f759
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
13 changed files with 127 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Windows/WindowsHost.cpp
View file

@ -66,7 +66,6 @@
#include "Windows/DinputDevice.h"
#endif
#include "Windows/XinputDevice.h"
#include "Windows/KeyboardDevice.h"
#include "Windows/main.h"
#include "UI/OnScreenDisplay.h"
@ -89,17 +88,14 @@ WindowsHost::WindowsHost(HINSTANCE hInstance, HWND mainWindow, HWND displayWindo
g_mouseDeltaY = 0;
//add first XInput device to respond
input.push_back(std::shared_ptr<InputDevice>(new XinputDevice()));
input.push_back(std::make_unique<XinputDevice>());
#ifndef _M_ARM
//find all connected DInput devices of class GamePad
numDinputDevices_ = DinputDevice::getNumPads();
for (size_t i = 0; i < numDinputDevices_; i++) {
input.push_back(std::shared_ptr<InputDevice>(new DinputDevice(static_cast<int>(i))));
input.push_back(std::make_unique<DinputDevice>(static_cast<int>(i)));
}
#endif
keyboard = std::shared_ptr<KeyboardDevice>(new KeyboardDevice());
input.push_back(keyboard);
SetConsolePosition();
}
@ -221,7 +217,7 @@ void WindowsHost::PollControllers() {
if (newCount > numDinputDevices_) {
INFO_LOG(SYSTEM, "New controller device detected");
for (size_t i = numDinputDevices_; i < newCount; i++) {
input.push_back(std::shared_ptr<InputDevice>(new DinputDevice(static_cast<int>(i))));
input.push_back(std::make_unique<DinputDevice>(static_cast<int>(i)));
}
numDinputDevices_ = newCount;
}
@ -229,12 +225,9 @@ void WindowsHost::PollControllers() {
checkCounter = 0;
}
bool doPad = true;
for (const auto &device : input) {
if (!doPad && device->IsPad())
continue;
if (device->UpdateState() == InputDevice::UPDATESTATE_SKIP_PAD)
doPad = false;
break;
}
// Disabled by default, needs a workaround to map to psp keys.