Merge pull request #25 from crowecawcaw/claude/update-xa11y-library-1zTfU

Update to xa11y 0.7: native screenshot, click, keyboard support

Author: crowecawcaw

Cargo.lock

@@ -12,11 +12,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 dirs = "6"
 anyhow = "1"
-xa11y = "0.6"
-
-# macOS platform helpers (screenshots, window bounds) — NOT for accessibility
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.10.1"
+xa11y = "0.7"
 
 [features]
 e2e = []

Cargo.toml

@@ -1,23 +1,37 @@
 use anyhow::{Context, Result};
-
-use crate::platform;
+use xa11y::{App, AppExt, Role};
 
 pub fn run_screenshot(output_path: &str, scale: f64, app: Option<&str>, pid: Option<u32>) -> Result<()> {
-    if app.is_some() || pid.is_some() {
-        platform::take_screenshot_window(output_path, app, pid)?;
+    let shot = if app.is_some() || pid.is_some() {
+        let xa_app = match (pid, app) {
+            (Some(p), _) => App::by_pid(p).map_err(|e| anyhow::anyhow!("{}", e))?,
+            (None, Some(name)) => App::by_name(name).map_err(|e| anyhow::anyhow!("{}", e))?,
+            _ => unreachable!(),
+        };
+        let window = xa_app
+            .children()
+            .map_err(|e| anyhow::anyhow!("{}", e))?
+            .into_iter()
+            .find(|e| matches!(e.data().role, Role::Window))
+            .ok_or_else(|| anyhow::anyhow!("No window found for the specified app"))?;
+        xa11y::screenshot_element(&window)
+            .map_err(|e| anyhow::anyhow!("Screenshot failed: {}", e))?
     } else {
-        platform::take_screenshot(output_path)?;
-    }
+        xa11y::screenshot().map_err(|e| anyhow::anyhow!("Screenshot failed: {}", e))?
+    };
 
     if (scale - 1.0).abs() > 1e-9 {
-        let img = image::open(output_path).context("Failed to open captured screenshot")?;
-        let (w, h) = (img.width(), img.height());
-        let new_w = (w as f64 * scale) as u32;
-        let new_h = (h as f64 * scale) as u32;
-        let resized = img.resize_exact(new_w, new_h, image::imageops::FilterType::Lanczos3);
-        resized
+        let rgba = image::RgbaImage::from_raw(shot.width, shot.height, shot.pixels)
+            .ok_or_else(|| anyhow::anyhow!("Invalid screenshot pixel data"))?;
+        let new_w = ((shot.width as f64) * scale) as u32;
+        let new_h = ((shot.height as f64) * scale) as u32;
+        image::DynamicImage::ImageRgba8(rgba)
+            .resize_exact(new_w, new_h, image::imageops::FilterType::Lanczos3)
             .save(output_path)
             .context("Failed to save scaled screenshot")?;
+    } else {
+        shot.save_png(output_path)
+            .map_err(|e| anyhow::anyhow!("Failed to save screenshot: {}", e))?;
     }
 
     println!("Screenshot saved to {}", output_path);

src/commands/screenshot.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 
 use crate::platform;
 use crate::state::AppState;
@@ -10,7 +10,6 @@ pub fn run_scroll(
     direction: &str,
     amount: Option<u32>,
 ) -> Result<()> {
-    // Validate direction
     match direction {
         "up" | "down" | "left" | "right" => {}
         _ => anyhow::bail!(
@@ -19,21 +18,17 @@ pub fn run_scroll(
         ),
     }
 
-    // If element specified, move mouse to its center
-    if let Some(eid) = element_id {
+    // Resolve element center to use as the scroll target point.
+    let at = if let Some(eid) = element_id {
         let state = AppState::load()?;
         let elem = state.get_element(eid)?;
-        if let Some(ref bounds) = elem.bounds {
-            let (x, y) = bounds.center();
-            platform::move_mouse(x, y).context(format!(
-                "Failed to move mouse to element {} at ({}, {})",
-                eid, x, y
-            ))?;
-        }
-    }
+        elem.bounds.as_ref().map(|b| b.center())
+    } else {
+        None
+    };
 
     let scroll_amount = amount.unwrap_or(DEFAULT_SCROLL_AMOUNT);
-    platform::scroll(direction, scroll_amount)?;
+    platform::scroll(direction, scroll_amount, at)?;
 
     if let Some(eid) = element_id {
         println!("Scrolled {} {} clicks in element {}", direction, scroll_amount, eid);

src/commands/scroll.rs

@@ -430,7 +430,7 @@ fn map_xa11y_error(e: xa11y::Error) -> anyhow::Error {
 }
 
 /// Detect screen resolution using platform-specific tools.
-fn get_screen_size() -> (u32, u32) {
+pub fn get_screen_size() -> (u32, u32) {
     #[cfg(target_os = "linux")]
     {
         if let Some(size) = get_screen_size_linux() {