Workaround false positive gamepad detection

mechakotik · Oct 7, 2024 · 2a74771 · 2a74771
1 parent 9a29c83
commit 2a74771
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/include/gamepad.h b/include/gamepad.h
@@ -10,6 +10,7 @@ namespace TA { namespace gamepad {
     void init(int index = 0);
     void update();
     bool connected();
+    bool oncePressed();
     void quit();
 
     TA_Point getDirectionVector();

diff --git a/src/controller.cpp b/src/controller.cpp
@@ -77,7 +77,7 @@ bool TA_Controller::isJustPressed(TA_FunctionButton button)
 bool TA_Controller::isTouchscreen()
 {
     #ifdef __ANDROID__
-        return !TA::gamepad::connected();
+        return !(TA::gamepad::connected() && TA::gamepad::oncePressed());
     #else
         return false;
     #endif

diff --git a/src/gamepad.cpp b/src/gamepad.cpp
@@ -15,13 +15,19 @@ namespace TA { namespace gamepad {
     SDL_Gamepad *controller = nullptr;
     std::array<bool, SDL_GAMEPAD_BUTTON_COUNT> pressed, justPressed;
     bool isConnected = false;
+    bool isOncePressed = false;
 }}
 
 bool TA::gamepad::connected()
 {
     return isConnected;
 }
 
+bool TA::gamepad::oncePressed()
+{
+    return isOncePressed;
+}
+
 void TA::gamepad::handleEvent(SDL_GamepadDeviceEvent event)
 {
     if(event.type == SDL_EVENT_GAMEPAD_ADDED && !isConnected) {
@@ -79,6 +85,7 @@ void TA::gamepad::update()
         if(SDL_GetGamepadButton(controller, (SDL_GamepadButton)button)) {
             if(!pressed[(int)button]) {
                 pressed[(int)button] = justPressed[(int)button] = true;
+                isOncePressed = true;
             }
             else {
                 justPressed[(int)button] = false;