fix(Core): add GetWindowRectangle to macOS

BrycensRanch · BrycensRanch · commit 76407ad0b6a7 · 2026-01-21T13:15:43.000-05:00
diff --git a/SnapX.Core/ScreenCapture/Rust/bindings/snapxrust.cs b/SnapX.Core/ScreenCapture/Rust/bindings/snapxrust.cs
@@ -1513,6 +1513,7 @@ internal record WindowData(
     string @appName,
     string @title,
     uint @processId,
+    uint @hwnd,
     int @x,
     int @y,
     uint @width,
@@ -1532,6 +1533,7 @@ public override WindowData Read(BigEndianStream stream)
             @appName: FfiConverterString.INSTANCE.Read(stream),
             @title: FfiConverterString.INSTANCE.Read(stream),
             @processId: FfiConverterUInt32.INSTANCE.Read(stream),
+            @hwnd: FfiConverterUInt32.INSTANCE.Read(stream),
             @x: FfiConverterInt32.INSTANCE.Read(stream),
             @y: FfiConverterInt32.INSTANCE.Read(stream),
             @width: FfiConverterUInt32.INSTANCE.Read(stream),
@@ -1548,6 +1550,7 @@ public override int AllocationSize(WindowData value)
             + FfiConverterString.INSTANCE.AllocationSize(value.@appName)
             + FfiConverterString.INSTANCE.AllocationSize(value.@title)
             + FfiConverterUInt32.INSTANCE.AllocationSize(value.@processId)
+            + FfiConverterUInt32.INSTANCE.AllocationSize(value.@hwnd)
             + FfiConverterInt32.INSTANCE.AllocationSize(value.@x)
             + FfiConverterInt32.INSTANCE.AllocationSize(value.@y)
             + FfiConverterUInt32.INSTANCE.AllocationSize(value.@width)
@@ -1562,6 +1565,7 @@ public override void Write(WindowData value, BigEndianStream stream)
         FfiConverterString.INSTANCE.Write(value.@appName, stream);
         FfiConverterString.INSTANCE.Write(value.@title, stream);
         FfiConverterUInt32.INSTANCE.Write(value.@processId, stream);
+        FfiConverterUInt32.INSTANCE.Write(value.@hwnd, stream);
         FfiConverterInt32.INSTANCE.Write(value.@x, stream);
         FfiConverterInt32.INSTANCE.Write(value.@y, stream);
         FfiConverterUInt32.INSTANCE.Write(value.@width, stream);
diff --git a/SnapX.Core/ScreenCapture/Rust/build.rs b/SnapX.Core/ScreenCapture/Rust/build.rs
@@ -1,25 +1,40 @@
-use std::process::Command;
 use camino::Utf8Path;
+use std::{env, path::PathBuf, process::Command};
 
 fn main() {
-        println!("cargo:rerun-if-changed=build.rs");
-        let out_dir = "bindings";
-        let udl_file = "src/snapxrust.udl";
-        let cargo = Utf8Path::new("Cargo.toml");
-        uniffi_build::generate_scaffolding(udl_file).unwrap();
-            // if Command::new("$HOME/.cargo/bin/uniffi-bindgen-cs").arg("--version").output().is_err() {
-        // Using fork to bump uniffi to 0.30
-        println!("Installing uniffi-bindgen-cs updated fork!");
-            Command::new("cargo")
-                .arg("install")
-                .arg("uniffi-bindgen-cs")
-                .arg("--git")
-                .arg("https://github.com/sensslen/uniffi-bindgen-cs")
-                .arg("--branch")
-                .arg("main")
-                .status()
-                .expect("Failed to install uniffi-bindgen-cs");
-        // }
-        let _ = Command::new("$HOME/.cargo/bin/uniffi-bindgen-cs").arg(udl_file)
-        .arg("--config").arg(cargo).arg("--out-dir").arg(out_dir).output();
+    println!("cargo:rerun-if-changed=build.rs");
+    let out_dir = "bindings";
+    let udl_file = "src/snapxrust.udl";
+    let cargo = Utf8Path::new("Cargo.toml");
+    uniffi_build::generate_scaffolding(udl_file).unwrap();
+    // if Command::new("$HOME/.cargo/bin/uniffi-bindgen-cs").arg("--version").output().is_err() {
+    // Using fork to bump uniffi to 0.30
+    println!("Installing uniffi-bindgen-cs updated fork!");
+    Command::new("cargo")
+        .arg("install")
+        .arg("uniffi-bindgen-cs")
+        .arg("--git")
+        .arg("https://github.com/sensslen/uniffi-bindgen-cs")
+        .arg("--branch")
+        .arg("main")
+        .status()
+        .expect("Failed to install uniffi-bindgen-cs");
+    // }
+    let home = env::var("HOME")
+        .or_else(|_| env::var("USERPROFILE"))
+        .expect("Could not find HOME or USERPROFILE environment variables");
+
+    let mut bindgen_path = PathBuf::from(home).join(".cargo/bin/uniffi-bindgen-cs");
+
+    if cfg!(target_os = "windows") {
+        bindgen_path.set_extension("exe");
+    }
+
+    let output = Command::new(bindgen_path)
+        .arg(udl_file)
+        .arg("--config")
+        .arg(cargo)
+        .arg("--out_dir")
+        .arg(out_dir)
+        .output();
 }
diff --git a/SnapX.Core/ScreenCapture/Rust/src/lib.rs b/SnapX.Core/ScreenCapture/Rust/src/lib.rs
@@ -28,6 +28,7 @@ pub struct WindowData {
     pub app_name: String,
     pub title: String,
     pub process_id: u32,
+    pub hwnd: u32,
     pub x: i32,
     pub y: i32,
     pub width: u32,
@@ -52,11 +53,13 @@ pub fn get_window_list() -> Vec<WindowData> {
         let is_maximized = window.is_maximized().unwrap_or(false);
         let process_id = window.pid().unwrap_or(0);
         let is_focused = window.is_focused().unwrap_or(false);
+        let hwnd = window.id().unwrap_or_default();
 
         list.push(WindowData {
             app_name,
             title,
             process_id,
+            hwnd,
             x,
             y,
             width,
diff --git a/SnapX.Core/ScreenCapture/Rust/src/snapxrust.udl b/SnapX.Core/ScreenCapture/Rust/src/snapxrust.udl
@@ -14,6 +14,7 @@ dictionary WindowData {
     string    app_name;
     string    title;
     u32       process_id;
+    u32       hwnd;
     i32       x;
     i32       y;
     u32       width;
diff --git a/SnapX.Core/Utils/Native/LinuxAPI.cs b/SnapX.Core/Utils/Native/LinuxAPI.cs
@@ -31,6 +31,11 @@ internal static bool IsGNOME()
             && sessionVersion.Contains("gnome", StringComparison.OrdinalIgnoreCase);
     }
 
+    public override Rectangle GetWindowRectangle(WindowInfo window)
+    {
+        return GetWindowRectangleX11(window.Handle);
+    }
+
     public override Rectangle GetWindowRectangle(IntPtr windowHandle)
     {
         return GetWindowRectangleX11(windowHandle);
diff --git a/SnapX.Core/Utils/Native/MacOSAPI.cs b/SnapX.Core/Utils/Native/MacOSAPI.cs
@@ -85,22 +85,68 @@ struct CGPoint
         public double Y;
     }
 
-    [DllImport("/System/Library/Frameworks/CoreGraphics.framework/CoreGraphics")]
+    private const string CoreGraphicsLib =
+        "/System/Library/Frameworks/CoreGraphics.framework/CoreGraphics";
+
+    [DllImport(CoreGraphicsLib)]
     static extern CGPoint CGEventGetLocation(IntPtr eventRef);
 
-    [DllImport("/System/Library/Frameworks/CoreGraphics.framework/CoreGraphics")]
+    [DllImport(CoreGraphicsLib)]
     static extern IntPtr CGEventCreate(IntPtr source);
 
-    [DllImport("/System/Library/Frameworks/CoreGraphics.framework/CoreGraphics")]
+    [DllImport(CoreGraphicsLib)]
     static extern IntPtr CFRelease(IntPtr eventRef);
 
+    private const string CoreFoundationLib =
+        "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
+
+    // Options for window list
+    private const uint kCGWindowListOptionIncludingWindow = 1 << 3;
+
+    [DllImport(CoreGraphicsLib)]
+    private static extern IntPtr CGWindowListCopyWindowInfo(uint option, uint relativeToWindow);
+
+    [DllImport(CoreFoundationLib)]
+    private static extern int CFArrayGetCount(IntPtr theArray);
+
+    [DllImport(CoreFoundationLib)]
+    private static extern IntPtr CFArrayGetValueAtIndex(IntPtr theArray, int idx);
+    [DllImport(CoreFoundationLib)]
+    internal static extern IntPtr CFStringCreateWithCString(
+        IntPtr alloc,
+        string str,
+        uint encoding
+    );
+
+    [DllImport(CoreFoundationLib)]
+    internal static extern IntPtr CFDictionaryGetValue(IntPtr theDict, IntPtr key);
+
+    [DllImport(CoreGraphicsLib)]
+    [return: MarshalAs(UnmanagedType.I1)]
+    internal static extern bool CGRectMakeWithDictionaryRepresentation(
+        IntPtr dict,
+        out CGRect rect
+    );
+    [StructLayout(LayoutKind.Sequential)]
+    public struct CGRect
+    {
+        public double X;
+        public double Y;
+        public double Width;
+        public double Height;
+    }
+
+    // Standard UTF8 encoding ID for CFString
+    internal const uint kCFStringEncodingUTF8 = 0x08000100;
+
     public override Point GetCursorPosition()
     {
         var ev = CGEventCreate(IntPtr.Zero);
         var point = CGEventGetLocation(ev);
         CFRelease(ev);
         return new Point((int)point.X, (int)point.Y);
     }
+
     public void ShowWindow(WindowInfo window)
     {
         if (window.ProcessId == 0)
@@ -121,6 +167,66 @@ public void ShowWindow(WindowInfo window)
         using var process = Process.Start(psi);
         process?.WaitForExit();
     }
+    public override Rectangle GetWindowRectangle(WindowInfo window)
+    {
+        return base.GetWindowRectangle(window.Handle);
+    }
+    public override Rectangle GetWindowRectangle(IntPtr windowHandle)
+    {
+        uint windowId = (uint)windowHandle.ToInt32();
+
+        IntPtr arrayRef = CGWindowListCopyWindowInfo(kCGWindowListOptionIncludingWindow, windowId);
+        if (arrayRef == IntPtr.Zero)
+            return Rectangle.Empty;
+
+        try
+        {
+            int count = CFArrayGetCount(arrayRef);
+            if (count == 0)
+                return Rectangle.Empty;
+
+            IntPtr dictRef = CFArrayGetValueAtIndex(arrayRef, 0);
+
+            return ExtractCGRectFromDict(dictRef);
+        }
+        finally
+        {
+            CFRelease(arrayRef);
+        }
+    }
+    private Rectangle ExtractCGRectFromDict(IntPtr dictRef)
+    {
+        IntPtr key = CFStringCreateWithCString(
+            IntPtr.Zero,
+            "kCGWindowBounds",
+            kCFStringEncodingUTF8
+        );
+
+        try
+        {
+            IntPtr boundsDict = CFDictionaryGetValue(dictRef, key);
+
+            if (
+                boundsDict != IntPtr.Zero
+                && CGRectMakeWithDictionaryRepresentation(boundsDict, out CGRect cgRect)
+            )
+            {
+                return new Rectangle(
+                    (int)cgRect.X,
+                    (int)cgRect.Y,
+                    (int)cgRect.Width,
+                    (int)cgRect.Height
+                );
+            }
+        }
+        finally
+        {
+            if (key != IntPtr.Zero)
+                CFRelease(key);
+        }
+
+        return Rectangle.Empty;
+    }
 
     public override List<WindowInfo> GetWindowList()
     {
@@ -139,9 +245,7 @@ public override List<WindowInfo> GetWindowList()
                 IsMinimized = raw.isMinimized,
                 IsVisible = !raw.isMinimized,
                 IsActive = raw.isFocused,
-
-                // Not exposed
-                Handle = IntPtr.Zero,
+                Handle = (nint)(nuint)raw.hwnd,
             })
             .ToList();
 
diff --git a/SnapX.Core/Utils/Native/Methods.cs b/SnapX.Core/Utils/Native/Methods.cs
@@ -84,6 +84,8 @@ public static Point GetCursorPosition()
 
     public static Rectangle GetWindowRectangle(IntPtr windowHandle = 0) =>
         NativeAPI.GetWindowRectangle(windowHandle);
+            public static Rectangle GetWindowRectangle(WindowInfo window) =>
+        NativeAPI.GetWindowRectangle(window);
 
     public static WindowInfo? GetForegroundWindow()
     {

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ internal static bool IsGNOME()`
`31`	`31`	`&& sessionVersion.Contains("gnome", StringComparison.OrdinalIgnoreCase);`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ public override Rectangle GetWindowRectangle(WindowInfo window)`
	`35`	`+ {`
	`36`	`+ return GetWindowRectangleX11(window.Handle);`
	`37`	`+ }`
	`38`	`+`
`34`	`39`	`public override Rectangle GetWindowRectangle(IntPtr windowHandle)`
`35`	`40`	`{`
`36`	`41`	`return GetWindowRectangleX11(windowHandle);`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ public static Point GetCursorPosition()`
`84`	`84`
`85`	`85`	`public static Rectangle GetWindowRectangle(IntPtr windowHandle = 0) =>`
`86`	`86`	`NativeAPI.GetWindowRectangle(windowHandle);`
	`87`	`+ public static Rectangle GetWindowRectangle(WindowInfo window) =>`
	`88`	`+ NativeAPI.GetWindowRectangle(window);`
`87`	`89`
`88`	`90`	`public static WindowInfo? GetForegroundWindow()`
`89`	`91`	`{`