basic filtering

Author: briaguya-ai

src/controller/physicaldevice/ConnectedPhysicalDeviceManager.cpp

@@ -9,14 +9,37 @@ ConnectedPhysicalDeviceManager::~ConnectedPhysicalDeviceManager() {
 
 std::unordered_map<int32_t, SDL_GameController*>
 ConnectedPhysicalDeviceManager::GetConnectedSDLGamepadsForPort(uint8_t portIndex) {
-    // todo: filter somehow
-    return mConnectedSDLGamepads;
+    std::unordered_map<int32_t, SDL_GameController*> result;
+
+    for (const auto& [instanceId, gamepad] : mConnectedSDLGamepads) {
+        if (!PortIsIgnoringInstanceId(portIndex, instanceId)) {
+            result[instanceId] = gamepad;
+        }
+    }
+
+    return result;
 }
 
-std::vector<std::string> ConnectedPhysicalDeviceManager::GetConnectedSDLGamepadNames() {
+std::unordered_map<int32_t, std::string> ConnectedPhysicalDeviceManager::GetConnectedSDLGamepadNames() {
     return mConnectedSDLGamepadNames;
 }
 
+std::unordered_set<int32_t> ConnectedPhysicalDeviceManager::GetIgnoredInstanceIdsForPort(uint8_t portIndex) {
+    return mIgnoredInstanceIds[portIndex];
+}
+
+bool ConnectedPhysicalDeviceManager::PortIsIgnoringInstanceId(uint8_t portIndex, int32_t instanceId) {
+    return GetIgnoredInstanceIdsForPort(portIndex).contains(instanceId);
+}
+
+void ConnectedPhysicalDeviceManager::IgnoreInstanceIdForPort(uint8_t portIndex, int32_t instanceId) {
+    mIgnoredInstanceIds[portIndex].insert(instanceId);
+}
+
+void ConnectedPhysicalDeviceManager::UnignoreInstanceIdForPort(uint8_t portIndex, int32_t instanceId) {
+    mIgnoredInstanceIds[portIndex].erase(instanceId);
+}
+
 void ConnectedPhysicalDeviceManager::HandlePhysicalDeviceConnect(int32_t sdlDeviceIndex) {
     RefreshConnectedSDLGamepads();
 }
@@ -28,6 +51,7 @@ void ConnectedPhysicalDeviceManager::HandlePhysicalDeviceDisconnect(int32_t sdlJ
 void ConnectedPhysicalDeviceManager::RefreshConnectedSDLGamepads() {
     mConnectedSDLGamepads.clear();
     mConnectedSDLGamepadNames.clear();
+
     for (int32_t i = 0; i < SDL_NumJoysticks(); i++) {
         // skip if this SDL joystick isn't a Gamepad
         if (!SDL_IsGameController(i)) {
@@ -39,7 +63,11 @@ void ConnectedPhysicalDeviceManager::RefreshConnectedSDLGamepads() {
         auto name = SDL_GameControllerName(gamepad);
 
         mConnectedSDLGamepads[instanceId] = gamepad;
-        mConnectedSDLGamepadNames.push_back(name);
+        mConnectedSDLGamepadNames[instanceId] = name;
+
+        for (uint8_t port = 1; port < 4; port++) {
+            mIgnoredInstanceIds[port].insert(instanceId);
+        }
     }
 }
 } // namespace Ship

src/controller/physicaldevice/ConnectedPhysicalDeviceManager.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 #include <string>
 #include <SDL2/SDL.h>
@@ -13,14 +14,19 @@ class ConnectedPhysicalDeviceManager {
     ~ConnectedPhysicalDeviceManager();
 
     std::unordered_map<int32_t, SDL_GameController*> GetConnectedSDLGamepadsForPort(uint8_t portIndex);
-    std::vector<std::string> GetConnectedSDLGamepadNames();
+    std::unordered_map<int32_t, std::string> GetConnectedSDLGamepadNames();
+    std::unordered_set<int32_t> GetIgnoredInstanceIdsForPort(uint8_t portIndex);
+    bool PortIsIgnoringInstanceId(uint8_t portIndex, int32_t instanceId);
+    void IgnoreInstanceIdForPort(uint8_t portIndex, int32_t instanceId);
+    void UnignoreInstanceIdForPort(uint8_t portIndex, int32_t instanceId);
 
     void HandlePhysicalDeviceConnect(int32_t sdlDeviceIndex);
     void HandlePhysicalDeviceDisconnect(int32_t sdlJoystickInstanceId);
     void RefreshConnectedSDLGamepads();
 
   private:
     std::unordered_map<int32_t, SDL_GameController*> mConnectedSDLGamepads;
-    std::vector<std::string> mConnectedSDLGamepadNames;
+    std::unordered_map<int32_t, std::string> mConnectedSDLGamepadNames;
+    std::unordered_map<uint8_t, std::unordered_set<int32_t>> mIgnoredInstanceIds;
 };
 } // namespace Ship

src/window/gui/InputEditorWindow.cpp

@@ -1186,7 +1186,7 @@ void InputEditorWindow::DrawDeviceNameButtons() {
     ImGui::PopStyleColor();
     ImGui::PopStyleColor();
 
-    for (const auto& name :
+    for (const auto& [instanceId, name] :
          Context::GetInstance()->GetControlDeck()->GetConnectedPhysicalDeviceManager()->GetConnectedSDLGamepadNames()) {
         auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button);
         auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered);