Refactor DisplayManager to use generic event system while maintaining backward compatibility #14

* Initial plan

* Refactor DisplayManager to use generic event system - core implementation

Co-authored-by: lijy91 <[email protected]>

* Complete DisplayManager event system refactoring with documentation and validation

Co-authored-by: lijy91 <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: lijy91 <[email protected]>

Author: Copilot

src/display_manager.cpp

@@ -19,6 +19,26 @@ void DisplayManager::NotifyListeners(
   }
 }
 
+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)

src/display_manager.h

@@ -6,10 +6,33 @@
 #include <vector>
 
 #include "display.h"
+#include "event.h"
+#include "event_dispatcher.h"
 #include "geometry.h"
 
 namespace nativeapi {
 
+// Event classes for display changes
+class DisplayAddedEvent : public TypedEvent<DisplayAddedEvent> {
+ public:
+  explicit DisplayAddedEvent(const Display& display) : display_(display) {}
+
+  const Display& GetDisplay() const { return display_; }
+
+ private:
+  Display display_;
+};
+
+class DisplayRemovedEvent : public TypedEvent<DisplayRemovedEvent> {
+ public:
+  explicit DisplayRemovedEvent(const Display& display) : display_(display) {}
+
+  const Display& GetDisplay() const { return display_; }
+
+ private:
+  Display display_;
+};
+
 // DisplayListener is an interface that can be implemented by classes that want
 // to listen for display events.
 class DisplayListener {
@@ -39,10 +62,34 @@ class DisplayManager {
   // 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) {
+    return event_dispatcher_.AddListener<EventType>(listener);
+  }
+
+  template <typename EventType>
+  size_t AddEventListener(std::function<void(const EventType&)> callback) {
+    return event_dispatcher_.AddListener<EventType>(std::move(callback));
+  }
+
+  bool RemoveEventListener(size_t listener_id) {
+    return event_dispatcher_.RemoveListener(listener_id);
+  }
+
+  // Get the event dispatcher (for advanced usage)
+  EventDispatcher& GetEventDispatcher() { return event_dispatcher_; }
+
  private:
   std::vector<Display> displays_;
-  std::vector<DisplayListener*> listeners_;
+  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

src/platform/macos/display_manager_macos.mm

@@ -40,8 +40,8 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
   // Set position and size using geometry types
   display.position = {frame.origin.x, frame.origin.y};
   display.size = {frame.size.width, frame.size.height};
-  display.workArea = {visibleFrame.origin.x, visibleFrame.origin.y,
-                     visibleFrame.size.height, visibleFrame.size.width};
+  display.workArea = {visibleFrame.origin.x, visibleFrame.origin.y, visibleFrame.size.height,
+                      visibleFrame.size.width};
   display.scaleFactor = scaleFactor;
   display.isPrimary = isPrimary;
 
@@ -56,7 +56,7 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
   CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode(displayID);
   if (displayMode) {
     double refreshRate = CGDisplayModeGetRefreshRate(displayMode);
-    display.refreshRate = refreshRate > 0 ? (int)refreshRate : 60; // Default to 60Hz if unknown
+    display.refreshRate = refreshRate > 0 ? (int)refreshRate : 60;  // Default to 60Hz if unknown
     CGDisplayModeRelease(displayMode);
   }
 
@@ -81,11 +81,13 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
 
   // Use display name as model for now
   display.model = display.name;
-  display.serialNumber = ""; // Not easily available without deprecated APIs
+  display.serialNumber = "";  // Not easily available without deprecated APIs
 
   // Set default values if hardware info couldn't be retrieved
-  if (display.manufacturer.empty()) display.manufacturer = "Unknown";
-  if (display.model.empty()) display.model = "Unknown";
+  if (display.manufacturer.empty())
+    display.manufacturer = "Unknown";
+  if (display.model.empty())
+    display.model = "Unknown";
 
   return display;
 }
@@ -109,8 +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()) {
-                    NotifyListeners(
-                        [d](DisplayListener* listener) { listener->OnDisplayAdded(d); });
+                    DispatchDisplayAddedEvent(d);
                   }
                 }
 
@@ -120,8 +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()) {
-                    NotifyListeners(
-                        [d](DisplayListener* listener) { listener->OnDisplayRemoved(d); });
+                    DispatchDisplayRemovedEvent(d);
                   }
                 }