Remove legacy display listener system and related code

Author: lijy91

examples/window_example/main.cpp

@@ -19,7 +19,6 @@ int main() {
   options.size.height = 600;
   std::shared_ptr<Window> window_ptr = window_manager.Create(options);
 
-
   std::shared_ptr<Tray> tray_ptr = tray_manager.Create();
   if (tray_ptr != nullptr) {
     Tray& tray = *tray_ptr;

src/display_manager.cpp

@@ -1,60 +1,3 @@
 #include "display_manager.h"
-#include <algorithm>
 
-namespace nativeapi {
-
-void DisplayManager::AddListener(DisplayListener* listener) {
-  listeners_.push_back(listener);
-}
-
-void DisplayManager::RemoveListener(DisplayListener* listener) {
-  listeners_.erase(std::remove(listeners_.begin(), listeners_.end(), listener),
-                   listeners_.end());
-}
-
-void DisplayManager::NotifyListeners(
-    std::function<void(DisplayListener*)> callback) {
-  for (const auto& listener : listeners_) {
-    callback(listener);
-  }
-}
-
-void DisplayManager::DispatchDisplayAddedEvent(const Display& display) {
-  // Dispatch through the new event system
-  event_dispatcher_.DispatchSync<DisplayAddedEvent>(display);
-
-  // Also notify old-style listeners for backward compatibility
-  NotifyListeners([&display](DisplayListener* listener) {
-    listener->OnDisplayAdded(display);
-  });
-}
-
-void DisplayManager::DispatchDisplayRemovedEvent(const Display& display) {
-  // Dispatch through the new event system
-  event_dispatcher_.DispatchSync<DisplayRemovedEvent>(display);
-
-  // Also notify old-style listeners for backward compatibility
-  NotifyListeners([&display](DisplayListener* listener) {
-    listener->OnDisplayRemoved(display);
-  });
-}
-
-DisplayEventHandler::DisplayEventHandler(
-    std::function<void(const Display&)> onDisplayAddedCallback,
-    std::function<void(const Display&)> onDisplayRemovedCallback)
-    : onDisplayAddedCallback_(onDisplayAddedCallback),
-      onDisplayRemovedCallback_(onDisplayRemovedCallback) {}
-
-void DisplayEventHandler::OnDisplayAdded(const Display& display) {
-  if (onDisplayAddedCallback_) {
-    onDisplayAddedCallback_(display);
-  }
-}
-
-void DisplayEventHandler::OnDisplayRemoved(const Display& display) {
-  if (onDisplayRemovedCallback_) {
-    onDisplayRemovedCallback_(display);
-  }
-}
-
-}  // namespace nativeapi
+namespace nativeapi {}

src/display_manager.h

@@ -12,7 +12,9 @@
 
 namespace nativeapi {
 
-// Event classes for display changes
+/**
+ * Event class for display addition
+ */
 class DisplayAddedEvent : public TypedEvent<DisplayAddedEvent> {
  public:
   explicit DisplayAddedEvent(const Display& display) : display_(display) {}
@@ -23,6 +25,9 @@ class DisplayAddedEvent : public TypedEvent<DisplayAddedEvent> {
   Display display_;
 };
 
+/**
+ * Event class for display removal
+ */
 class DisplayRemovedEvent : public TypedEvent<DisplayRemovedEvent> {
  public:
   explicit DisplayRemovedEvent(const Display& display) : display_(display) {}
@@ -33,15 +38,9 @@ class DisplayRemovedEvent : public TypedEvent<DisplayRemovedEvent> {
   Display display_;
 };
 
-// DisplayListener is an interface that can be implemented by classes that want
-// to listen for display events.
-class DisplayListener {
- public:
-  virtual void OnDisplayAdded(const Display& display) = 0;
-  virtual void OnDisplayRemoved(const Display& display) = 0;
-};
-
-// DisplayManager is a singleton that manages all displays on the system.
+/**
+ * DisplayManager is a singleton that manages all displays on the system.
+ */
 class DisplayManager {
  public:
   DisplayManager();
@@ -56,60 +55,27 @@ class DisplayManager {
   // Get the current cursor position
   Point GetCursorPosition();
 
-  // Add a listener to the display manager
-  void AddListener(DisplayListener* listener);
-
-  // Remove a listener from the display manager
-  void RemoveListener(DisplayListener* listener);
-
   // Event dispatcher methods for the new system
   template <typename EventType>
-  size_t AddEventListener(TypedEventListener<EventType>* listener) {
+  size_t AddListener(TypedEventListener<EventType>* listener) {
     return event_dispatcher_.AddListener<EventType>(listener);
   }
 
   template <typename EventType>
-  size_t AddEventListener(std::function<void(const EventType&)> callback) {
+  size_t AddListener(std::function<void(const EventType&)> callback) {
     return event_dispatcher_.AddListener<EventType>(std::move(callback));
   }
 
-  bool RemoveEventListener(size_t listener_id) {
+  bool RemoveListener(size_t listener_id) {
     return event_dispatcher_.RemoveListener(listener_id);
   }
 
   // Get the event dispatcher (for advanced usage)
   EventDispatcher& GetEventDispatcher() { return event_dispatcher_; }
 
  private:
+  EventDispatcher event_dispatcher_;
   std::vector<Display> displays_;
-  std::vector<DisplayListener*> listeners_;  // For backward compatibility
-  EventDispatcher event_dispatcher_;         // New event system
-
-  void NotifyListeners(std::function<void(DisplayListener*)> callback);
-
-  // New event dispatch methods
-  void DispatchDisplayAddedEvent(const Display& display);
-  void DispatchDisplayRemovedEvent(const Display& display);
-};
-
-// DisplayEventHandler is an implementation of DisplayListener that uses
-// callbacks to handle display events.
-class DisplayEventHandler : public DisplayListener {
- public:
-  // Constructor that takes callbacks for display events
-  DisplayEventHandler(
-      std::function<void(const Display&)> onDisplayAddedCallback,
-      std::function<void(const Display&)> onDisplayRemovedCallback);
-
-  // Implementation of OnDisplayAdded from DisplayListener interface
-  void OnDisplayAdded(const Display& display) override;
-
-  // Implementation of OnDisplayRemoved from DisplayListener interface
-  void OnDisplayRemoved(const Display& display) override;
-
- private:
-  std::function<void(const Display&)> onDisplayAddedCallback_;
-  std::function<void(const Display&)> onDisplayRemovedCallback_;
 };
 
 }  // namespace nativeapi

src/event_dispatcher.cpp

@@ -180,9 +180,4 @@ void EventDispatcher::ProcessAsyncEvents() {
   }
 }
 
-EventDispatcher& GetGlobalEventDispatcher() {
-  static EventDispatcher global_dispatcher;
-  return global_dispatcher;
-}
-
 }  // namespace nativeapi

src/event_dispatcher.h

@@ -179,9 +179,4 @@ class EventDispatcher {
   std::atomic<size_t> next_listener_id_;
 };
 
-/**
- * Convenience function to create a global event dispatcher instance.
- * This is useful for applications that need a single, shared event system.
- */
-EventDispatcher& GetGlobalEventDispatcher();
 }  // namespace nativeapi

src/platform/macos/display_manager_macos.mm

@@ -111,7 +111,7 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
                   old_ids.insert(d.id);
                 for (const auto& d : new_displays) {
                   if (old_ids.find(d.id) == old_ids.end()) {
-                    DispatchDisplayAddedEvent(d);
+                    GetEventDispatcher().DispatchSync<DisplayAddedEvent>(d);
                   }
                 }
 
@@ -121,7 +121,7 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
                   new_ids.insert(d.id);
                 for (const auto& d : old_displays) {
                   if (new_ids.find(d.id) == new_ids.end()) {
-                    DispatchDisplayRemovedEvent(d);
+                    GetEventDispatcher().DispatchSync<DisplayRemovedEvent>(d);
                   }
                 }