Breadway/breadbox
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Adopt bread_utils::screenshot_cli for --screenshot flags
All checks were successful
check / check (push) Successful in 19s
Details
dev release / build (push) Successful in 53s
Details

Browse source 
Replace the local settle delay, canvas defaults, and pair-validation
error path with bread-utils v0.7.2. Clap parsing stays in-tree.
This commit is contained in:
Breadway 2026-08-16 00:26:06 +08:00
parent 4d0c0288b7
commit c359fd74be
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
breadbox/src/screenshot.rs
View file

@ -9,15 +9,10 @@
//! capture is the whole known-size canvas, not a hand-tracked panel //! capture is the whole known-size canvas, not a hand-tracked panel
//! geometry. //! geometry.
use bread_utils::screenshot_cli::{validate_pair, DEFAULT_HEIGHT, DEFAULT_WIDTH, SETTLE_DELAY};
use clap::Parser; use clap::Parser;
use gtk4::prelude::*; use gtk4::prelude::*;
use std::path::PathBuf; use std::path::PathBuf;
use std::time::Duration;
/// Extra settle time after `map` for the first frame to actually paint
/// before grim runs — `map` fires once the surface exists, not once
/// anything has been drawn into it.
const SETTLE_DELAY: Duration = Duration::from_millis(300);
#[derive(Parser)] #[derive(Parser)]
#[command(name = "breadbox")] #[command(name = "breadbox")]
@ -33,11 +28,11 @@ pub struct Cli {
/// Capture canvas width — matches the isolated compositor's output width /// Capture canvas width — matches the isolated compositor's output width
/// (`bread-capture --isolate-width`). /// (`bread-capture --isolate-width`).
#[arg(long, default_value_t = 1920)] #[arg(long, default_value_t = DEFAULT_WIDTH)]
pub width: u32, pub width: u32,
/// Capture canvas height — see `width`. /// Capture canvas height — see `width`.
#[arg(long, default_value_t = 1080)] #[arg(long, default_value_t = DEFAULT_HEIGHT)]
pub height: u32, pub height: u32,
} }
@ -50,16 +45,20 @@ pub struct ScreenshotRequest {
} }
impl Cli { impl Cli {
/// `None` for a normal run. Exits the process with an error if /// `None` for a normal run. Exits the process with an error if the
/// `--screenshot` was given without `--output`, before any GTK setup /// `--screenshot` / `--output` pair is incomplete, before any GTK setup
/// happens. /// happens.
pub fn screenshot_request(&self) -> Option<ScreenshotRequest> { pub fn screenshot_request(&self) -> Option<ScreenshotRequest> {
let view = self.screenshot.clone()?; if let Err(e) = validate_pair(self.screenshot.as_deref(), self.output.as_deref()) {
let Some(output) = self.output.clone() else { eprintln!("breadbox: {e}");
eprintln!("breadbox: --screenshot requires --output");
std::process::exit(1); std::process::exit(1);
}; }
Some(ScreenshotRequest { view, output, width: self.width, height: self.height }) Some(ScreenshotRequest {
view: self.screenshot.clone()?,
output: self.output.clone()?,
width: self.width,
height: self.height,
})
} }
} }