moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add controller support for pause menu and update ImGuiLayer functionality

Browse Source
This commit is contained in:
moonpower
2026-02-02 03:08:01 +03:00
parent cb9d09aca0
commit 8299059dd4
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/panda_sdl/frontend_sdl.hpp
View File

@@ -64,6 +64,11 @@ class FrontendSDL {
bool keyboardAnalogY = false; bool keyboardAnalogY = false;
bool emuPaused = false; bool emuPaused = false;
bool returnToSelector = false; bool returnToSelector = false;
#ifdef IMGUI_FRONTEND
bool controllerStartHeld = false;
bool controllerSelectHeld = false;
bool controllerPauseComboArmed = true;
#endif
private: private:
void setupControllerSensors(SDL_GameController* controller); void setupControllerSensors(SDL_GameController* controller);

1
include/panda_sdl/imgui_layer.hpp
View File

@@ -27,6 +27,7 @@ class ImGuiLayer {
void setPauseCallback(std::function<void(bool)> callback) { onPauseChange = std::move(callback); } void setPauseCallback(std::function<void(bool)> callback) { onPauseChange = std::move(callback); }
void setVsyncCallback(std::function<void(bool)> callback) { onVsyncChange = std::move(callback); } void setVsyncCallback(std::function<void(bool)> callback) { onVsyncChange = std::move(callback); }
void setExitToSelectorCallback(std::function<void()> callback) { onExitToSelector = std::move(callback); } void setExitToSelectorCallback(std::function<void()> callback) { onExitToSelector = std::move(callback); }
void showPauseMenuFromController();
private: private:
void drawDebugPanel(); void drawDebugPanel();

21
src/panda_sdl/frontend_sdl.cpp
View File

@@ -317,6 +317,9 @@ void FrontendSDL::run() {
#ifdef IMGUI_FRONTEND #ifdef IMGUI_FRONTEND
int lastDrawableW = -1; int lastDrawableW = -1;
int lastDrawableH = -1; int lastDrawableH = -1;
controllerStartHeld = false;
controllerSelectHeld = false;
controllerPauseComboArmed = true;
#endif #endif
while (programRunning) { while (programRunning) {
@@ -523,6 +526,24 @@ void FrontendSDL::run() {
case SDL_CONTROLLER_BUTTON_START: key = Keys::Start; break; case SDL_CONTROLLER_BUTTON_START: key = Keys::Start; break;
} }
#ifdef IMGUI_FRONTEND
if (event.cbutton.button == SDL_CONTROLLER_BUTTON_START) {
controllerStartHeld = event.cbutton.state == SDL_PRESSED;
}
if (event.cbutton.button == SDL_CONTROLLER_BUTTON_BACK) {
controllerSelectHeld = event.cbutton.state == SDL_PRESSED;
}
if (event.cbutton.state == SDL_PRESSED && controllerStartHeld && controllerSelectHeld && controllerPauseComboArmed) {
controllerPauseComboArmed = false;
if (imgui) {
imgui->showPauseMenuFromController();
}
}
if (event.cbutton.state == SDL_RELEASED && (!controllerStartHeld && !controllerSelectHeld)) {
controllerPauseComboArmed = true;
}
#endif
if (key != 0) { if (key != 0) {
if (event.cbutton.state == SDL_PRESSED) { if (event.cbutton.state == SDL_PRESSED) {
hid.pressKey(key); hid.pressKey(key);

10
src/panda_sdl/imgui_layer.cpp
View File

@@ -236,6 +236,16 @@ void ImGuiLayer::handleHotkey(const SDL_Event& event) {
} }
} }
void ImGuiLayer::showPauseMenuFromController() {
if (!showPauseMenu) {
showPauseMenu = true;
if (onPauseChange) {
isPaused = true;
onPauseChange(true);
}
}
}
std::optional<std::filesystem::path> ImGuiLayer::runGameSelector() { std::optional<std::filesystem::path> ImGuiLayer::runGameSelector() {
std::vector<InstalledGame> games = scanAllGames(); std::vector<InstalledGame> games = scanAllGames();
bool showNoRom = games.empty(); bool showNoRom = games.empty();