refactor: Update Window and WindowManager classes to utilize smart pointers for better memory management and enhance window retrieval methods

Author: lijy91

examples/nswindow_example/main.mm

@@ -27,16 +27,12 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
   [self.window makeMainWindow];
   [NSApp activateIgnoringOtherApps:YES];
 
-  //   dispatch_async(dispatch_get_main_queue(), ^{
-
-  //   });
-
   // 延迟检查主窗口
-    dispatch_async(dispatch_get_main_queue(), ^{
-        NSLog(@"主窗口: %@", NSApp.mainWindow);
-        NSLog(@"关键窗口: %@", NSApp.keyWindow);
-        NSLog(@"所有窗口: %@", NSApp.windows);
-    });
+  dispatch_async(dispatch_get_main_queue(), ^{
+    NSLog(@"主窗口: %@", NSApp.mainWindow);
+    NSLog(@"关键窗口: %@", NSApp.keyWindow);
+    NSLog(@"所有窗口: %@", NSApp.windows);
+  });
 
   [[NSNotificationCenter defaultCenter]
       addObserverForName:NSWindowDidBecomeMainNotification
@@ -50,25 +46,28 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
                 WindowManager windowManager = WindowManager();
 
                 // Get current window information
-                Window currentWindow = windowManager.GetCurrent();
-                std::cout << "Current Window Information:" << std::endl;
-                std::cout << "ID: " << currentWindow.id << std::endl;
+                std::shared_ptr<Window> currentWindowPtr = windowManager.GetCurrent();
+                if (currentWindowPtr != nullptr) {
+                  Window& currentWindow = *currentWindowPtr;
+                  std::cout << "Current Window Information:" << std::endl;
+                  std::cout << "ID: " << currentWindow.id << std::endl;
 
-               // Get window size
-               auto size = currentWindow.GetSize();
-               std::cout << "Window Size: " << size.width << "x" << size.height << std::endl;
+                  // Get window size
+                  auto size = currentWindow.GetSize();
+                  std::cout << "Window Size: " << size.width << "x" << size.height << std::endl;
+                }
 
-               // Get all windows
-               std::vector<Window> windowList = windowManager.GetAll();
-               std::cout << "\nAll Windows Information:" << std::endl;
-               for (size_t i = 0; i < windowList.size(); i++) {
-                 const Window& window = windowList[i];
-                 std::cout << "Window " << (i + 1) << ":" << std::endl;
-                 std::cout << "ID: " << window.id << std::endl;
-                 auto windowSize = window.GetSize();
-                 std::cout << "Size: " << windowSize.width << "x" << windowSize.height
-                           << std::endl;
-               }
+                // Get all windows
+                std::vector<std::shared_ptr<Window>> windowList = (windowManager.GetAll());
+                std::cout << "\nAll Windows Information:" << std::endl;
+                for (size_t i = 0; i < windowList.size(); i++) {
+                  const Window& window = *windowList[i];
+                  std::cout << "Window " << (i + 1) << ":" << std::endl;
+                  std::cout << "ID: " << window.id << std::endl;
+                  auto windowSize = window.GetSize();
+                  std::cout << "Size: " << windowSize.width << "x" << windowSize.height
+                            << std::endl;
+                }
               }];
 }
 

src/window_macos.mm

@@ -14,18 +14,15 @@
   NSWindow* ns_window_;
 };
 
-Window::Window() : pimpl_(nullptr) {
+Window::Window() : pimpl_(new Impl(nil)) {
   id = -1;
-  std::cout << "Window created with null pimpl_" << std::endl;
 }
 
 Window::Window(void* window) : pimpl_(new Impl((__bridge NSWindow*)window)) {
   id = pimpl_->ns_window_ ? [pimpl_->ns_window_ windowNumber] : 0;
-  std::cout << "Window created with NSWindow: " << pimpl_->ns_window_ << std::endl;
 }
 
 Window::~Window() {
-  std::cout << "Window destroyed, pimpl_: " << pimpl_ << std::endl;
   delete pimpl_;
 }
 

src/window_manager.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+#include <unordered_map>
 #include <vector>
 
 #include "window.h"
@@ -11,14 +13,18 @@ class WindowManager {
   WindowManager();
   virtual ~WindowManager();
 
-  // Get a window by its ID.
-  Window Get(WindowID id);
+  // Get a window by its ID. Returns nullptr if window not found.
+  std::shared_ptr<Window> Get(WindowID id);
 
   // Get all windows.
-  std::vector<Window> GetAll();
+  std::vector<std::shared_ptr<Window>> GetAll();
 
-  // Get the current window.
-  Window GetCurrent();
+  // Get the current window. Returns nullptr if no window is active.
+  std::shared_ptr<Window> GetCurrent();
+
+ private:
+  // Store window instances
+  std::unordered_map<WindowID, std::shared_ptr<Window>> windows_;
 };
 
 }  // namespace nativeapi

src/window_manager_macos.mm

@@ -14,37 +14,46 @@
 
 WindowManager::~WindowManager() {}
 
-Window WindowManager::Get(WindowID id) {
+std::shared_ptr<Window> WindowManager::Get(WindowID id) {
+  auto it = windows_.find(id);
+  if (it != windows_.end()) {
+    return it->second;
+  }
   NSArray* ns_windows = [[NSApplication sharedApplication] windows];
   for (NSWindow* ns_window in ns_windows) {
     if ([ns_window windowNumber] == id) {
-      std::cout << "Found window with ID: " << id << std::endl;
-      return Window((__bridge void*)ns_window);
+      auto window = std::make_shared<Window>((__bridge void*)ns_window);
+      windows_[id] = window;
+      return window;
     }
   }
   return nullptr;
 }
 
-std::vector<Window> WindowManager::GetAll() {
-  std::vector<Window> windows;
+std::vector<std::shared_ptr<Window>> WindowManager::GetAll() {
+  std::vector<std::shared_ptr<Window>> windows;
   NSArray* ns_windows = [[NSApplication sharedApplication] windows];
   for (NSWindow* ns_window in ns_windows) {
-    windows.push_back(Window((__bridge void*)ns_window));
+    WindowID window_id = [ns_window windowNumber];
+    auto it = windows_.find(window_id);
+    if (it == windows_.end()) {
+      auto window = std::make_shared<Window>((__bridge void*)ns_window);
+      windows_[window_id] = window;
+    }
+  }
+  for (auto& window : windows_) {
+    windows.push_back(window.second);
   }
   return windows;
 }
 
-Window WindowManager::GetCurrent() {
+std::shared_ptr<Window> WindowManager::GetCurrent() {
   NSApplication* app = [NSApplication sharedApplication];
   NSWindow* ns_window = [app mainWindow];
-  if (ns_window == nil) {
-    std::cerr << "No main window found." << std::endl;
-    return Window();
-  } else {
-    std::cout << "Main window found." << std::endl;
-    std::cout << "Window title: " << [[ns_window title] UTF8String] << std::endl;
+  if (ns_window != nil) {
+    return Get([ns_window windowNumber]);
   }
-  return Window((__bridge void*)ns_window);
+  return nullptr;
 }
 
 }  // namespace nativeapi