fix: 🐛 Fix broken impl of Button::removeListener

LemLib · Feb 2, 2025 · 0ac0ebd · 0ac0ebd
1 parent 08e6723
commit 0ac0ebd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 15 deletions.
diff --git a/include/gamepad/button.hpp b/include/gamepad/button.hpp
@@ -212,6 +212,7 @@ class Button {
          * @brief Removes a listener from the button
          * @warning Usage of this function is discouraged.
          *
+         * @param event the event type of the listener
          * @param listenerName The name of the listener to remove
          * @return true The specified listener was successfully removed
          * @return false The specified listener could not be removed
@@ -221,10 +222,10 @@ class Button {
          *   // Add an event listener...
          *   gamepad::master.L1.addListener(gamepad::ON_PRESS, "do_something", doSomething);
          *   // ...and now get rid of it
-         *   gamepad::master.L1.removeListener("do_something");
+         *   gamepad::master.L1.removeListener(gamepad::ON_PRESS, "do_something");
          * @endcode
          */
-        int32_t removeListener(std::string listenerName) const;
+        int32_t removeListener(EventType event, std::string listenerName) const;
 
         /**
          * @brief Returns a value indicating whether the button is currently being held.
@@ -240,6 +241,14 @@ class Button {
          * @param is_held Whether or not the button is currently held down
          */
         void update(bool is_held);
+        /**
+         * @brief Get the handler object for the given event type
+         * 
+         * @param event The desired event type
+         * @return nullptr The event value is invalid
+         * @return _impl::EventHandler<std::string>* A pointer to the given event's handler
+         */
+        _impl::EventHandler<std::string>* get_handler(EventType event) const;
         /// How long the threshold should be for the longPress and shortRelease events
         mutable uint32_t m_long_press_threshold = 500;
         /// How often repeatPress is called

diff --git a/src/gamepad/button.cpp b/src/gamepad/button.cpp
@@ -2,8 +2,21 @@
 #include "gamepad/todo.hpp"
 #include "pros/rtos.hpp"
 #include <cstdint>
+#include <stdexcept>
 
 namespace gamepad {
+_impl::EventHandler<std::string>* Button::get_handler(EventType event) const {
+    switch (event) {
+        case gamepad::EventType::ON_PRESS: return &m_on_press_event;
+        case gamepad::EventType::ON_LONG_PRESS: return &m_on_long_press_event;
+        case gamepad::EventType::ON_RELEASE: return &m_on_release_event;
+        case gamepad::EventType::ON_SHORT_RELEASE: return &m_on_short_release_event;
+        case gamepad::EventType::ON_LONG_RELEASE: return &m_on_long_release_event;
+        case gamepad::EventType::ON_REPEAT_PRESS: return &m_on_repeat_press_event;
+        default: return nullptr;
+    }
+}
+
 void Button::setLongPressThreshold(uint32_t threshold) const { m_long_press_threshold = threshold; }
 
 void Button::setRepeatCooldown(uint32_t cooldown) const { m_repeat_cooldown = cooldown; }
@@ -33,28 +46,31 @@ int32_t Button::onRepeatPress(std::string listenerName, std::function<void(void)
 }
 
 int32_t Button::addListener(EventType event, std::string listenerName, std::function<void(void)> func) const {
-    switch (event) {
-        case gamepad::EventType::ON_PRESS: return this->onPress(std::move(listenerName), std::move(func));
-        case gamepad::EventType::ON_LONG_PRESS: return this->onLongPress(std::move(listenerName), std::move(func));
-        case gamepad::EventType::ON_RELEASE: return this->onRelease(std::move(listenerName), std::move(func));
-        case gamepad::EventType::ON_SHORT_RELEASE:
-            return this->onShortRelease(std::move(listenerName), std::move(func));
-        case gamepad::EventType::ON_LONG_RELEASE: return this->onLongRelease(std::move(listenerName), std::move(func));
-        case gamepad::EventType::ON_REPEAT_PRESS: return this->onRepeatPress(std::move(listenerName), std::move(func));
-        default:
-            TODO("add error logging")
-            errno = EINVAL;
-            return UINT32_MAX;
+    auto handler = this->get_handler(event);
+    if (handler != nullptr) {
+        return handler->addListener(listenerName + "_user", func);
+    } else {
+        TODO("add error logging")
+        errno = EINVAL;
+        return INT32_MAX;
     }
 }
 
-int32_t Button::removeListener(std::string listenerName) const {
+int32_t Button::removeListener(EventType event, std::string listenerName) const {
     return m_on_press_event.removeListener(listenerName + "_user") ||
            m_on_long_press_event.removeListener(listenerName + "_user") ||
            m_on_release_event.removeListener(listenerName + "_user") ||
            m_on_short_release_event.removeListener(listenerName + "_user") ||
            m_on_long_release_event.removeListener(listenerName + "_user") ||
            m_on_repeat_press_event.removeListener(listenerName + "_user");
+    auto handler = this->get_handler(event);
+    if (handler != nullptr) {
+        return handler->removeListener(listenerName + "_user");
+    } else {
+        TODO("add error logging")
+        errno = EINVAL;
+        return INT32_MAX;
+    }
 }
 
 void Button::update(const bool is_held) {