feat: Enhance Window class with private implementation and size retrieval methods for macOS

Author: lijy91

CMakeLists.txt

@@ -7,4 +7,5 @@ add_subdirectory(src)
 
 # Add example programs subdirectory
 add_subdirectory(examples/display_example)
+add_subdirectory(examples/nswindow_example)
 add_subdirectory(examples/window_example)

examples/nswindow_example/CMakeLists.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(nswindow_example VERSION 0.0.1 LANGUAGES CXX)
+
+# Set C++ standard
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Enable Objective-C++
+enable_language(OBJCXX)
+
+# Add example program
+add_executable(nswindow_example
+  "main.mm"
+)
+
+# Link main library
+target_link_libraries(nswindow_example PRIVATE libnativeapi)
+
+# Set example program properties
+set_target_properties(nswindow_example PROPERTIES
+  OUTPUT_NAME "nswindow_example"
+)
+
+# Set example program compile options (macOS only)
+if(APPLE)
+  set_source_files_properties("main.mm"
+    PROPERTIES
+    COMPILE_FLAGS "-x objective-c++"
+  )
+endif()

examples/nswindow_example/main.mm

@@ -0,0 +1,89 @@
+#include <AppKit/AppKit.h>
+#import <Cocoa/Cocoa.h>
+#include <iostream>
+#include "nativeapi.h"
+
+using nativeapi::Window;
+using nativeapi::WindowManager;
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+@property(strong) NSWindow* window;
+@end
+
+@implementation AppDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification*)notification {
+  // Create a window
+  NSRect frame = NSMakeRect(0, 0, 400, 300);
+  self.window = [[NSWindow alloc]
+      initWithContentRect:frame
+                styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
+                          NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable
+                  backing:NSBackingStoreBuffered
+                    defer:NO];
+  [self.window setTitle:@"Native API Example"];
+  [self.window center];
+  [self.window makeKeyAndOrderFront:nil];
+  [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);
+    });
+
+  [[NSNotificationCenter defaultCenter]
+      addObserverForName:NSWindowDidBecomeMainNotification
+                  object:nil
+                   queue:nil
+              usingBlock:^(NSNotification* note) {
+                NSWindow* mainWindow = [[NSApplication sharedApplication] mainWindow];
+                NSLog(@"主窗口: %@", mainWindow);
+
+                // Initialize WindowManager
+                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;
+
+               // 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;
+               }
+              }];
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)sender {
+  return YES;
+}
+
+@end
+
+int main(int argc, const char* argv[]) {
+  @autoreleasepool {
+    NSApplication* app = [NSApplication sharedApplication];
+    AppDelegate* delegate = [[AppDelegate alloc] init];
+    [app setDelegate:delegate];
+    [app run];
+  }
+  return 0;
+}

src/window.h

@@ -1,15 +1,24 @@
 #pragma once
 #include <string>
+#include "geometry.h"
 
 namespace nativeapi {
 
 class Window {
  public:
   Window();
+  Window(void* window);  // Constructor that takes NSWindow*
   virtual ~Window();
 
   std::string id;
   std::string name;
+
+  void* GetNSWindow() const;  // Returns NSWindow* on macOS
+  Size GetSize() const;  // Get window size
+
+ private:
+  class Impl;
+  Impl* pimpl_;  // Pointer to implementation
 };
 
 }  // namespace nativeapi

src/window_macos.mm

@@ -1,16 +1,62 @@
 #include "window.h"
 #include "window_manager.h"
+#include <iostream>
 
 // Import Cocoa headers
 #import <Cocoa/Cocoa.h>
 
 namespace nativeapi {
 
-Window::Window() {
+// Private implementation class
+class Window::Impl {
+ public:
+  Impl(NSWindow* window) : ns_window_(window) {}
+  NSWindow* ns_window_;
+};
+
+Window::Window() : pimpl_(nullptr) {
   id = "window1";
-  name = "Window 1";
+  std::cout << "Window created with null pimpl_" << std::endl;
 }
 
-Window::~Window() {}
+Window::Window(void* window) : pimpl_(new Impl((NSWindow*)window)) {
+  id = "window1";
+  std::cout << "Window created with NSWindow: " << pimpl_->ns_window_ << std::endl;
+}
+
+Window::~Window() {
+  std::cout << "Window destroyed, pimpl_: " << pimpl_ << std::endl;
+  delete pimpl_;
+}
+
+void* Window::GetNSWindow() const {
+  if (!pimpl_) {
+    std::cout << "GetNSWindow: pimpl_ is null" << std::endl;
+    return nullptr;
+  }
+  if (!pimpl_->ns_window_) {
+    std::cout << "GetNSWindow: ns_window_ is null" << std::endl;
+    return nullptr;
+  }
+  std::cout << "GetNSWindow: returning valid NSWindow pointer" << std::endl;
+  return pimpl_->ns_window_;
+}
+
+Size Window::GetSize() const {
+  Size size = {0, 0};
+  if (!pimpl_) {
+    std::cout << "GetSize: pimpl_ is null" << std::endl;
+    return size;
+  }
+  if (!pimpl_->ns_window_) {
+    std::cout << "GetSize: ns_window_ is null" << std::endl;
+    return size;
+  }
+  NSRect frame = [pimpl_->ns_window_ frame];
+  size.width = static_cast<int>(frame.size.width);
+  size.height = static_cast<int>(frame.size.height);
+  std::cout << "GetSize: window size is " << size.width << "x" << size.height << std::endl;
+  return size;
+}
 
 }  // namespace nativeapi

src/window_manager_macos.mm

@@ -20,23 +20,31 @@
 
 Window WindowManager::GetCurrent() {
   NSApplication* app = [NSApplication sharedApplication];
-  NSWindow* window = [app mainWindow];
-  if (window == nil) {
+  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: " << [[window title] UTF8String] << std::endl;
+    std::cout << "Window title: " << [[ns_window title] UTF8String] << std::endl;
   }
-  return *new Window();
+  return *new Window(ns_window);
 }
 
 std::vector<Window> WindowManager::GetAll() {
-  std::vector<Window> displayList;
-
-  displayList.push_back(GetCurrent());
-
-  return displayList;
+  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;
 }
 
 }  // namespace nativeapi