feat: Update Window and WindowManager classes to support window ID retrieval and management on macOS

Author: lijy91

src/window.h

@@ -4,21 +4,22 @@
 
 namespace nativeapi {
 
+typedef int32_t WindowID;
+
 class Window {
  public:
   Window();
-  Window(void* window);  // Constructor that takes NSWindow*
+  Window(void* window);
   virtual ~Window();
 
-  std::string id;
-  std::string name;
+  WindowID id;
 
-  void* GetNSWindow() const;  // Returns NSWindow* on macOS
-  Size GetSize() const;  // Get window size
+  void* GetNSWindow() const;
+  Size GetSize() const;
 
  private:
   class Impl;
-  Impl* pimpl_;  // Pointer to implementation
+  Impl* pimpl_;
 };
 
 }  // namespace nativeapi

src/window_macos.mm

@@ -1,6 +1,6 @@
+#include <iostream>
 #include "window.h"
 #include "window_manager.h"
-#include <iostream>
 
 // Import Cocoa headers
 #import <Cocoa/Cocoa.h>
@@ -15,12 +15,12 @@
 };
 
 Window::Window() : pimpl_(nullptr) {
-  id = "window1";
+  id = -1;
   std::cout << "Window created with null pimpl_" << std::endl;
 }
 
-Window::Window(void* window) : pimpl_(new Impl((NSWindow*)window)) {
-  id = "window1";
+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;
 }
 
@@ -39,7 +39,7 @@
     return nullptr;
   }
   std::cout << "GetNSWindow: returning valid NSWindow pointer" << std::endl;
-  return pimpl_->ns_window_;
+  return (__bridge void*)pimpl_->ns_window_;
 }
 
 Size Window::GetSize() const {

src/window_manager.h

@@ -11,13 +11,14 @@ class WindowManager {
   WindowManager();
   virtual ~WindowManager();
 
-  Window Create();
-
-  // Get the current window.
-  Window GetCurrent();
+  // Get a window by its ID.
+  Window Get(WindowID id);
 
   // Get all windows.
   std::vector<Window> GetAll();
+
+  // Get the current window.
+  Window GetCurrent();
 };
 
 }  // namespace nativeapi

src/window_manager_macos.mm

@@ -14,8 +14,24 @@
 
 WindowManager::~WindowManager() {}
 
-Window WindowManager::Create() {
-  return *new Window();
+Window WindowManager::Get(WindowID id) {
+  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);
+    }
+  }
+  return nullptr;
+}
+
+std::vector<Window> WindowManager::GetAll() {
+  std::vector<Window> windows;
+  NSArray* ns_windows = [[NSApplication sharedApplication] windows];
+  for (NSWindow* ns_window in ns_windows) {
+    windows.push_back(Window((__bridge void*)ns_window));
+  }
+  return windows;
 }
 
 Window WindowManager::GetCurrent() {
@@ -28,23 +44,7 @@
     std::cout << "Main window found." << std::endl;
     std::cout << "Window title: " << [[ns_window title] UTF8String] << std::endl;
   }
-  return *new Window(ns_window);
-}
-
-std::vector<Window> WindowManager::GetAll() {
-  std::vector<Window> windowList;
-  NSApplication* app = [NSApplication sharedApplication];
-  NSArray* windows = [app windows];
-  for (NSWindow* ns_window in windows) {
-    if ([ns_window isVisible]) {
-      NSRect frame = [ns_window frame];
-        std::cout << "Window title: " << [[ns_window title] UTF8String] << std::endl;
-        std::cout << "Window size: " << frame.size.width << "x" << frame.size.height
-                    << std::endl;
-      windowList.push_back(*new Window(ns_window));
-    }
-  }
-  return windowList;
+  return Window((__bridge void*)ns_window);
 }
 
 }  // namespace nativeapi