Remove nswindow_example and add AppRunner for app lifecycle

Author: lijy91

CMakeLists.txt

@@ -7,5 +7,4 @@ 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

@@ -1,31 +1,45 @@
 #include <iostream>
 #include "nativeapi.h"
 
+using nativeapi::AppRunner;
+using nativeapi::Tray;
+using nativeapi::TrayManager;
 using nativeapi::Window;
 using nativeapi::WindowManager;
+using nativeapi::WindowOptions;
 
 int main() {
-  WindowManager windowManager = WindowManager();
+  WindowManager window_manager = WindowManager();
 
-  // Get primary display information
-  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;
+  // Create a new window with options
+  WindowOptions options;
+  options.title = "My Window";
+  options.size.width = 800;
+  options.size.height = 600;
+  std::shared_ptr<Window> window_ptr = window_manager.Create(options);
+  if (window_ptr != nullptr) {
+    Window& window = *window_ptr;
+    std::cout << "New Window Information:" << std::endl;
+    std::cout << "ID: " << window.id << std::endl;
     std::cout << std::endl;
+    window.Show();
+    window.Focus();
   }
 
-  // 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;
+  TrayManager trayManager = TrayManager();
+
+  std::shared_ptr<Tray> newTrayPtr = trayManager.Create();
+  if (newTrayPtr != nullptr) {
+    Tray& newTray = *newTrayPtr;
+    newTray.SetTitle("Hello, World!");
+    std::cout << "Tray ID: " << newTray.id << std::endl;
+    std::cout << "Tray Title: " << newTray.GetTitle() << std::endl;
+  } else {
+    std::cerr << "Failed to create tray." << std::endl;
   }
+
+  AppRunner runner;
+  runner.Run(window_ptr);
+
   return 0;
-}
+}

examples/nswindow_example/main.mm

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../src/accessibility_manager.h"
+#include "../src/app_runner.h"
 #include "../src/display.h"
 #include "../src/display_manager.h"
 #include "../src/geometry.h"

examples/window_example/main.cpp

@@ -0,0 +1,7 @@
+#include "app_runner.h"
+#include <iostream>
+
+namespace nativeapi {
+
+
+}  // namespace nativeapi

include/nativeapi.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include "window.h"
+
+namespace nativeapi {
+
+/**
+ * AppRunner is a class that manages the application lifecycle and runs the main
+ * event loop. It provides a way to run an application with a given window and
+ * handle application events.
+ */
+class AppRunner {
+ public:
+  AppRunner();
+  virtual ~AppRunner();
+
+  /**
+   * Runs the application with the specified window.
+   * This method starts the main event loop and blocks until the application
+   * exits.
+   *
+   * @param window The window to run the application with
+   * @return Exit code of the application (0 for success)
+   */
+  int Run(std::shared_ptr<Window> window);
+
+ private:
+  class Impl;
+  std::unique_ptr<Impl> pimpl_;
+};
+
+}  // namespace nativeapi

src/app_runner.cpp

@@ -1,4 +1,5 @@
 #include "display_manager.h"
+#include <algorithm>
 
 namespace nativeapi {
 

src/app_runner.h

@@ -0,0 +1,82 @@
+#import <Cocoa/Cocoa.h>
+#include <iostream>
+
+#include "../../app_runner.h"
+#include "../../window.h"
+
+@interface AppRunnerDelegate : NSObject <NSApplicationDelegate>
+@end
+
+@implementation AppRunnerDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification*)notification {
+  NSLog(@"Application finished launching");
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)sender {
+  return YES;
+}
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender {
+  return NSTerminateNow;
+}
+
+@end
+
+namespace nativeapi {
+
+// Private implementation class
+class AppRunner::Impl {
+ public:
+  AppRunnerDelegate* delegate;
+
+  Impl() { delegate = [[AppRunnerDelegate alloc] init]; }
+
+  ~Impl() { delegate = nil; }
+};
+
+AppRunner::AppRunner() : pimpl_(new Impl()) {}
+
+AppRunner::~AppRunner() {}
+
+int AppRunner::Run(std::shared_ptr<Window> window) {
+  std::cout << "Starting macOS application..." << std::endl;
+
+  // Initialize NSApplication if not already done
+  NSApplication* app = [NSApplication sharedApplication];
+
+  // Set up the application delegate
+  [app setDelegate:pimpl_->delegate];
+
+  // If a window is provided, show it and make it the main window
+  if (window) {
+    // Access the NSWindow from the Window object
+    // We need to get the native window handle
+    window->Show();
+    window->Focus();
+
+    // Get the NSWindow from the Window object
+    // This assumes the Window class has access to the native NSWindow
+    std::cout << "Window shown and focused" << std::endl;
+  }
+
+  // Activate the application
+  [app activateIgnoringOtherApps:YES];
+
+  // Set activation policy to regular app (appears in dock)
+  [app setActivationPolicy:NSApplicationActivationPolicyRegular];
+
+  // Finish launching if not already done
+  [app finishLaunching];
+
+  std::cout << "Starting main run loop..." << std::endl;
+
+  // Start the main event loop
+  [app run];
+
+  std::cout << "Application event loop ended" << std::endl;
+
+  return 0;
+}
+
+}  // namespace nativeapi