feat/#1245/fix focus on mac and linux

.devcontainer/devcontainer.json

@@ -23,6 +23,9 @@
     // 	}
     // ]
 
+    // Features to add to the dev container. More info: https://containers.dev/features.
+    // "features": {},
+
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
     "forwardPorts": [6080, 5901],
 
@@ -33,9 +36,9 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "wengerk.highlight-bad-chars",
                 "streetsidesoftware.code-spell-checker",
-                "EditorConfig.EditorConfig",
+                "wengerk.highlight-bad-chars",
+                "editorconfig.editorconfig",
                 "tamasfe.even-better-toml",
                 "rust-lang.rust-analyzer"
             ]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xcap"
-version = "0.1.0"
+version = "0.3.1"
 edition = "2021"
 description = "XCap is a cross-platform screen capture library written in Rust. It supports Linux (X11, Wayland), MacOS, and Windows. XCap supports screenshot and video recording (WIP)."
 license = "Apache-2.0"
@@ -13,26 +13,34 @@ keywords = ["screen", "monitor", "window", "capture", "image"]
 
 [features]
 vendored = ["dbus/vendored"]
+image = ["image/default"]
 
 [dependencies]
-image = "0.25"
+image = { version = "0.25", default-features = false, features = ["png"] }
 log = "0.4"
-sysinfo = "0.33"
+scopeguard = "1.2"
 thiserror = "2.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.10"
-core-graphics = "0.24"
+objc2 = "0.6"
+objc2-app-kit = "0.3"
+objc2-core-foundation = "0.3"
+objc2-core-graphics = "0.3"
+objc2-foundation = "0.3"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.58", features = [
+widestring = "1.1"
+windows = { version = "0.59", features = [
     "Win32_Foundation",
     "Win32_Graphics_Gdi",
     "Win32_Graphics_Dwm",
+    "Win32_Devices_Display",
+    "Win32_System_LibraryLoader",
     "Win32_UI_WindowsAndMessaging",
     "Win32_Storage_Xps",
     "Win32_System_Threading",
     "Win32_System_ProcessStatus",
+    "Win32_System_Registry",
     "Win32_Storage_FileSystem",
     "Win32_Graphics_Dxgi",
     "Win32_Graphics_Direct3D",
@@ -41,9 +49,9 @@ windows = { version = "0.58", features = [
 ] }
 
 [target.'cfg(target_os="linux")'.dependencies]
+dbus = "0.9"
 percent-encoding = "2.3"
 xcb = { version = "1.5", features = ["randr"] }
-dbus = { version = "0.9" }
 
 [dev-dependencies]
 fs_extra = "1.3"

examples/monitor_capture.rs

@@ -3,11 +3,7 @@ use std::time::Instant;
 use xcap::Monitor;
 
 fn normalized(filename: &str) -> String {
-    filename
-        .replace('|', "")
-        .replace('\\', "")
-        .replace(':', "")
-        .replace('/', "")
+    filename.replace(['|', '\\', ':', '/'], "")
 }
 
 fn main() {

examples/monitor_record.rs

@@ -1,47 +1,30 @@
-use fs_extra::dir;
-use std::{
-    thread,
-    time::{Duration, Instant},
-};
+use std::{sync::Arc, thread, time::Duration};
 use xcap::Monitor;
 
 fn main() {
-    let monitors = Monitor::all().unwrap();
+    let monitor = Monitor::from_point(100, 100).unwrap();
 
-    dir::create_all("target/monitors", true).unwrap();
+    let video_recorder = Arc::new(monitor.video_recorder().unwrap());
 
-    let monitor = monitors.get(0).unwrap().clone();
-
-    let mut i = 0;
-    let frame = 20;
-    let start = Instant::now();
-    let fps = 1000 / frame;
-
-    loop {
-        i += 1;
-        let time = Instant::now();
-        let image = monitor.capture_image().unwrap();
-        image
-            .save(format!("target/monitors/monitor-{}.png", i,))
+    let video_recorder_clone = video_recorder.clone();
+    thread::spawn(move || {
+        video_recorder_clone
+            .on_frame(|frame| {
+                println!("frame: {:?}", frame.width);
+                Ok(())
+            })
             .unwrap();
-        let sleep_time = fps * i - start.elapsed().as_millis() as i128;
-        println!(
-            "sleep_time: {:?} current_step_time: {:?}",
-            sleep_time,
-            time.elapsed()
-        );
-        if sleep_time > 0 {
-            thread::sleep(Duration::from_millis(sleep_time as u64));
-        }
-
-        if i >= 900 {
-            break;
-        }
-    }
-
-    println!("time {:?}", start.elapsed());
-    let actual_fps = 900 / start.elapsed().as_secs();
-    println!("actual fps: {}", actual_fps);
-
-    // ffmpeg -framerate {actual_fps} -i monitor-%d.png -c:v libx264 -pix_fmt yuv420p output.mp4
+    });
+
+    println!("start");
+    video_recorder.start().unwrap();
+    thread::sleep(Duration::from_secs(2));
+    println!("stop");
+    video_recorder.stop().unwrap();
+    thread::sleep(Duration::from_secs(2));
+    println!("start");
+    video_recorder.start().unwrap();
+    thread::sleep(Duration::from_secs(2));
+    println!("stop");
+    video_recorder.stop().unwrap();
 }

examples/window.rs

@@ -1,25 +1,22 @@
-use std::time::Instant;
+use std::thread;
 use xcap::Window;
 
 fn main() {
-    let start = Instant::now();
+    thread::sleep(std::time::Duration::from_secs(3));
+
     let windows = Window::all().unwrap();
-    println!("Window::all() 运行耗时: {:?}", start.elapsed());
 
-    loop {
-        for window in windows.clone() {
-            println!(
-                "Window:\n id: {}\n title: {}\n app_name: {}\n monitor: {:?}\n position: {:?}\n size {:?}\n state {:?}\n",
-                window.id(),
-                window.title(),
-                window.app_name(),
+    for window in windows.clone() {
+        println!(
+            "Window:\n id: {}\n title: {}\n app_name: {}\n pid: {}\n monitor: {:?}\n position: {:?}\n size {:?}\n state {:?}\n",
+            window.id(),
+            window.title(),
+            window.app_name(),
+            window.pid(),
             window.current_monitor().name(),
-            (window.x(), window.y()),
+            (window.x(), window.y(), window.z()),
             (window.width(), window.height()),
             (window.is_minimized(), window.is_maximized(), window.is_focused())
         );
-        }
-
-        std::thread::sleep(std::time::Duration::from_secs(1));
     }
 }

examples/window_capture.rs

@@ -3,11 +3,7 @@ use std::time::Instant;
 use xcap::Window;
 
 fn normalized(filename: &str) -> String {
-    filename
-        .replace('|', "")
-        .replace('\\', "")
-        .replace(':', "")
-        .replace('/', "")
+    filename.replace(['|', '\\', ':', '/'], "")
 }
 
 fn main() {

src/error.rs

@@ -32,15 +32,15 @@ pub enum XCapError {
     StdTimeSystemTimeError(#[from] std::time::SystemTimeError),
 
     #[cfg(target_os = "macos")]
-    #[error("CoreGraphicsDisplayCGError {0}")]
-    CoreGraphicsDisplayCGError(core_graphics::display::CGError),
+    #[error("Objc2CoreGraphicsCGError {:?}", 0)]
+    Objc2CoreGraphicsCGError(objc2_core_graphics::CGError),
 
     #[cfg(target_os = "windows")]
     #[error(transparent)]
     WindowsCoreError(#[from] windows::core::Error),
     #[cfg(target_os = "windows")]
     #[error(transparent)]
-    StdStringFromUtf16Error(#[from] std::string::FromUtf16Error),
+    Utf16Error(#[from] widestring::error::Utf16Error),
 }
 
 impl XCapError {
@@ -49,12 +49,12 @@ impl XCapError {
     }
 }
 
-#[cfg(target_os = "macos")]
-impl From<core_graphics::display::CGError> for XCapError {
-    fn from(value: core_graphics::display::CGError) -> Self {
-        XCapError::CoreGraphicsDisplayCGError(value)
-    }
-}
+// #[cfg(target_os = "macos")]
+// impl From<core_graphics::display::CGError> for XCapError {
+//     fn from(value: core_graphics::display::CGError) -> Self {
+//         XCapError::CoreGraphicsDisplayCGError(value)
+//     }
+// }
 
 pub type XCapResult<T> = Result<T, XCapError>;