Add display and image APIs, refactor menu events

Introduces Display and DisplayManager classes for monitor enumeration and information, and adds a cross-platform Image class for image handling. Refactors Menu and MenuItem to use event-based callbacks and BaseEventEmitter, updates Example to demonstrate new display and image APIs, and synchronizes CNativeAPI submodule.

Author: lijy91

Examples/Example/main.swift

@@ -7,27 +7,23 @@ import NativeAPI
     let trayManager = TrayManager.shared
 
     // Check if system tray is supported
-    guard trayManager.isSupported() else {
+    guard trayManager.isSupported else {
         print("❌ System tray is not supported on this platform")
         return
     }
 
     // Create a basic tray icon
-    guard let trayIcon = trayManager.create() else {
-        print("❌ Failed to create tray icon")
-        return
-    }
-
-    trayIcon.setTitle("NativeAPI Demo")
-    trayIcon.setTooltip("NativeAPI Tray Icon Demo")
+    let trayIcon = TrayIcon()
+    trayIcon.title = "NativeAPI Demo"
+    trayIcon.tooltip = "NativeAPI Tray Icon Demo"
 
     // Create context menu for tray icon
     let contextMenu = Menu()
 
     // Add "Show Window" menu item
     let showItem = MenuItem("显示窗口")
     contextMenu.addItem(showItem)
-    showItem.onClicked { menuItem in
+    showItem.onClicked { event in
         print("📱 显示窗口")
     }
 
@@ -37,14 +33,14 @@ import NativeAPI
     // Add "About" menu item
     let aboutItem = MenuItem("关于")
     contextMenu.addItem(aboutItem)
-    aboutItem.onClicked { menuItem in
+    aboutItem.onClicked { event in
         print("ℹ️ 关于 - NativeAPI Demo v1.0")
     }
 
     // Add "Settings" menu item
     let settingsItem = MenuItem("设置")
     contextMenu.addItem(settingsItem)
-    settingsItem.onClicked { menuItem in
+    settingsItem.onClicked { event in
         print("⚙️ 打开设置面板")
     }
 
@@ -53,56 +49,43 @@ import NativeAPI
 
     // Add checkbox items for demonstration
     let showToolbarItem = MenuItem("显示工具栏", type: .checkbox)
-    showToolbarItem.setChecked(true)
     contextMenu.addItem(showToolbarItem)
 
     let autoSaveItem = MenuItem("自动保存", type: .checkbox)
-    autoSaveItem.setChecked(false)
     contextMenu.addItem(autoSaveItem)
 
     // Add event handlers for checkboxes
-    showToolbarItem.onClicked { menuItem in
-        let isChecked = menuItem.isChecked()
-        print("☑️ 工具栏\(isChecked ? "显示" : "隐藏")")
+    showToolbarItem.onClicked { event in
+        print("☑️ 工具栏切换")
     }
 
-    autoSaveItem.onClicked { menuItem in
-        let isChecked = menuItem.isChecked()
-        print("☑️ 自动保存\(isChecked ? "已启用" : "已禁用")")
+    autoSaveItem.onClicked { event in
+        print("☑️ 自动保存切换")
     }
 
     // Add separator
     contextMenu.addSeparator()
 
     // Add radio button group for view mode selection
     let compactViewItem = MenuItem("紧凑视图", type: .radio)
-    compactViewItem.setRadioGroup(1)
-    compactViewItem.setChecked(false)
     contextMenu.addItem(compactViewItem)
 
     let normalViewItem = MenuItem("普通视图", type: .radio)
-    normalViewItem.setRadioGroup(1)
-    normalViewItem.setChecked(true)
     contextMenu.addItem(normalViewItem)
 
     let detailedViewItem = MenuItem("详细视图", type: .radio)
-    detailedViewItem.setRadioGroup(1)
-    detailedViewItem.setChecked(false)
     contextMenu.addItem(detailedViewItem)
 
     // Add event handlers for radio buttons
-    compactViewItem.onClicked { menuItem in
-        menuItem.setState(.checked)
+    compactViewItem.onClicked { event in
         print("🔘 视图模式: 紧凑视图")
     }
 
-    normalViewItem.onClicked { menuItem in
-        menuItem.setState(.checked)
+    normalViewItem.onClicked { event in
         print("🔘 视图模式: 普通视图")
     }
 
-    detailedViewItem.onClicked { menuItem in
-        menuItem.setState(.checked)
+    detailedViewItem.onClicked { event in
         print("🔘 视图模式: 详细视图")
     }
 
@@ -112,42 +95,97 @@ import NativeAPI
     // Add "Exit" menu item
     let exitItem = MenuItem("退出")
     contextMenu.addItem(exitItem)
-    exitItem.onClicked { menuItem in
+    exitItem.onClicked { event in
         print("👋 退出应用程序")
         exit(0)
     }
 
     // Set the context menu for tray icon
-    trayIcon.setContextMenu(contextMenu)
+    trayIcon.contextMenu = contextMenu
 
-    // // Configure click handlers
-    // trayIcon.onLeftClick { trayIcon, event in
-    //     print("👆 托盘图标左键点击")
-    // }
+    // Configure click handlers
+    trayIcon.onClicked { event in
+        print("👆 托盘图标左键点击")
+    }
 
-    // trayIcon.onRightClick { trayIcon, event in
-    //     print("👆 托盘图标右键点击")
-    // }
+    trayIcon.onRightClicked { event in
+        print("👆 托盘图标右键点击")
+    }
 
-    // trayIcon.onDoubleClick { trayIcon, event in
-    //     print("👆 托盘图标双击")
-    // }
+    trayIcon.onDoubleClicked { event in
+        print("👆 托盘图标双击")
+    }
 
     // Show the tray icon
-    if trayIcon.show() {
-        print("✅ 托盘图标已显示，右键点击查看菜单")
+    trayIcon.isVisible = true
+    print("✅ 托盘图标已显示，右键点击查看菜单")
+}
+
+/// Display information demo
+@MainActor func displayInfoDemo() {
+    print("\n=== Display Information Demo ===")
+    let displayManager = DisplayManager.shared
+    
+    // Get all displays
+    let displays = displayManager.getAll()
+    print("📺 Found \(displays.count) display(s)")
+    
+    for (index, display) in displays.enumerated() {
+        print("\nDisplay \(index + 1):")
+        print("  ID: \(display.id)")
+        print("  Name: \(display.name)")
+        print("  Size: \(display.size.width)x\(display.size.height)")
+        print("  Position: (\(display.position.x), \(display.position.y))")
+        print("  Scale Factor: \(display.scaleFactor)")
+        print("  Primary: \(display.isPrimary ? "Yes" : "No")")
+        print("  Orientation: \(display.orientation)")
+        print("  Refresh Rate: \(display.refreshRate) Hz")
+        print("  Bit Depth: \(display.bitDepth)")
+    }
+    
+    // Get primary display
+    if let primaryDisplay = displayManager.getPrimary() {
+        print("\n🖥️ Primary Display: \(primaryDisplay.name)")
+    }
+    
+    // Get cursor position
+    let cursorPos = displayManager.getCursorPosition()
+    print("🖱️ Cursor Position: (\(cursorPos.x), \(cursorPos.y))")
+}
+
+/// Image loading demo
+@MainActor func imageLoadingDemo() {
+    print("\n=== Image Loading Demo ===")
+    
+    // Try to load a system icon
+    if let systemIcon = Image.fromSystemIcon("NSApplicationIcon") {
+        print("✅ Loaded system icon: \(systemIcon.size.width)x\(systemIcon.size.height)")
+        print("   Format: \(systemIcon.format ?? "unknown")")
+    } else {
+        print("❌ Failed to load system icon")
+    }
+    
+    // Try to load from asset (if available)
+    if let assetIcon = Image.fromAsset("assets/icons/app_icon.png") {
+        print("✅ Loaded asset icon: \(assetIcon.size.width)x\(assetIcon.size.height)")
     } else {
-        print("❌ Failed to show tray icon")
+        print("ℹ️ Asset icon not found (this is expected if not bundled)")
     }
 }
 
 // MARK: - Main Application
 
 @MainActor func runApplication() {
+    // Display information demo
+    displayInfoDemo()
+    
+    // Image loading demo
+    imageLoadingDemo()
+    
     // Create tray icon with context menu
     createTrayIconWithContextMenu()
 
-    print("\n✅ NativeAPI 托盘图标演示已启动")
+    print("\n✅ NativeAPI 演示已启动")
     print("💡 功能测试:")
     print("   • 普通菜单项: 显示窗口、关于、设置")
     print("   • 复选框菜单项: 显示工具栏、自动保存")
@@ -164,11 +202,11 @@ import NativeAPI
         return
     }
 
-    // Hide the window so only tray icon is visible
-    window.hide()
+    // Don't hide the window immediately - let AppRunner handle the visibility
+    // window.hide()
 
     let exitCode = AppRunner.shared.run(with: window)
     print("💡 应用程序退出，退出码: \(exitCode.rawValue)")
 }
 
-runApplication()
+runApplication()

Sources/CNativeAPI

@@ -0,0 +1,97 @@
+import CNativeAPI
+import Foundation
+
+/// Display orientation enumeration
+public enum DisplayOrientation: Int, CaseIterable {
+    case portrait = 0
+    case landscape = 90
+    case portraitFlipped = 180
+    case landscapeFlipped = 270
+    
+    public init(value: Int) {
+        switch value {
+        case 0: self = .portrait
+        case 90: self = .landscape
+        case 180: self = .portraitFlipped
+        case 270: self = .landscapeFlipped
+        default: self = .portrait
+        }
+    }
+}
+
+/// Display represents a single display/monitor
+public class Display: BaseNativeHandleWrapper<native_display_t> {
+    
+    public init(nativeHandle: native_display_t) {
+        super.init(nativeHandle: nativeHandle) { native_display_free($0) }
+    }
+
+    /// Unique identifier for this display
+    public var id: String {
+        guard let idPtr = native_display_get_id(nativeHandle) else {
+            return ""
+        }
+        let id = String(cString: idPtr)
+        free_c_str(idPtr)
+        return id
+    }
+
+    /// Human-readable name of this display
+    public var name: String {
+        guard let namePtr = native_display_get_name(nativeHandle) else {
+            return ""
+        }
+        let name = String(cString: namePtr)
+        free_c_str(namePtr)
+        return name
+    }
+
+    /// Position of this display in the virtual desktop
+    public var position: Point {
+        let nativePoint = native_display_get_position(nativeHandle)
+        return Point(nativePoint)
+    }
+
+    /// Physical size of this display in pixels
+    public var size: Size {
+        let nativeSize = native_display_get_size(nativeHandle)
+        return Size(nativeSize)
+    }
+
+    /// Work area of this display (excluding taskbar/dock)
+    public var workArea: Rect {
+        let nativeRect = native_display_get_work_area(nativeHandle)
+        return Rect(nativeRect)
+    }
+
+    /// Scale factor of this display
+    public var scaleFactor: Double {
+        return native_display_get_scale_factor(nativeHandle)
+    }
+
+    /// Whether this is the primary display
+    public var isPrimary: Bool {
+        return native_display_is_primary(nativeHandle)
+    }
+
+    /// Orientation of this display
+    public var orientation: DisplayOrientation {
+        let nativeOrientation = native_display_get_orientation(nativeHandle)
+        return DisplayOrientation(value: Int(nativeOrientation.rawValue))
+    }
+
+    /// Refresh rate of this display in Hz
+    public var refreshRate: Int {
+        return Int(native_display_get_refresh_rate(nativeHandle))
+    }
+
+    /// Bit depth of this display
+    public var bitDepth: Int {
+        return Int(native_display_get_bit_depth(nativeHandle))
+    }
+
+    /// Native platform-specific object handle
+    public var nativeObject: UnsafeMutableRawPointer? {
+        return native_display_get_native_object(nativeHandle)
+    }
+}

Sources/NativeAPI/Display.swift

@@ -0,0 +1,53 @@
+import CNativeAPI
+import Foundation
+
+/// DisplayManager manages all displays/monitors
+public class DisplayManager: @unchecked Sendable {
+    /// Singleton instance of DisplayManager
+    public static let shared = DisplayManager()
+
+    private init() {}
+
+    /// Returns a list of all displays.
+    ///
+    /// This method retrieves a list of all available displays using the native
+    /// display manager API. It then converts each display handle into a Swift
+    /// Display object and returns the list.
+    public func getAll() -> [Display] {
+        let displayList = native_display_manager_get_all()
+        var displays: [Display] = []
+
+        for i in 0..<displayList.count {
+            if let nativeHandle = (displayList.displays + i).pointee {
+                displays.append(Display(nativeHandle: nativeHandle))
+            }
+        }
+
+        // Note: In the Dart version, the display list is not freed
+        // native_display_list_free(displayList)
+
+        return displays
+    }
+
+    /// Returns the current cursor position.
+    ///
+    /// This method retrieves the current cursor position using the native display
+    /// manager API. It then converts the position into a Swift Point object and
+    /// returns it.
+    public func getCursorPosition() -> Point {
+        let nativePoint = native_display_manager_get_cursor_position()
+        return Point(nativePoint)
+    }
+
+    /// Returns the primary display.
+    ///
+    /// This method retrieves the primary display using the native display manager
+    /// API. It then converts the display handle into a Swift Display object and
+    /// returns it.
+    public func getPrimary() -> Display? {
+        guard let nativeHandle = native_display_manager_get_primary() else {
+            return nil
+        }
+        return Display(nativeHandle: nativeHandle)
+    }
+}