ConnectedPhysicalDeviceManager

Author: briaguya-ai

src/controller/controldeck/ControlDeck.cpp

@@ -12,6 +12,7 @@ namespace Ship {
 
 ControlDeck::ControlDeck(std::vector<CONTROLLERBUTTONS_T> additionalBitmasks) : mSinglePlayerMappingMode(false) {
     mDeviceIndexMappingManager = std::make_shared<ShipDeviceIndexMappingManager>();
+    mConnectedPhysicalDeviceManager = std::make_shared<ConnectedPhysicalDeviceManager>();
 }
 
 ControlDeck::~ControlDeck() {
@@ -109,6 +110,10 @@ std::shared_ptr<ShipDeviceIndexMappingManager> ControlDeck::GetDeviceIndexMappin
     return mDeviceIndexMappingManager;
 }
 
+std::shared_ptr<ConnectedPhysicalDeviceManager> ControlDeck::GetConnectedPhysicalDeviceManager() {
+    return mConnectedPhysicalDeviceManager;
+}
+
 void ControlDeck::SetSinglePlayerMappingMode(bool singlePlayer) {
     mSinglePlayerMappingMode = singlePlayer;
 }

src/controller/controldeck/ControlDeck.h

@@ -5,6 +5,7 @@
 #include <config/Config.h>
 #include "controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h"
 #include "controller/deviceindex/ShipDeviceIndexMappingManager.h"
+#include "controller/physicaldevice/ConnectedPhysicalDeviceManager.h"
 
 namespace Ship {
 
@@ -28,6 +29,7 @@ class ControlDeck {
     bool ProcessMouseButtonEvent(bool isPressed, MouseBtn button);
 
     std::shared_ptr<ShipDeviceIndexMappingManager> GetDeviceIndexMappingManager();
+    std::shared_ptr<ConnectedPhysicalDeviceManager> GetConnectedPhysicalDeviceManager();
 
   protected:
     bool AllGameInputBlocked();
@@ -38,6 +40,7 @@ class ControlDeck {
     bool mSinglePlayerMappingMode;
     std::unordered_map<int32_t, bool> mGameInputBlockers;
     std::shared_ptr<ShipDeviceIndexMappingManager> mDeviceIndexMappingManager;
+    std::shared_ptr<ConnectedPhysicalDeviceManager> mConnectedPhysicalDeviceManager;
 };
 } // namespace Ship
 

src/controller/physicaldevice/ConnectedPhysicalDeviceManager.cpp

@@ -7,8 +7,31 @@ ConnectedPhysicalDeviceManager::ConnectedPhysicalDeviceManager() {
 ConnectedPhysicalDeviceManager::~ConnectedPhysicalDeviceManager() {
 }
 
-std::vector<SDL_GameController*> ConnectedPhysicalDeviceManager::GetConnectedSDLGamepadsForPort(uint8_t portIndex) {
+std::unordered_map<int32_t, SDL_GameController*> ConnectedPhysicalDeviceManager::GetConnectedSDLGamepadsForPort(uint8_t portIndex) {
     // todo: filter somehow
     return mConnectedSDLGamepads;
 }
+
+void ConnectedPhysicalDeviceManager::HandlePhysicalDeviceConnect(int32_t sdlDeviceIndex) {
+    RefreshConnectedSDLGamepads();
+}
+
+void ConnectedPhysicalDeviceManager::HandlePhysicalDeviceDisconnect(int32_t sdlJoystickInstanceId) {
+    RefreshConnectedSDLGamepads();
+}
+
+void ConnectedPhysicalDeviceManager::RefreshConnectedSDLGamepads() {
+    mConnectedSDLGamepads.clear();
+    for (int32_t i = 0; i < SDL_NumJoysticks(); i++) {
+        // skip if this SDL joystick isn't a Gamepad
+        if (!SDL_IsGameController(i)) {
+            continue;
+        }
+
+        auto gamepad = SDL_GameControllerOpen(i);
+        auto instanceId = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(gamepad));
+        
+        mConnectedSDLGamepads[instanceId] = gamepad;
+    }
+}
 } // namespace Ship

src/controller/physicaldevice/ConnectedPhysicalDeviceManager.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vector>
+#include <unordered_map>
 #include <SDL2/SDL.h>
 
 namespace Ship {
@@ -10,9 +10,13 @@ class ConnectedPhysicalDeviceManager {
     ConnectedPhysicalDeviceManager();
     ~ConnectedPhysicalDeviceManager();
 
-    std::vector<SDL_GameController*> GetConnectedSDLGamepadsForPort(uint8_t portIndex);
+    std::unordered_map<int32_t, SDL_GameController*> GetConnectedSDLGamepadsForPort(uint8_t portIndex);
+
+    void HandlePhysicalDeviceConnect(int32_t sdlDeviceIndex);
+    void HandlePhysicalDeviceDisconnect(int32_t sdlJoystickInstanceId);
+    void RefreshConnectedSDLGamepads();
 
   private:
-    std::vector<SDL_GameController*> mConnectedSDLGamepads;
+    std::unordered_map<int32_t, SDL_GameController*> mConnectedSDLGamepads;
 };
 } // namespace Ship

src/controller/physicaldevice/SDLAddRemoveDeviceEventHandler.cpp

@@ -0,0 +1,33 @@
+#include "SDLAddRemoveDeviceEventHandler.h"
+#include <SDL2/SDL.h>
+#include "Context.h"
+
+namespace Ship {
+
+SDLAddRemoveDeviceEventHandler::~SDLAddRemoveDeviceEventHandler() {
+}
+
+void SDLAddRemoveDeviceEventHandler::InitElement() {
+}
+
+void SDLAddRemoveDeviceEventHandler::DrawElement() {
+}
+
+void SDLAddRemoveDeviceEventHandler::UpdateElement() {
+    SDL_PumpEvents();
+    SDL_Event event;
+    while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_CONTROLLERDEVICEADDED, SDL_CONTROLLERDEVICEADDED) > 0) {
+        // from https://wiki.libsdl.org/SDL2/SDL_ControllerDeviceEvent: which - the joystick device index for
+        // the SDL_CONTROLLERDEVICEADDED event
+        Context::GetInstance()->GetControlDeck()->GetConnectedPhysicalDeviceManager()->HandlePhysicalDeviceConnect(
+            event.cdevice.which);
+    }
+
+    while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_CONTROLLERDEVICEREMOVED, SDL_CONTROLLERDEVICEREMOVED) > 0) {
+        // from https://wiki.libsdl.org/SDL2/SDL_ControllerDeviceEvent: which - the [...] instance id for the
+        // SDL_CONTROLLERDEVICEREMOVED [...] event
+        Context::GetInstance()->GetControlDeck()->GetConnectedPhysicalDeviceManager()->HandlePhysicalDeviceDisconnect(
+            event.cdevice.which);
+    }
+}
+} // namespace Ship

src/controller/physicaldevice/SDLAddRemoveDeviceEventHandler.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "window/gui/GuiWindow.h"
+
+namespace Ship {
+
+class SDLAddRemoveDeviceEventHandler : public GuiWindow {
+  public:
+    using GuiWindow::GuiWindow;
+    ~SDLAddRemoveDeviceEventHandler();
+
+  protected:
+    void InitElement() override;
+    void DrawElement() override;
+    void UpdateElement() override;
+};
+} // namespace Ship

src/window/gui/Gui.cpp

@@ -72,11 +72,17 @@ Gui::Gui(std::vector<std::shared_ptr<GuiWindow>> guiWindows) : mNeedsConsoleVari
         AddGuiWindow(std::make_shared<InputEditorWindow>(CVAR_CONTROLLER_CONFIGURATION_WINDOW_OPEN, "Input Editor"));
     }
 
-    if (GetGuiWindow("Controller Disconnected") == nullptr) {
-        AddGuiWindow(std::make_shared<ControllerDisconnectedWindow>(CVAR_CONTROLLER_DISCONNECTED_WINDOW_OPEN,
-                                                                    "Controller Disconnected"));
+    // if (GetGuiWindow("Controller Disconnected") == nullptr) {
+    //     AddGuiWindow(std::make_shared<ControllerDisconnectedWindow>(CVAR_CONTROLLER_DISCONNECTED_WINDOW_OPEN,
+    //                                                                 "Controller Disconnected"));
+    // }
+
+    if (GetGuiWindow("SDLAddRemoveDeviceEventHandler") == nullptr) {
+        AddGuiWindow(std::make_shared<SDLAddRemoveDeviceEventHandler>("gOpenWindows.SDLAddRemoveDeviceEventHandler",
+                                                                    "SDLAddRemoveDeviceEventHandler"));
     }
 
+
     if (GetGuiWindow("Controller Reordering") == nullptr) {
         AddGuiWindow(std::make_shared<ControllerReorderingWindow>(CVAR_CONTROLLER_REORDERING_WINDOW_OPEN,
                                                                   "Controller Reordering"));

src/window/gui/Gui.h

@@ -14,6 +14,7 @@
 #include "window/gui/InputEditorWindow.h"
 #include "controller/deviceindex/ControllerDisconnectedWindow.h"
 #include "controller/deviceindex/ControllerReorderingWindow.h"
+#include "controller/physicaldevice/SDLAddRemoveDeviceEventHandler.h"
 #include "window/gui/IconsFontAwesome4.h"
 #include "window/gui/GameOverlay.h"
 #include "window/gui/StatsWindow.h"