preserve-emulation/RMG
1
0 Fork 0
mirror of https://github.com/Rosalie241/RMG.git synced 2026-11-13 17:48:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

RMG-Input: introduce 'Automatic' input device

Browse Source
This commit is contained in:
Rosalie Wanders committed 2023-02-09 21:53:47 +01:00
1 parent 40a4133565
commit 0628ea920b
4 files changed
+97 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/RMG-Input/UserInterface/MainDialog.cpp
+26 -9
View File
@@ -54,7 +54,8 @@ MainDialog::MainDialog(QWidget* parent, Thread::SDLThread* sdlThread) : QDialog(
// always add keyboard device
for (auto& controllerWidget : this->controllerWidgets)
{
controllerWidget->AddInputDevice("Keyboard", -1);
controllerWidget->AddInputDevice("Automatic", -2);
controllerWidget->AddInputDevice("Keyboard", -1);
}
// fill device list at least once
@@ -90,29 +91,45 @@ void MainDialog::openInputDevice(QString deviceName, int deviceNum)
{
SDL_JoystickID joystickId;
Widget::ControllerWidget* controllerWidget;
controllerWidget = controllerWidgets.at(this->tabWidget->currentIndex());
controllerWidget = this->controllerWidgets.at(this->tabWidget->currentIndex());
// we don't need to open a keyboard
if (deviceNum == -1)
{
currentDeviceName = "";
currentDeviceNum = -1;
this->currentDeviceName = "";
this->currentDeviceNum = -1;
controllerWidget->SetCurrentJoystickID(-1);
return;
}
// handle automatic mode
if (deviceNum == -2)
{
int currentIndex = this->tabWidget->currentIndex();
if (currentIndex < this->inputDeviceList.size())
{ // use device when there's one
deviceNum = this->inputDeviceList.at(currentIndex).deviceNum;
}
else
{ // no device found, fallback to keyboard
this->currentDeviceName = "";
this->currentDeviceNum = -1;
return;
}
}
if (SDL_IsGameController(deviceNum) == SDL_TRUE)
{
currentJoystick = nullptr;
currentController = SDL_GameControllerOpen(deviceNum);
this->currentJoystick = nullptr;
this->currentController = SDL_GameControllerOpen(deviceNum);
}
else
{
currentJoystick = SDL_JoystickOpen(deviceNum);
currentController = nullptr;
this->currentJoystick = SDL_JoystickOpen(deviceNum);
this->currentController = nullptr;
}
currentDeviceNum = deviceNum;
this->currentDeviceNum = deviceNum;
joystickId = SDL_JoystickGetDeviceInstanceID(deviceNum);
controllerWidget->SetCurrentJoystickID(joystickId);
controllerWidget->SetIsCurrentJoystickGameController(currentController != nullptr);