Cap for Windows, Part 2

Cargo.toml

@@ -20,10 +20,14 @@ tokio = { version = "1.39.3", features = [
 ] }
 tauri = { version = "2.0.0" }
 specta = { version = "=2.0.0-rc.20" }
-scap = { git = "https://github.com/CapSoftware/scap", rev = "b1e140a3fe90" }
-nokhwa = { git = "https://github.com/CapSoftware/nokhwa", rev = "c5c7e2298764", features = [
+scap = { git = "https://github.com/CapSoftware/scap", rev = "b1e140a3fe905c19b845dfea66b3b1aea02f0472" }
+nokhwa = { git = "https://github.com/CapSoftware/nokhwa", rev = "0d3d1f30a78b", features = [
 	"input-native",
 	"serialize",
 ] }
-nokhwa-bindings-macos = { git = "https://github.com/CapSoftware/nokhwa", rev = "c5c7e2298764" }
+nokhwa-bindings-macos = { git = "https://github.com/CapSoftware/nokhwa", rev = "0d3d1f30a78b" }
 wgpu = "22.1.0"
+
+windows = "0.58.0"
+windows-sys = "0.59.0"
+windows-capture = "=1.3.6"

apps/desktop/src-tauri/Cargo.toml

@@ -90,12 +90,13 @@ swift-rs = "1.0.6"
 tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
 
 [target.'cfg(target_os= "windows")'.dependencies]
-windows = { version = "0.52.0", features = [
+windows = { workspace = true, features = [
 	"Win32_Foundation",
 	"Win32_System",
 	"Win32_UI_WindowsAndMessaging",
 	"Win32_Graphics_Gdi",
 ] }
+windows-sys = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.29.0", features = ["fs"] }

apps/desktop/src-tauri/capabilities/default.json

@@ -13,6 +13,7 @@
     "core:window:allow-minimize",
     "core:window:allow-unminimize",
     "core:window:allow-maximize",
+    "core:window:allow-unmaximize",
     "core:window:allow-set-size",
     "core:window:allow-set-focus",
     "core:window:allow-start-dragging",

apps/desktop/src-tauri/src/cursor.rs

@@ -185,131 +185,132 @@ fn get_cursor_image_data() -> Option<Vec<u8>> {
 
 #[cfg(windows)]
 fn get_cursor_image_data() -> Option<Vec<u8>> {
-    use windows::Win32::Foundation::{BOOL, HWND, POINT};
-    use windows::Win32::Graphics::Gdi::{
-        BitBlt, CreateCompatibleBitmap, CreateCompatibleDC, CreateDIBSection, DeleteDC,
-        DeleteObject, GetDC, GetObjectA, ReleaseDC, SelectObject, BITMAP, BITMAPINFO,
-        BITMAPINFOHEADER, DIB_RGB_COLORS, SRCCOPY,
-    };
-    use windows::Win32::UI::WindowsAndMessaging::{GetCursorInfo, CURSORINFO, CURSORINFO_FLAGS};
-    use windows::Win32::UI::WindowsAndMessaging::{GetIconInfo, ICONINFO};
-
-    unsafe {
-        // Get cursor info
-        let mut cursor_info = CURSORINFO {
-            cbSize: std::mem::size_of::<CURSORINFO>() as u32,
-            flags: CURSORINFO_FLAGS(0),
-            hCursor: Default::default(),
-            ptScreenPos: POINT::default(),
-        };
-
-        // Handle Result return type
-        if GetCursorInfo(&mut cursor_info).is_err() {
-            return None;
-        }
-
-        // If no cursor, return None
-        if cursor_info.hCursor.is_invalid() {
-            return None;
-        }
-
-        // Get icon info
-        let mut icon_info = ICONINFO::default();
-        // Handle Result return type
-        if GetIconInfo(cursor_info.hCursor, &mut icon_info).is_err() {
-            return None;
-        }
-
-        // Get bitmap info
-        let mut bitmap = BITMAP::default();
-        if GetObjectA(
-            icon_info.hbmColor,
-            std::mem::size_of::<BITMAP>() as i32,
-            Some(&mut bitmap as *mut _ as *mut _),
-        ) == 0
-        {
-            return None;
-        }
-
-        // Create compatible DC
-        let screen_dc = GetDC(HWND(0));
-        let mem_dc = CreateCompatibleDC(screen_dc);
-
-        // Create bitmap info header
-        let bi = BITMAPINFOHEADER {
-            biSize: std::mem::size_of::<BITMAPINFOHEADER>() as u32,
-            biWidth: bitmap.bmWidth,
-            biHeight: -bitmap.bmHeight, // Negative height for top-down bitmap
-            biPlanes: 1,
-            biBitCount: 32,
-            biCompression: 0,
-            biSizeImage: 0,
-            biXPelsPerMeter: 0,
-            biYPelsPerMeter: 0,
-            biClrUsed: 0,
-            biClrImportant: 0,
-        };
-
-        let bitmap_info = BITMAPINFO {
-            bmiHeader: bi,
-            bmiColors: [Default::default()],
-        };
-
-        // Create DIB section
-        let mut bits: *mut std::ffi::c_void = std::ptr::null_mut();
-        let dib = CreateDIBSection(mem_dc, &bitmap_info, DIB_RGB_COLORS, &mut bits, None, 0);
-
-        if dib.is_err() {
-            return None;
-        }
-
-        let dib = dib.unwrap();
-
-        // Select DIB into DC
-        let old_bitmap = SelectObject(mem_dc, dib);
-
-        // Copy cursor image
-        if BitBlt(
-            mem_dc,
-            0,
-            0,
-            bitmap.bmWidth,
-            bitmap.bmHeight,
-            screen_dc,
-            cursor_info.ptScreenPos.x,
-            cursor_info.ptScreenPos.y,
-            SRCCOPY,
-        )
-        .is_err()
-        {
-            return None;
-        }
-
-        // Get image data
-        let size = (bitmap.bmWidth * bitmap.bmHeight * 4) as usize;
-        let mut image_data = vec![0u8; size];
-        std::ptr::copy_nonoverlapping(bits, image_data.as_mut_ptr() as *mut _, size);
-
-        // Cleanup
-        SelectObject(mem_dc, old_bitmap);
-        DeleteObject(dib);
-        DeleteDC(mem_dc);
-        ReleaseDC(HWND(0), screen_dc);
-        DeleteObject(icon_info.hbmColor);
-        DeleteObject(icon_info.hbmMask);
-
-        // Convert to PNG format
-        let image =
-            image::RgbaImage::from_raw(bitmap.bmWidth as u32, bitmap.bmHeight as u32, image_data)?;
-
-        let mut png_data = Vec::new();
-        image
-            .write_to(
-                &mut std::io::Cursor::new(&mut png_data),
-                image::ImageFormat::Png,
-            )
-            .ok()?;
-
-        Some(png_data)
-    }
+    return None;
+    // use windows::Win32::Foundation::{BOOL, HWND, POINT};
+    // use windows::Win32::Graphics::Gdi::{
+    //     BitBlt, CreateCompatibleBitmap, CreateCompatibleDC, CreateDIBSection, DeleteDC,
+    //     DeleteObject, GetDC, GetObjectA, ReleaseDC, SelectObject, BITMAP, BITMAPINFO,
+    //     BITMAPINFOHEADER, DIB_RGB_COLORS, SRCCOPY,
+    // };
+    // use windows::Win32::UI::WindowsAndMessaging::{GetCursorInfo, CURSORINFO, CURSORINFO_FLAGS};
+    // use windows::Win32::UI::WindowsAndMessaging::{GetIconInfo, ICONINFO};
+
+    // unsafe {
+    //     // Get cursor info
+    //     let mut cursor_info = CURSORINFO {
+    //         cbSize: std::mem::size_of::<CURSORINFO>() as u32,
+    //         flags: CURSORINFO_FLAGS(0),
+    //         hCursor: Default::default(),
+    //         ptScreenPos: POINT::default(),
+    //     };
+
+    //     // Handle Result return type
+    //     if GetCursorInfo(&mut cursor_info).is_err() {
+    //         return None;
+    //     }
+
+    //     // If no cursor, return None
+    //     if cursor_info.hCursor.is_invalid() {
+    //         return None;
+    //     }
+
+    //     // Get icon info
+    //     let mut icon_info = ICONINFO::default();
+    //     // Handle Result return type
+    //     if GetIconInfo(cursor_info.hCursor, &mut icon_info).is_err() {
+    //         return None;
+    //     }
+
+    //     // Get bitmap info
+    //     let mut bitmap = BITMAP::default();
+    //     if GetObjectA(
+    //         icon_info.hbmColor,
+    //         std::mem::size_of::<BITMAP>() as i32,
+    //         Some(&mut bitmap as *mut _ as *mut _),
+    //     ) == 0
+    //     {
+    //         return None;
+    //     }
+
+    //     // Create compatible DC
+    //     let screen_dc = GetDC(HWND(0));
+    //     let mem_dc = CreateCompatibleDC(screen_dc);
+
+    //     // Create bitmap info header
+    //     let bi = BITMAPINFOHEADER {
+    //         biSize: std::mem::size_of::<BITMAPINFOHEADER>() as u32,
+    //         biWidth: bitmap.bmWidth,
+    //         biHeight: -bitmap.bmHeight, // Negative height for top-down bitmap
+    //         biPlanes: 1,
+    //         biBitCount: 32,
+    //         biCompression: 0,
+    //         biSizeImage: 0,
+    //         biXPelsPerMeter: 0,
+    //         biYPelsPerMeter: 0,
+    //         biClrUsed: 0,
+    //         biClrImportant: 0,
+    //     };
+
+    //     let bitmap_info = BITMAPINFO {
+    //         bmiHeader: bi,
+    //         bmiColors: [Default::default()],
+    //     };
+
+    //     // Create DIB section
+    //     let mut bits: *mut std::ffi::c_void = std::ptr::null_mut();
+    //     let dib = CreateDIBSection(mem_dc, &bitmap_info, DIB_RGB_COLORS, &mut bits, None, 0);
+
+    //     if dib.is_err() {
+    //         return None;
+    //     }
+
+    //     let dib = dib.unwrap();
+
+    //     // Select DIB into DC
+    //     let old_bitmap = SelectObject(mem_dc, dib);
+
+    //     // Copy cursor image
+    //     if BitBlt(
+    //         mem_dc,
+    //         0,
+    //         0,
+    //         bitmap.bmWidth,
+    //         bitmap.bmHeight,
+    //         screen_dc,
+    //         cursor_info.ptScreenPos.x,
+    //         cursor_info.ptScreenPos.y,
+    //         SRCCOPY,
+    //     )
+    //     .is_err()
+    //     {
+    //         return None;
+    //     }
+
+    //     // Get image data
+    //     let size = (bitmap.bmWidth * bitmap.bmHeight * 4) as usize;
+    //     let mut image_data = vec![0u8; size];
+    //     std::ptr::copy_nonoverlapping(bits, image_data.as_mut_ptr() as *mut _, size);
+
+    //     // Cleanup
+    //     SelectObject(mem_dc, old_bitmap);
+    //     DeleteObject(dib);
+    //     DeleteDC(mem_dc);
+    //     ReleaseDC(HWND(0), screen_dc);
+    //     DeleteObject(icon_info.hbmColor);
+    //     DeleteObject(icon_info.hbmMask);
+
+    //     // Convert to PNG format
+    //     let image =
+    //         image::RgbaImage::from_raw(bitmap.bmWidth as u32, bitmap.bmHeight as u32, image_data)?;
+
+    //     let mut png_data = Vec::new();
+    //     image
+    //         .write_to(
+    //             &mut std::io::Cursor::new(&mut png_data),
+    //             image::ImageFormat::Png,
+    //         )
+    //         .ok()?;
+
+    //     Some(png_data)
+    // }
 }