mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-01 05:47:31 -06:00
25c0ec78d5
Flatten Image, Merge Visible and Merge Down now composite a CMYK stack of plain Normal raster layers in its ink values, so a lone Background flattens bit-exact and 16-bit depth is kept. Stacks that still need the RGB compositor separate back through the document's own CMYK profile instead of the built-in one, and Merge Down's scratch document keeps the profile. Fixes #3778 Co-authored-by: Fabio Lussi <198260595+itrycodinganditsbad@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1446 lines
70 KiB
Rust
1446 lines
70 KiB
Rust
//! The command registry. Ids follow Photoshop's menu structure (see the parity checklist).
|
||
|
||
use photocraft_color::{BlendMode, Color, ColorMode, SampleType};
|
||
use photocraft_doc::{Adjustment, Document, Fill, Layer, LayerContent, LayerId, LayerMask, Size};
|
||
use photocraft_geom::Rect;
|
||
use photocraft_raster::Surface;
|
||
use serde_json::{Value, json};
|
||
|
||
use crate::{EngineError, Result, Session, inspect, pixels};
|
||
|
||
type Run = fn(&mut Session, &Value) -> Result<Value>;
|
||
type Enabled = fn(&Session) -> std::result::Result<(), String>;
|
||
|
||
/// Metadata + implementation for one command.
|
||
pub struct CommandSpec {
|
||
pub id: &'static str,
|
||
pub label: &'static str,
|
||
/// Menu placement, e.g. `["Layer", "New"]`. Empty = not in menus.
|
||
pub menu: &'static [&'static str],
|
||
/// Default shortcut in egui-style notation (`Cmd+Shift+N`), mapped per platform by the UI.
|
||
pub shortcut: Option<&'static str>,
|
||
/// Human/agent-readable parameter description (JSON-ish).
|
||
pub params: &'static str,
|
||
pub enabled: Enabled,
|
||
pub run: Run,
|
||
/// Record in the session journal (false for queries).
|
||
pub journal: bool,
|
||
}
|
||
|
||
pub(crate) fn always(_: &Session) -> std::result::Result<(), String> {
|
||
Ok(())
|
||
}
|
||
fn has_doc(s: &Session) -> std::result::Result<(), String> {
|
||
s.active().map(|_| ()).ok_or_else(|| "no document open".into())
|
||
}
|
||
fn has_layer(s: &Session) -> std::result::Result<(), String> {
|
||
let d = s.active().ok_or("no document open")?;
|
||
d.active_layer.filter(|id| d.doc.layer(*id).is_some()).map(|_| ()).ok_or_else(|| "no active layer".into())
|
||
}
|
||
fn has_pixel_layer(s: &Session) -> std::result::Result<(), String> {
|
||
let l = crate::active_layer_of(s)?;
|
||
if matches!(l.content, LayerContent::Raster(_)) {
|
||
Ok(())
|
||
} else {
|
||
Err(format!("active layer is {} {} layer, not a pixel layer", l.content.article(), l.content.kind_name()))
|
||
}
|
||
}
|
||
/// A pixel layer, or a targeted alpha channel / Quick Mask (adjustments and fills apply to it).
|
||
fn has_pixel_or_channel(s: &Session) -> std::result::Result<(), String> {
|
||
if crate::channel_cmds::edits_channel(s) {
|
||
return Ok(());
|
||
}
|
||
has_pixel_layer(s)
|
||
}
|
||
/// A layer that can be painted: pixels, or any layer with a mask (paint with `"target":"mask"`).
|
||
pub(crate) fn has_paintable(s: &Session) -> std::result::Result<(), String> {
|
||
if crate::channel_cmds::edits_channel(s) {
|
||
return Ok(());
|
||
}
|
||
let l = crate::active_layer_of(s)?;
|
||
if matches!(l.content, LayerContent::Raster(_)) || l.mask.is_some() {
|
||
Ok(())
|
||
} else {
|
||
Err(format!("active layer is {} {} layer without a mask", l.content.article(), l.content.kind_name()))
|
||
}
|
||
}
|
||
|
||
/// Surface a paint command writes to: the layer's pixels, or its mask with `"target":"mask"`.
|
||
pub(crate) fn paint_surface<'a>(doc: &'a mut Document, id: LayerId, p: &Value) -> Result<&'a mut photocraft_raster::Surface> {
|
||
if is_mask_target(p) {
|
||
check_all_unlocked(doc, id)?;
|
||
} else {
|
||
check_pixels_unlocked(doc, id)?;
|
||
}
|
||
let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?;
|
||
if is_mask_target(p) {
|
||
l.mask.as_mut().map(|m| &mut m.surface).ok_or_else(|| EngineError::Other("layer has no mask".into()))
|
||
} else {
|
||
l.surface_mut().ok_or_else(|| EngineError::Other("not a pixel layer".into()))
|
||
}
|
||
}
|
||
|
||
fn check_all_unlocked(doc: &Document, id: LayerId) -> Result<()> {
|
||
let locks = doc.effective_locks(id);
|
||
let l = doc.layer(id).ok_or(EngineError::NoLayer(id))?;
|
||
if locks.all {
|
||
return Err(EngineError::Other(format!("Could not complete your request because the layer \"{}\" is locked", l.name)));
|
||
}
|
||
Ok(())
|
||
}
|
||
|
||
/// Refuse a layer whose pixels are locked (directly or through a group), with Photoshop's message.
|
||
pub(crate) fn check_pixels_unlocked(doc: &Document, id: LayerId) -> Result<()> {
|
||
let locks = doc.effective_locks(id);
|
||
let l = doc.layer(id).ok_or(EngineError::NoLayer(id))?;
|
||
if locks.pixels || locks.all {
|
||
return Err(EngineError::Other(format!("Could not complete your request because the layer \"{}\" is locked", l.name)));
|
||
}
|
||
Ok(())
|
||
}
|
||
|
||
pub(crate) fn is_mask_target(p: &Value) -> bool {
|
||
p.get("target").and_then(Value::as_str) == Some("mask")
|
||
}
|
||
|
||
fn can_undo(s: &Session) -> std::result::Result<(), String> {
|
||
s.active().filter(|d| d.history.can_undo()).map(|_| ()).ok_or_else(|| "nothing to undo".into())
|
||
}
|
||
fn can_redo(s: &Session) -> std::result::Result<(), String> {
|
||
s.active().filter(|d| d.history.can_redo()).map(|_| ()).ok_or_else(|| "nothing to redo".into())
|
||
}
|
||
fn has_selection(s: &Session) -> std::result::Result<(), String> {
|
||
s.active().filter(|d| d.doc.selection.is_some()).map(|_| ()).ok_or_else(|| "no selection".into())
|
||
}
|
||
|
||
/// Image › Image Rotation by a right angle or a flip (pixels, vectors, guides, … all move).
|
||
fn turn(s: &mut Session, label: &str, t: crate::canvas_geom::Turn) -> Result<Value> {
|
||
if let Some(d) = s.active() {
|
||
let a = t.affine(f64::from(d.doc.size.width), f64::from(d.doc.size.height));
|
||
s.set_sampler_map(a);
|
||
}
|
||
s.edit(label, |doc, _| {
|
||
crate::canvas_geom::turn_canvas(doc, t);
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}
|
||
|
||
macro_rules! cmd {
|
||
($id:literal, $label:literal, [$($m:literal),*], $sc:expr, $params:literal, $en:expr, $run:expr) => {
|
||
CommandSpec { id: $id, label: $label, menu: &[$($m),*], shortcut: $sc, params: $params, enabled: $en, run: $run, journal: true }
|
||
};
|
||
}
|
||
|
||
pub fn command_specs() -> &'static [CommandSpec] {
|
||
®istry().specs
|
||
}
|
||
|
||
/// One `command.list` / `engine.commands` row for `c`, given why it can't run now (`None` = it can).
|
||
/// `disabledReason` is that message; `needsDocument` is true when the reason is that no document is
|
||
/// open (#3664), so an agent can tell "open or create a document first" from a precondition that a
|
||
/// document alone won't meet (a selection, an empty clipboard).
|
||
pub fn list_entry(s: &Session, c: &CommandSpec, reason: Option<String>) -> Value {
|
||
let needs_document =
|
||
s.active().is_none() && reason.as_deref().is_some_and(|r| ["no document", "no active document", "no open document"].iter().any(|p| r.starts_with(p)));
|
||
json!({
|
||
"id": c.id, "label": c.label, "menu": c.menu, "shortcut": c.shortcut, "params": c.params,
|
||
"enabled": reason.is_none(), "disabledReason": reason, "needsDocument": needs_document,
|
||
})
|
||
}
|
||
|
||
pub fn find(id: &str) -> Option<&'static CommandSpec> {
|
||
let registry = registry();
|
||
registry.by_id.get(id).and_then(|&index| registry.specs.get(index))
|
||
}
|
||
|
||
struct Registry {
|
||
specs: Vec<CommandSpec>,
|
||
by_id: std::collections::HashMap<&'static str, usize>,
|
||
}
|
||
|
||
impl Registry {
|
||
fn new(specs: Vec<CommandSpec>) -> Self {
|
||
let mut by_id = std::collections::HashMap::with_capacity(specs.len());
|
||
for (index, spec) in specs.iter().enumerate() {
|
||
// Preserve the linear lookup's first-match behavior if an id is duplicated.
|
||
by_id.entry(spec.id).or_insert(index);
|
||
}
|
||
Self { specs, by_id }
|
||
}
|
||
}
|
||
|
||
fn registry() -> &'static Registry {
|
||
static REGISTRY: std::sync::OnceLock<Registry> = std::sync::OnceLock::new();
|
||
REGISTRY.get_or_init(|| Registry::new(build()))
|
||
}
|
||
|
||
// ---------- param helpers ----------
|
||
|
||
fn bad(cmd: &str, msg: impl Into<String>) -> EngineError {
|
||
EngineError::BadParams { cmd: cmd.into(), msg: msg.into() }
|
||
}
|
||
/// Integer parameter that also accepts JSON floats (UIs send `12.0`); rounds.
|
||
pub(crate) fn int(p: &Value, key: &str) -> Option<i64> {
|
||
p.get(key).and_then(|v| v.as_i64().or_else(|| v.as_f64().filter(|f| f.is_finite()).map(|f| f.round() as i64)))
|
||
}
|
||
|
||
/// [`int`] narrowed to `i32` for geometry: `None` when absent, and a bad-params error when the
|
||
/// value would wrap through `as i32` — out-of-range integers truncate by multiples of 2^32,
|
||
/// which silently relocates geometry (`dx = 2^32 + 50` moves 50 px, `3e9` goes negative)
|
||
/// instead of erroring.
|
||
pub(crate) fn int_i32(cmd: &str, p: &Value, key: &str) -> Result<Option<i32>> {
|
||
match int(p, key) {
|
||
None => Ok(None),
|
||
Some(v) => i32::try_from(v).map(Some).map_err(|_| bad(cmd, format!("`{key}` = {v} is outside the 32-bit coordinate range"))),
|
||
}
|
||
}
|
||
|
||
/// An id (layer comp, slice, style…) from a JSON value: a bad-params error unless it is a whole
|
||
/// number in `u32` range. `as u32` would wrap `2^32 + 1` to `1` and target a real item.
|
||
pub(crate) fn u32_id(cmd: &str, key: &str, v: &Value) -> Result<u32> {
|
||
v.as_u64().and_then(|n| u32::try_from(n).ok()).ok_or_else(|| bad(cmd, format!("`{key}` = {v} is not a valid id (0..={})", u32::MAX)))
|
||
}
|
||
|
||
/// [`u32_id`] of `p[key]`: `None` when absent.
|
||
pub(crate) fn u32_id_param(cmd: &str, p: &Value, key: &str) -> Result<Option<u32>> {
|
||
p.get(key).map(|v| u32_id(cmd, key, v)).transpose()
|
||
}
|
||
|
||
fn f32_or(p: &Value, key: &str, default: f32) -> f32 {
|
||
p.get(key).and_then(Value::as_f64).map(|v| v as f32).unwrap_or(default)
|
||
}
|
||
pub(crate) fn color_param(p: &Value, key: &str, default: [f32; 4]) -> [f32; 4] {
|
||
match p.get(key) {
|
||
Some(Value::Array(a)) if a.len() >= 3 => {
|
||
let v: Vec<f32> = a.iter().map(|x| x.as_f64().unwrap_or(0.0) as f32).collect();
|
||
[v[0], v[1], v[2], v.get(3).copied().unwrap_or(1.0)]
|
||
}
|
||
Some(Value::String(s)) => parse_hex(s).unwrap_or(default),
|
||
_ => default,
|
||
}
|
||
}
|
||
pub(crate) fn parse_hex(s: &str) -> Option<[f32; 4]> {
|
||
let s = s.trim_start_matches('#');
|
||
let b = |i: usize| u8::from_str_radix(s.get(i..i + 2)?, 16).ok().map(|v| v as f32 / 255.0);
|
||
match s.len() {
|
||
6 => Some([b(0)?, b(2)?, b(4)?, 1.0]),
|
||
8 => Some([b(0)?, b(2)?, b(4)?, b(6)?]),
|
||
_ => None,
|
||
}
|
||
}
|
||
/// Layer › Create / Release Clipping Mask. With a `layer` param, just that layer. Otherwise, as in
|
||
/// Photoshop, the selection (#1248): Create clips every selected layer except the lowest, which
|
||
/// becomes the base; Release releases every selected layer. One history step either way.
|
||
fn set_clipped(s: &mut Session, p: &Value, clip: bool) -> Result<Value> {
|
||
let label = if clip { "Create Clipping Mask" } else { "Release Clipping Mask" };
|
||
let ids: Vec<LayerId> = if p.get("layer").is_some() {
|
||
vec![layer_param(s, p)?]
|
||
} else {
|
||
let selected = s.active().ok_or(EngineError::NoDocument)?.selected_layers();
|
||
match (clip, selected.as_slice()) {
|
||
(_, []) => vec![layer_param(s, p)?],
|
||
(_, [one]) => vec![*one],
|
||
(true, [_base, rest @ ..]) => rest.to_vec(),
|
||
(false, all) => all.to_vec(),
|
||
}
|
||
};
|
||
s.edit(label, |doc, _| {
|
||
for id in &ids {
|
||
doc.layer_mut(*id).ok_or(EngineError::NoLayer(*id))?.clipped = clip;
|
||
}
|
||
Ok(())
|
||
})?;
|
||
Ok(json!({"layers": ids.iter().map(|id| id.0).collect::<Vec<_>>()}))
|
||
}
|
||
|
||
pub(crate) fn layer_param(s: &Session, p: &Value) -> Result<LayerId> {
|
||
match p.get("layer").and_then(Value::as_u64) {
|
||
Some(id) => Ok(LayerId(id)),
|
||
None => s.active().and_then(|d| d.active_layer).ok_or(EngineError::Other("no active layer".into())),
|
||
}
|
||
}
|
||
pub fn blend_from_str(s: &str) -> Option<BlendMode> {
|
||
let norm = |x: &str| x.to_ascii_lowercase().replace([' ', '_', '-', '(', ')'], "");
|
||
let want = norm(s);
|
||
std::iter::once(BlendMode::PassThrough).chain(BlendMode::layer_modes()).find(|m| norm(m.label()) == want || norm(&format!("{m:?}")) == want)
|
||
}
|
||
|
||
/// The active selection as the mask of a layer being created, or None without a selection.
|
||
/// Photoshop masks a new adjustment or fill layer with the selection, so the adjustment acts on
|
||
/// the selected area only (#1250); the selection itself stays, as Reveal Selection leaves it.
|
||
pub(crate) fn selection_mask(doc: &Document) -> Result<Option<LayerMask>> {
|
||
doc.selection.as_ref().map(|sel| mask_at_depth(LayerMask { surface: sel.clone(), ..LayerMask::reveal_all() }, doc.depth)).transpose()
|
||
}
|
||
|
||
/// New pixel masks use the document's depth, as PSD saves/imports do. Otherwise a later soft
|
||
/// brush stroke quantizes differently depending on whether the document reopened as PSD or
|
||
/// native. Converting a selection keeps its coverage and does not alter the selection itself.
|
||
fn mask_at_depth(mut mask: LayerMask, depth: SampleType) -> Result<LayerMask> {
|
||
let format = mask.surface.format().with_sample(depth);
|
||
if mask.surface.format() != format {
|
||
mask.surface = mask.surface.try_convert(format)?;
|
||
}
|
||
Ok(mask)
|
||
}
|
||
|
||
/// Mask a fill or adjustment layer being created, as Photoshop does: the path selected in the
|
||
/// Paths panel (`"path"`: `"work"`, a saved path's name or a path object) becomes its vector
|
||
/// mask, which makes a Solid Color fill a shape (#1419); without one, the selection becomes its
|
||
/// layer mask ([`selection_mask`]); without either, a white mask reveals the whole layer (#1768).
|
||
/// A path that isn't there is an error.
|
||
pub(crate) fn mask_new_layer(doc: &Document, l: &mut Layer, p: &Value, cmd: &str) -> Result<()> {
|
||
let path = match p.get("path") {
|
||
None | Some(Value::Null) => None,
|
||
Some(Value::String(n)) if crate::vector_cmds::is_work(Some(n)) => Some(doc.work_path.clone().ok_or_else(|| bad(cmd, "no work path"))?),
|
||
Some(Value::String(n)) => {
|
||
Some(doc.paths.iter().find(|sp| sp.name == *n).map(|sp| sp.path.clone()).ok_or_else(|| bad(cmd, format!("no path named \"{n}\"")))?)
|
||
}
|
||
Some(v) => Some(crate::vector_cmds::parse_path(v).map_err(|e| bad(cmd, e))?),
|
||
};
|
||
match path {
|
||
Some(path) => l.vector_mask = Some(photocraft_doc::VectorMask::new(path)),
|
||
None => l.mask = Some(mask_at_depth(selection_mask(doc)?.unwrap_or_else(LayerMask::reveal_all), doc.depth)?),
|
||
}
|
||
Ok(())
|
||
}
|
||
|
||
/// The `"path"` param of the new fill and adjustment layer commands ([`mask_new_layer`]).
|
||
pub(crate) const NEW_LAYER_PATH: &str =
|
||
r##""path":"work"|saved path name|{…path}? (the active path: becomes the vector mask; else the selection is the layer mask, or white with no selection)"##;
|
||
|
||
fn new_adjustment(s: &mut Session, adj: Adjustment, p: &Value, cmd: &str) -> Result<Value> {
|
||
let label = format!("New {} Layer", adj.label());
|
||
let name = adj.label().to_string();
|
||
let id = s.edit(&label, |doc, active| {
|
||
let mut l = Layer::new(doc.next_layer_name(&name), LayerContent::Adjustment(adj));
|
||
mask_new_layer(doc, &mut l, p, cmd)?;
|
||
let id = doc.insert_above(*active, l);
|
||
*active = Some(id);
|
||
Ok(id)
|
||
})?;
|
||
Ok(json!({ "layer": id.0 }))
|
||
}
|
||
|
||
fn destructive_adjust(s: &mut Session, label: &str, adj: Adjustment, p: &Value) -> Result<Value> {
|
||
if is_mask_target(p) {
|
||
// The targeted layer mask (#780): ⌘I inverts it, as in Photoshop.
|
||
let id = layer_param(s, &Value::Null)?;
|
||
return s.edit(label, |doc, _| {
|
||
let sel = doc.selection.clone();
|
||
let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?;
|
||
let mask = l.mask.as_mut().ok_or_else(|| EngineError::Other("layer has no mask".into()))?;
|
||
pixels::adjust_mask(&mut mask.surface, &adj, sel.as_ref());
|
||
Ok(Value::Null)
|
||
});
|
||
}
|
||
if crate::channel_cmds::is_channel_target(p) {
|
||
// Alpha channel / Quick Mask target: the adjustment runs on the grayscale channel.
|
||
return s.edit(label, |doc, _| {
|
||
let sel = doc.selection.clone();
|
||
if let Some(surf) = crate::channel_cmds::channel_surface_for_filter(doc, None, p)? {
|
||
pixels::adjust_surface(surf, &adj, sel.as_ref(), ColorMode::Grayscale);
|
||
surf.prune();
|
||
}
|
||
Ok(Value::Null)
|
||
});
|
||
}
|
||
let id = layer_param(s, &Value::Null)?;
|
||
s.edit(label, |doc, _| {
|
||
let sel = doc.selection.clone();
|
||
let mode = doc.mode;
|
||
let surf = paint_surface(doc, id, &Value::Null)?;
|
||
pixels::adjust_surface(surf, &adj, sel.as_ref(), mode);
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}
|
||
|
||
/// Lenient adjustment from params for previews: bad params fall back to the kind's defaults.
|
||
/// Commands use the checked [`crate::adjust_params::from_params`].
|
||
pub fn adjustment_from_params(kind: &str, p: &Value) -> Adjustment {
|
||
crate::adjust_params::from_params(kind, p, None, ColorMode::Rgb)
|
||
.or_else(|_| crate::adjust_params::default_for(kind, ColorMode::Rgb))
|
||
.unwrap_or(Adjustment::Invert)
|
||
}
|
||
|
||
fn doc_mode(s: &Session) -> ColorMode {
|
||
s.active().map_or(ColorMode::Rgb, |d| d.doc.mode)
|
||
}
|
||
|
||
// ---------- the table ----------
|
||
|
||
#[allow(clippy::too_many_lines)]
|
||
fn build() -> Vec<CommandSpec> {
|
||
let mut v = vec![
|
||
// File
|
||
cmd!(
|
||
"file.new",
|
||
"New…",
|
||
["File"],
|
||
Some("Cmd+N"),
|
||
r##"{"width":1..300000=1920,"height":1..300000=1080 (pixel counts are rounded),"mode":"rgb|gray|grayscale|cmyk|lab"="rgb","depth":8|16|32=8,"background":"white|black|backgroundColor|transparent|#rrggbb"="white","backgroundColor":[r,g,b]? (0..1; defaults to toolbox colour),"resolution":1..30000=72 (ppi),"name":str}"##,
|
||
always,
|
||
|s, p| {
|
||
use crate::document_preset_cmds::{MAX_DIMENSION, MAX_RESOLUTION, background_color, color_mode, sample_type};
|
||
crate::document_preset_cmds::validate_new_params(s, p)?;
|
||
// A size given as a float (`512.0`, as JSON from a UI field) is still that size (#254).
|
||
let px = |k: &str, d: u32| match p.get(k) {
|
||
Some(v) => v
|
||
.as_u64()
|
||
.map(|n| n.clamp(1, MAX_DIMENSION as u64) as u32)
|
||
.or_else(|| v.as_f64().filter(|f| f.is_finite()).map(|f| f.round().clamp(1.0, MAX_DIMENSION as f64) as u32))
|
||
.unwrap_or(d),
|
||
None => d,
|
||
};
|
||
let (w, h) = (px("width", 1920), px("height", 1080));
|
||
let mode = color_mode(p.get("mode").and_then(Value::as_str).unwrap_or("rgb")).unwrap_or(ColorMode::Rgb);
|
||
let depth = sample_type(p.get("depth").and_then(Value::as_u64).unwrap_or(8)).unwrap_or(SampleType::U8);
|
||
let name = p.get("name").and_then(Value::as_str).unwrap_or("Untitled").to_string();
|
||
let res = p.get("resolution").and_then(Value::as_f64).unwrap_or(72.0).clamp(1.0, MAX_RESOLUTION) as f32;
|
||
let mut doc = match p.get("background").and_then(Value::as_str).unwrap_or("white") {
|
||
"backgroundColor" => {
|
||
let bgc = background_color(p, s.tools.background, "file.new")?;
|
||
Document::with_background(name, Size::new(w, h), mode, depth, Color::rgba(bgc[0], bgc[1], bgc[2], 1.0))
|
||
}
|
||
"transparent" => {
|
||
let mut d = Document::new(name, Size::new(w, h), mode, depth);
|
||
d.layers.push(Layer::raster("Layer 1", d.pixel_format()));
|
||
d
|
||
}
|
||
"black" => Document::with_background(name, Size::new(w, h), mode, depth, Color::BLACK),
|
||
other => {
|
||
let c = parse_hex(other).unwrap_or([1.0; 4]);
|
||
Document::with_background(name, Size::new(w, h), mode, depth, Color::rgba(c[0], c[1], c[2], c[3]))
|
||
}
|
||
};
|
||
doc.resolution_dpi = res;
|
||
let i = s.add_document(doc, None);
|
||
Ok(json!({ "document": i }))
|
||
}
|
||
),
|
||
cmd!("file.close", "Close", ["File"], Some("Cmd+W"), r##"{"document":index?}"##, has_doc, |s, p| {
|
||
let i = p.get("document").and_then(Value::as_u64).map(|v| v as usize).or(s.active_index()).ok_or(EngineError::NoDocument)?;
|
||
s.close(i).ok_or(EngineError::NoDocument)?;
|
||
Ok(Value::Null)
|
||
}),
|
||
// Edit
|
||
cmd!("edit.undo", "Undo", ["Edit"], Some("Cmd+Z"), "{}", can_undo, |s, _| Ok(json!(s.undo()))),
|
||
cmd!("edit.redo", "Redo", ["Edit"], Some("Cmd+Shift+Z"), "{}", can_redo, |s, _| Ok(json!(s.redo()))),
|
||
cmd!(
|
||
"edit.fill",
|
||
"Fill…",
|
||
["Edit"],
|
||
Some("Shift+F5"),
|
||
r##"{"contents":"foreground|background|color|contentAware|pattern|history|black|gray|white"="color","color":"#rrggbb|[r,g,b,a]"=foreground (contents=color),"pattern":id|name (contents=pattern),"scale":%=100,"angle":deg,"state":index? (contents=history; default the oldest state),"colorAdaptation":bool=true (contents=contentAware),"mode":"normal|multiply|…"="normal","opacity":0..100=100,"preserveTransparency":bool=false,"target":"pixels"|"mask"|"quickMask"|{"channel":i}?}"##,
|
||
has_pixel_or_channel,
|
||
crate::fill_cmds::fill
|
||
),
|
||
cmd!("edit.clear", "Clear", ["Edit"], Some("Delete"), "{} (a targeted channel or Quick Mask is cleared alone)", has_pixel_or_channel, |s, p| {
|
||
let bg = s.tools.background;
|
||
// A targeted alpha channel or Quick Mask is filled instead (#2734).
|
||
if let Some(t) = crate::channel_cmds::targeted_channel(s) {
|
||
s.edit("Clear", |doc, _| crate::channel_cmds::clear_channel(doc, &t, bg))?;
|
||
return Ok(Value::Null);
|
||
}
|
||
let id = layer_param(s, p)?;
|
||
// A targeted colour channel clears that channel only (#2720).
|
||
if let Some(k) = crate::channel_cmds::targeted_color(s) {
|
||
s.edit("Clear", |doc, _| crate::channel_cmds::clear_color_channel(doc, id, k, bg))?;
|
||
return Ok(Value::Null);
|
||
}
|
||
s.edit("Clear", |doc, _| {
|
||
let sel = doc.selection.clone();
|
||
let area = sel.as_ref().map(|m| m.content_bounds()).unwrap_or(doc.bounds());
|
||
crate::edit_cmds::clear_area(doc, id, area, sel.as_ref(), bg)
|
||
})?;
|
||
Ok(Value::Null)
|
||
}),
|
||
// Select
|
||
cmd!("select.all", "All", ["Select"], Some("Cmd+A"), "{}", has_doc, |s, _| {
|
||
s.edit("Select All", |doc, _| {
|
||
let mut m = Surface::new(photocraft_color::PixelFormat::GRAY8);
|
||
m.fill_rect(doc.bounds(), &[1.0]);
|
||
doc.selection = Some(m);
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!("select.deselect", "Deselect", ["Select"], Some("Cmd+D"), "{}", has_selection, |s, _| {
|
||
s.edit("Deselect", |doc, _| {
|
||
doc.selection = None;
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!("select.inverse", "Inverse", ["Select"], Some("Cmd+Shift+I"), "{}", has_selection, |s, _| {
|
||
s.edit("Inverse", |doc, _| {
|
||
let old = doc.selection.take().unwrap_or_else(|| Surface::new(photocraft_color::PixelFormat::GRAY8));
|
||
let b = doc.bounds();
|
||
let data: Vec<f32> = old.read_region(b).into_iter().map(|v| 1.0 - v).collect();
|
||
let mut m = Surface::new(photocraft_color::PixelFormat::GRAY8);
|
||
m.write_region(b, &data);
|
||
m.prune();
|
||
doc.selection = Some(m);
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!(
|
||
"select.rect",
|
||
"Rectangular Selection",
|
||
[],
|
||
None,
|
||
r##"{"x":i32,"y":i32,"width":u32,"height":u32,"mode":"replace|add|subtract|intersect"="replace","ellipse":bool=false,"line":"row|column"?,"antiAlias":bool=true,"feather":px=0}"##,
|
||
has_doc,
|
||
|s, p| {
|
||
let get = |k: &str| int_i32("select.rect", p, k).and_then(|v| v.ok_or_else(|| bad("select.rect", format!("missing `{k}`"))));
|
||
let r = Rect::from_xywh(get("x")?, get("y")?, get("width")?.max(0) as u32, get("height")?.max(0) as u32);
|
||
let mode = p.get("mode").and_then(Value::as_str).unwrap_or("replace").to_string();
|
||
let ellipse = p.get("ellipse").and_then(Value::as_bool).unwrap_or(false);
|
||
// The History step is named after the tool: the Single Row / Single Column
|
||
// Marquee send `line` (Photoshop).
|
||
let step = match p.get("line").and_then(Value::as_str) {
|
||
Some("row") => "Single Row Marquee",
|
||
Some("column") => "Single Column Marquee",
|
||
Some(other) => return Err(bad("select.rect", format!("unknown `line` {other:?} (row|column)"))),
|
||
None if ellipse => "Elliptical Marquee",
|
||
None => "Rectangular Marquee",
|
||
};
|
||
// Options bar: anti-aliased ellipse edges (4x4 supersampled) and Feather (applied to the new shape only).
|
||
let aa = p.get("antiAlias").and_then(Value::as_bool).unwrap_or(true);
|
||
let feather = p.get("feather").and_then(Value::as_f64).unwrap_or(0.0).clamp(0.0, 1000.0) as f32;
|
||
s.edit(step, |doc, _| {
|
||
let area = doc.bounds();
|
||
// A marquee dragged past the canvas stops at its edge (Photoshop); the ellipse
|
||
// keeps the dragged shape and is only cut there.
|
||
use photocraft_algo::selection as sel;
|
||
let shape = if ellipse {
|
||
sel::ellipse_surface(r, area, aa)
|
||
} else {
|
||
let mut s = Surface::new(photocraft_color::PixelFormat::GRAY8);
|
||
s.fill_rect(r.intersect(&area), &[1.0]);
|
||
s
|
||
};
|
||
if feather > 0.0 {
|
||
let m = sel::feather(&sel::mask_from_surface(Some(&shape), area), area.width() as usize, area.height() as usize, feather);
|
||
doc.selection = sel::combine(doc.selection.as_ref(), &m, area, sel::SelectionMode::parse(&mode));
|
||
return Ok(());
|
||
}
|
||
let old = doc.selection.take();
|
||
let combined = match (mode.as_str(), old) {
|
||
("add", Some(o)) => sel::combine_surfaces(&o, &shape, area, |a, b| a.max(b)),
|
||
("subtract", Some(o)) => sel::combine_surfaces(&o, &shape, area, |a, b| a * (1.0 - b)),
|
||
("intersect", Some(o)) => sel::combine_surfaces(&o, &shape, area, |a, b| a.min(b)),
|
||
// With no existing selection, neither operation can select new pixels.
|
||
("subtract" | "intersect", None) => Surface::new(photocraft_color::PixelFormat::GRAY8),
|
||
_ => shape,
|
||
};
|
||
// Nothing selected on the canvas (e.g. dragged entirely outside it) deselects.
|
||
doc.selection = (!combined.content_bounds().is_empty()).then_some(combined);
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}
|
||
),
|
||
// Layer
|
||
cmd!(
|
||
"layer.new.layer",
|
||
"Layer…",
|
||
["Layer", "New"],
|
||
Some("Cmd+Shift+N"),
|
||
r##"{"name":str?,"clipToPrevious":bool=false (Use Previous Layer to Create Clipping Mask; inside a clip group the layer joins it anyway),"color":"none|red|orange|yellow|green|seafoam|blue|indigo|magenta|fuchsia|violet|gray"="none","mode":"Normal|Multiply|…"="Normal","opacity":0..1=1,"fillNeutral":bool=false (fill with the mode's neutral color: modes without one are an error)}"##,
|
||
has_doc,
|
||
crate::new_layer::run
|
||
),
|
||
cmd!("layer.new.group", "Group…", ["Layer", "New"], None, r##"{"name":str?}"##, has_doc, |s, p| {
|
||
let id = s.edit("New Group", |doc, active| {
|
||
let name = p.get("name").and_then(Value::as_str).map(str::to_string).unwrap_or_else(|| doc.next_layer_name("Group"));
|
||
let id = doc.insert_above(*active, Layer::group(name, vec![]));
|
||
*active = Some(id);
|
||
Ok(id)
|
||
})?;
|
||
crate::layer_multi_cmds::note_inert_insert(s, id);
|
||
Ok(json!({ "layer": id.0 }))
|
||
}),
|
||
cmd!(
|
||
"layer.groupLayers",
|
||
"Group Layers",
|
||
["Layer"],
|
||
Some("Cmd+G"),
|
||
r##"{"layer":id?,"name":str?} (no layer: every selected layer)"##,
|
||
has_layer,
|
||
crate::layer_multi_cmds::group_layers
|
||
),
|
||
cmd!(
|
||
"layer.duplicate",
|
||
"Duplicate Layer…",
|
||
["Layer"],
|
||
None,
|
||
r##"{"layer":id?,"inPlace":bool=false (artboards: keep the copy on the original instead of beside it),"name":str? (one layer: the copy's name)} (no layer: every selected layer)"##,
|
||
has_layer,
|
||
|s, p| {
|
||
let in_place = p.get("inPlace").and_then(Value::as_bool).unwrap_or(false);
|
||
let name = p.get("name").and_then(Value::as_str).filter(|n| !n.is_empty()).map(str::to_string);
|
||
if crate::layer_multi_cmds::multi(s, p) {
|
||
return crate::layer_multi_cmds::duplicate_selected(s, in_place, "Duplicate Layers");
|
||
}
|
||
let id = layer_param(s, p)?;
|
||
let before = s.active().ok_or(EngineError::NoDocument)?.doc.clone();
|
||
let nid = s.edit("Duplicate Layer", |doc, active| {
|
||
let mut dup = layer_copy(doc, id)?;
|
||
if let Some(name) = &name {
|
||
dup.name.clone_from(name);
|
||
}
|
||
let nid = doc.insert_above(Some(id), dup);
|
||
if !in_place {
|
||
crate::artboard_cmds::place_copy(doc, nid)?;
|
||
}
|
||
*active = Some(nid);
|
||
Ok(nid)
|
||
})?;
|
||
crate::layer_multi_cmds::note_insert(s, &before);
|
||
Ok(json!({ "layer": nid.0 }))
|
||
}
|
||
),
|
||
cmd!("layer.delete", "Delete Layer", ["Layer", "Delete"], None, r##"{"layer":id?} (no layer: every selected layer)"##, has_layer, |s, p| {
|
||
if crate::layer_multi_cmds::multi(s, p) {
|
||
return crate::layer_multi_cmds::delete_selected(s);
|
||
}
|
||
let id = layer_param(s, p)?;
|
||
s.edit("Delete Layer", |doc, active| {
|
||
let neighbours = crate::layer_multi_cmds::deletion_neighbours(doc, id);
|
||
let before = crate::clip_group::Before::read(doc, &[id]);
|
||
doc.remove(id).ok_or(EngineError::NoLayer(id))?;
|
||
crate::clip_group::settle(doc, &[], &before, false);
|
||
if doc.layers.is_empty() {
|
||
return Err(EngineError::Other("a document must keep at least one layer".into()));
|
||
}
|
||
if active.is_some_and(|current| doc.layer(current).is_none()) {
|
||
*active = neighbours.into_iter().find(|candidate| doc.layer(*candidate).is_some());
|
||
}
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!(
|
||
"layer.select",
|
||
"Select Layer",
|
||
[],
|
||
None,
|
||
r##"{"layer":id,"mode":"replace|toggle|range|add"="replace"} (toggle = ⌘-click, range = ⇧-click)"##,
|
||
has_doc,
|
||
crate::layer_multi_cmds::select
|
||
),
|
||
cmd!(
|
||
"layer.setProps",
|
||
"Layer Properties",
|
||
[],
|
||
None,
|
||
r##"{"layer":id?,"name":str?,"visible":bool?,"opacity":0..1?,"fill":0..1?,"blend":"Multiply|…"?,"clipped":bool?,"locked":bool?,"locks":{"transparency","pixels","position","artboard","all":bool}?,"channels":[bool,…]? (Advanced Blending: which colour channels blend, R G B / C M Y K / L a b)}"##,
|
||
has_layer,
|
||
|s, p| {
|
||
let id = layer_param(s, p)?;
|
||
let only_visibility =
|
||
p.as_object().is_some_and(|o| o.contains_key("visible") && o.keys().all(|k| matches!(k.as_str(), "layer" | "visible" | "coalesce")));
|
||
let label = if only_visibility { "Layer Visibility" } else { "Layer Properties" };
|
||
let before = s.active().ok_or(EngineError::NoDocument)?.doc.clone();
|
||
// Clipping and channel changes reach the layers around it: recomposite everything.
|
||
let local = p.get("clipped").is_none() && p.get("channels").is_none();
|
||
s.edit(label, |doc, _| {
|
||
let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?;
|
||
if let Some(v) = p.get("name").and_then(Value::as_str) {
|
||
l.name = v.to_string();
|
||
}
|
||
if let Some(v) = p.get("visible").and_then(Value::as_bool) {
|
||
l.visible = v;
|
||
}
|
||
if let Some(v) = p.get("opacity").and_then(Value::as_f64) {
|
||
l.opacity = (v as f32).clamp(0.0, 1.0);
|
||
}
|
||
if let Some(v) = p.get("fill").and_then(Value::as_f64) {
|
||
l.fill_opacity = (v as f32).clamp(0.0, 1.0);
|
||
}
|
||
if let Some(v) = p.get("blend").and_then(Value::as_str) {
|
||
l.blend = blend_from_str(v).ok_or_else(|| bad("layer.setProps", format!("unknown blend mode `{v}`")))?;
|
||
}
|
||
if let Some(v) = p.get("clipped").and_then(Value::as_bool) {
|
||
l.clipped = v;
|
||
}
|
||
if let Some(v) = p.get("locked").and_then(Value::as_bool) {
|
||
l.locks.all = v;
|
||
}
|
||
if let Some(Value::Array(ch)) = p.get("channels") {
|
||
// Blending Options › Advanced Blending › Channels: unchecked = left out.
|
||
l.excluded_channels = ch.iter().take(32).enumerate().filter(|(_, v)| v.as_bool() == Some(false)).fold(0, |m, (i, _)| m | 1 << i);
|
||
}
|
||
if let Some(Value::Object(m)) = p.get("locks") {
|
||
for (k, v) in m {
|
||
let v = v.as_bool().unwrap_or(false);
|
||
match k.as_str() {
|
||
"transparency" => l.locks.transparency = v,
|
||
"pixels" => l.locks.pixels = v,
|
||
"position" => l.locks.position = v,
|
||
"artboard" => l.locks.artboard = v,
|
||
"all" => l.locks.all = v,
|
||
other => return Err(bad("layer.setProps", format!("unknown lock `{other}`"))),
|
||
}
|
||
}
|
||
}
|
||
Ok(())
|
||
})?;
|
||
if local {
|
||
crate::layer_multi_cmds::note_damage(s, &before, &[id]);
|
||
}
|
||
Ok(Value::Null)
|
||
}
|
||
),
|
||
cmd!("layer.arrange.bringForward", "Bring Forward", ["Layer", "Arrange"], Some("Cmd+]"), r##"{"layer":id?}"##, has_layer, |s, p| arrange(s, p, 1)),
|
||
cmd!("layer.arrange.sendBackward", "Send Backward", ["Layer", "Arrange"], Some("Cmd+["), r##"{"layer":id?}"##, has_layer, |s, p| arrange(s, p, -1)),
|
||
cmd!("layer.arrange.bringToFront", "Bring to Front", ["Layer", "Arrange"], Some("Cmd+Shift+]"), r##"{"layer":id?}"##, has_layer, |s, p| arrange(
|
||
s,
|
||
p,
|
||
i32::MAX
|
||
)),
|
||
cmd!("layer.arrange.sendToBack", "Send to Back", ["Layer", "Arrange"], Some("Cmd+Shift+["), r##"{"layer":id?}"##, has_layer, |s, p| arrange(
|
||
s,
|
||
p,
|
||
i32::MIN
|
||
)),
|
||
cmd!(
|
||
"layer.createClippingMask",
|
||
"Create Clipping Mask",
|
||
["Layer"],
|
||
Some("Cmd+Alt+G"),
|
||
r##"{"layer":id?} (no layer: every selected layer but the lowest clips to the layer below it)"##,
|
||
has_layer,
|
||
|s, p| set_clipped(s, p, true)
|
||
),
|
||
cmd!(
|
||
"layer.releaseClippingMask",
|
||
"Release Clipping Mask",
|
||
["Layer"],
|
||
None,
|
||
r##"{"layer":id?} (no layer: every selected layer)"##,
|
||
has_layer,
|
||
|s, p| set_clipped(s, p, false)
|
||
),
|
||
cmd!(
|
||
"layer.layerMask.revealAll",
|
||
"Reveal All",
|
||
["Layer", "Layer Mask"],
|
||
None,
|
||
r##"{"layer":id?} (no layer: every selected layer that can take a mask)"##,
|
||
has_layer,
|
||
|s, p| set_mask(s, p, "Add Layer Mask", Some(LayerMask::reveal_all()))
|
||
),
|
||
cmd!(
|
||
"layer.layerMask.hideAll",
|
||
"Hide All",
|
||
["Layer", "Layer Mask"],
|
||
None,
|
||
r##"{"layer":id?} (no layer: every selected layer that can take a mask)"##,
|
||
has_layer,
|
||
|s, p| set_mask(s, p, "Add Layer Mask", Some(LayerMask::hide_all()))
|
||
),
|
||
cmd!(
|
||
"layer.layerMask.revealSelection",
|
||
"Reveal Selection",
|
||
["Layer", "Layer Mask"],
|
||
None,
|
||
r##"{"layer":id?} (no layer: every selected layer that can take a mask)"##,
|
||
has_selection,
|
||
|s, p| {
|
||
let sel = s.active().and_then(|d| d.doc.selection.clone()).ok_or(EngineError::Other("no selection".into()))?;
|
||
let mask = LayerMask { surface: sel, ..LayerMask::reveal_all() };
|
||
set_mask(s, p, "Add Layer Mask", Some(mask))
|
||
}
|
||
),
|
||
cmd!("layer.layerMask.delete", "Delete", ["Layer", "Layer Mask"], None, r##"{"layer":id?}"##, has_layer, |s, p| set_mask(
|
||
s,
|
||
p,
|
||
"Delete Layer Mask",
|
||
None
|
||
)),
|
||
cmd!("layer.mergeDown", "Merge Down", ["Layer"], None, r##"{"layer":id?}"##, has_layer, |s, p| {
|
||
let id = layer_param(s, p)?;
|
||
s.edit("Merge Down", |doc, active| {
|
||
let path = doc.path_of(id).ok_or(EngineError::NoLayer(id))?;
|
||
let Some((&idx, parent)) = path.split_last() else { return Err(EngineError::NoLayer(id)) };
|
||
if idx == 0 {
|
||
return Err(EngineError::Other("no layer below to merge into".into()));
|
||
}
|
||
let mut below = parent.to_vec();
|
||
below.push(idx - 1);
|
||
let lower = doc.layer_at(&below).ok_or(EngineError::NoLayer(id))?.clone();
|
||
let upper = doc.layer(id).ok_or(EngineError::NoLayer(id))?.clone();
|
||
let merged = pixels::merge_down(doc, &lower, &upper);
|
||
doc.remove(id);
|
||
*doc.layer_at_mut(&below).ok_or(EngineError::NoLayer(lower.id))? = merged;
|
||
*active = Some(lower.id);
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!("layer.flattenImage", "Flatten Image", ["Layer"], None, "{}", has_doc, |s, _| {
|
||
s.edit("Flatten Image", |doc, active| {
|
||
let fmt = doc.pixel_format();
|
||
let mut bg = Layer::raster("Background", fmt);
|
||
bg.locks.transparency = true;
|
||
bg.locks.position = true;
|
||
*crate::pixels_mut(&mut bg)? = photocraft_compose::flatten_to_surface(doc, fmt, Some([1.0, 1.0, 1.0]));
|
||
*active = Some(bg.id);
|
||
doc.layers = vec![bg];
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!(
|
||
"layer.newFillLayer.solidColor",
|
||
"Solid Color…",
|
||
["Layer", "New Fill Layer"],
|
||
None,
|
||
r##"{"color":"#rrggbb"=foreground,"path":"work"|saved path name|{…path}? (the active path: becomes the vector mask, making a shape; else the selection is the layer mask)}"##,
|
||
has_doc,
|
||
|s, p| {
|
||
let c = color_param(p, "color", s.tools.foreground);
|
||
let id = s.edit("New Color Fill Layer", |doc, active| {
|
||
let fill = Fill::Solid(Color::rgba(c[0], c[1], c[2], c[3])).in_mode(doc.mode);
|
||
let mut l = Layer::new(doc.next_layer_name("Color Fill"), LayerContent::Fill(fill));
|
||
mask_new_layer(doc, &mut l, p, "layer.newFillLayer.solidColor")?;
|
||
let id = doc.insert_above(*active, l);
|
||
*active = Some(id);
|
||
Ok(id)
|
||
})?;
|
||
Ok(json!({ "layer": id.0 }))
|
||
}
|
||
),
|
||
cmd!(
|
||
"layer.newFillLayer.gradient",
|
||
"Gradient…",
|
||
["Layer", "New Fill Layer"],
|
||
None,
|
||
r##"{"from":"#rrggbb","to":"#rrggbb","angle":deg=90,"style":"linear|radial|angle|reflected|diamond","reverse":bool,"path":"work"|saved path name|{…path}? (the active path: becomes the vector mask; else the selection is the layer mask)}"##,
|
||
has_doc,
|
||
|s, p| {
|
||
let a = color_param(p, "from", s.tools.foreground);
|
||
let b = color_param(p, "to", s.tools.background);
|
||
let angle = f32_or(p, "angle", 90.0);
|
||
let style = crate::layer_style::gradient_style(p.get("style").and_then(Value::as_str).unwrap_or("linear"));
|
||
let reverse = p.get("reverse").and_then(Value::as_bool).unwrap_or(false);
|
||
let id = s.edit("New Gradient Fill Layer", |doc, active| {
|
||
let fill = Fill::gradient(
|
||
vec![(0.0, Color::rgba(a[0], a[1], a[2], a[3])), (1.0, Color::rgba(b[0], b[1], b[2], b[3]))],
|
||
angle,
|
||
1.0,
|
||
style,
|
||
reverse,
|
||
)
|
||
.in_mode(doc.mode);
|
||
let mut l = Layer::new(doc.next_layer_name("Gradient Fill"), LayerContent::Fill(fill));
|
||
mask_new_layer(doc, &mut l, p, "layer.newFillLayer.gradient")?;
|
||
let id = doc.insert_above(*active, l);
|
||
*active = Some(id);
|
||
Ok(id)
|
||
})?;
|
||
Ok(json!({ "layer": id.0 }))
|
||
}
|
||
),
|
||
cmd!(
|
||
"layer.setAdjustment",
|
||
"Adjustment Properties",
|
||
[],
|
||
None,
|
||
r##"{"layer":id?, …params of that adjustment kind} (Levels, Curves: "eyedropper":{"point":"black|gray|white","at":[x,y],"size":1..101=1} or {"point",…,"color":[r,g,b] 0..1} = the Properties panel's Set Black/Neutral Gray/White Point, sampling the image below the layer, RGB and Grayscale (no gray) only)"##,
|
||
has_layer,
|
||
|s, p| {
|
||
let id = layer_param(s, p)?;
|
||
let eyedropped = crate::adjust_params::layer_eyedropper(s, id, p)?;
|
||
s.edit("Modify Adjustment", |doc, _| {
|
||
let mode = doc.mode;
|
||
let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?;
|
||
let LayerContent::Adjustment(adj) = &mut l.content else { return Err(EngineError::Other("not an adjustment layer".into())) };
|
||
if matches!(adj, Adjustment::Unsupported { .. }) {
|
||
return Err(EngineError::Other("this adjustment can't be edited (kept as imported)".into()));
|
||
}
|
||
let kind = adjustment_kind(adj);
|
||
// No params resets to the defaults; otherwise params merge over the current values.
|
||
*adj = if let Some(eyedropped) = eyedropped {
|
||
eyedropped
|
||
} else if crate::adjust_params::user_keys(p).is_empty() {
|
||
crate::adjust_params::default_for(kind, mode)?
|
||
} else {
|
||
crate::adjust_params::from_params(kind, p, Some(adj), mode)?
|
||
};
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}
|
||
),
|
||
cmd!(
|
||
"layer.moveTo",
|
||
"Reorder Layer",
|
||
[],
|
||
None,
|
||
r##"{"layer":id?| "layers":[id,…]?, "target":id,"position":"above|below|into"="above","copy":bool=false} (layers: one undoable move, document order preserved; copy: place duplicates there and leave the layers, as ⌥-dragging a Layers panel row)"##,
|
||
has_layer,
|
||
crate::layer_multi_cmds::move_to
|
||
),
|
||
cmd!(
|
||
"layer.translate",
|
||
"Move Layer",
|
||
[],
|
||
None,
|
||
r##"{"layer":id?,"dx":i32,"dy":i32,"target":"pixels"|"mask"="pixels"} (no layer: every selected layer; linked layers follow; target mask: a layer whose mask is unlinked moves that mask alone, a linked mask moves with the layer)"##,
|
||
has_layer,
|
||
crate::layer_multi_cmds::translate
|
||
),
|
||
// Image
|
||
cmd!("image.imageRotation.flipCanvasHorizontal", "Flip Canvas Horizontal", ["Image", "Image Rotation"], None, "{}", has_doc, |s, _| {
|
||
turn(s, "Flip Canvas Horizontal", crate::canvas_geom::Turn::FlipHorizontal)
|
||
}),
|
||
cmd!("image.imageRotation.flipCanvasVertical", "Flip Canvas Vertical", ["Image", "Image Rotation"], None, "{}", has_doc, |s, _| {
|
||
turn(s, "Flip Canvas Vertical", crate::canvas_geom::Turn::FlipVertical)
|
||
}),
|
||
cmd!("image.imageRotation.180", "180°", ["Image", "Image Rotation"], None, "{}", has_doc, |s, _| {
|
||
turn(s, "Rotate Canvas", crate::canvas_geom::Turn::Rotate180)
|
||
}),
|
||
cmd!("image.imageRotation.90cw", "90° Clockwise", ["Image", "Image Rotation"], None, "{}", has_doc, |s, _| {
|
||
turn(s, "Rotate Canvas", crate::canvas_geom::Turn::Cw90)
|
||
}),
|
||
cmd!("image.imageRotation.90ccw", "90° Counter Clockwise", ["Image", "Image Rotation"], None, "{}", has_doc, |s, _| {
|
||
turn(s, "Rotate Canvas", crate::canvas_geom::Turn::Ccw90)
|
||
}),
|
||
cmd!("image.adjustments.desaturate", "Desaturate", ["Image", "Adjustments"], Some("Cmd+Shift+U"), "{}", has_pixel_layer, |s, _| {
|
||
destructive_adjust(
|
||
s,
|
||
"Desaturate",
|
||
Adjustment::HueSaturation {
|
||
hue: 0.0,
|
||
saturation: -100.0,
|
||
lightness: 0.0,
|
||
colorize: false,
|
||
ranges: photocraft_doc::adjust::HueRange::defaults(),
|
||
},
|
||
&Value::Null,
|
||
)
|
||
}),
|
||
// Paint
|
||
cmd!(
|
||
"paint.stroke",
|
||
"Brush Stroke",
|
||
[],
|
||
None,
|
||
r##"{"points":[[x,y,pressure?,tiltX?,tiltY?,rotation?,timeMs?,wheel?],…],"brush":{…BrushSettings}?,"preset":name?,"size":0.5..5000 px?,"hardness":0..1?,"opacity":0..1?,"flow":0..1?,"spacing":0..10?,"color":"#rrggbb"?=foreground,"mode":"normal|multiply|screen|…|clear (erases with this brush)"="normal","erase":bool?,"smoothing":0..1?,"zoom":number=1,"seed":u64?,"target":"pixels"|"mask"|"quickMask"|{"channel":i}=Channels panel target}"##,
|
||
has_paintable,
|
||
crate::brush_cmds::paint_stroke
|
||
),
|
||
cmd!("tools.setColors", "Set Colors", [], None, r##"{"foreground":"#rrggbb"?,"background":"#rrggbb"?}"##, always, |s, p| {
|
||
s.tools.foreground = color_param(p, "foreground", s.tools.foreground);
|
||
s.tools.background = color_param(p, "background", s.tools.background);
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!("tools.swapColors", "Switch Foreground and Background Colors", [], Some("X"), "{}", always, |s, _| {
|
||
std::mem::swap(&mut s.tools.foreground, &mut s.tools.background);
|
||
Ok(Value::Null)
|
||
}),
|
||
cmd!("tools.defaultColors", "Default Foreground and Background Colors", [], Some("D"), "{}", always, |s, _| {
|
||
if s.tools.mask_targeted {
|
||
s.tools.foreground = crate::ToolState::MASK_COLORS[0];
|
||
s.tools.background = crate::ToolState::MASK_COLORS[1];
|
||
} else {
|
||
s.tools.foreground = [0.0, 0.0, 0.0, 1.0];
|
||
s.tools.background = [1.0, 1.0, 1.0, 1.0];
|
||
}
|
||
Ok(Value::Null)
|
||
}),
|
||
// Queries (not journaled)
|
||
CommandSpec {
|
||
id: "session.inspect",
|
||
label: "Inspect Session",
|
||
menu: &[],
|
||
shortcut: None,
|
||
params: "{}",
|
||
enabled: always,
|
||
run: |s, _| Ok(inspect::session(s)),
|
||
journal: false,
|
||
},
|
||
CommandSpec {
|
||
id: "document.inspect",
|
||
label: "Inspect Document",
|
||
menu: &[],
|
||
shortcut: None,
|
||
params: r##"{"document":index?}"##,
|
||
enabled: has_doc,
|
||
run: |s, p| {
|
||
let d = match p.get("document") {
|
||
Some(v) => {
|
||
let i = v.as_u64().and_then(|v| usize::try_from(v).ok()).ok_or_else(|| bad("document.inspect", "`document` must be an index"))?;
|
||
s.documents().get(i).ok_or_else(|| EngineError::Other(format!("no document at index {i}")))?
|
||
}
|
||
None => s.active().ok_or(EngineError::NoDocument)?,
|
||
};
|
||
Ok(inspect::document(d))
|
||
},
|
||
journal: false,
|
||
},
|
||
CommandSpec {
|
||
id: "document.activate",
|
||
label: "Activate Document",
|
||
menu: &[],
|
||
shortcut: None,
|
||
params: r##"{"document":index}"##,
|
||
enabled: has_doc,
|
||
run: |s, p| {
|
||
let i = p.get("document").and_then(Value::as_u64).ok_or_else(|| bad("document.activate", "missing `document`"))?;
|
||
let idx = usize::try_from(i).map_err(|_| bad("document.activate", "`document` out of range"))?;
|
||
if s.set_active(idx) { Ok(Value::Null) } else { Err(EngineError::Other(format!("no document at index {idx}"))) }
|
||
},
|
||
journal: false,
|
||
},
|
||
CommandSpec {
|
||
id: "document.move",
|
||
label: "Move Document",
|
||
menu: &[],
|
||
shortcut: None,
|
||
params: r##"{"document":index?,"to":index}"##,
|
||
enabled: has_doc,
|
||
run: |s, p| {
|
||
let index = |key: &str| {
|
||
p.get(key)
|
||
.map(|v| v.as_u64().and_then(|v| usize::try_from(v).ok()).ok_or_else(|| bad("document.move", format!("`{key}` must be a tab index"))))
|
||
};
|
||
let from = match index("document") {
|
||
Some(i) => i?,
|
||
None => s.active_index().ok_or(EngineError::NoDocument)?,
|
||
};
|
||
let to = index("to").ok_or_else(|| bad("document.move", "missing `to`"))??;
|
||
let to = s.move_document(from, to).ok_or(EngineError::NoDocument)?;
|
||
Ok(json!({"document": to}))
|
||
},
|
||
journal: false,
|
||
},
|
||
CommandSpec {
|
||
id: "command.list",
|
||
label: "List Commands",
|
||
menu: &[],
|
||
shortcut: None,
|
||
params: "{}",
|
||
enabled: always,
|
||
run: |s, _| Ok(Value::Array(command_specs().iter().map(|c| list_entry(s, c, (c.enabled)(s).err())).collect())),
|
||
journal: false,
|
||
},
|
||
CommandSpec {
|
||
id: "document.pixel",
|
||
label: "Read Composite Pixel",
|
||
menu: &[],
|
||
shortcut: None,
|
||
params: r##"{"x":i32,"y":i32}"##,
|
||
enabled: has_doc,
|
||
run: |s, p| {
|
||
let coord = |k: &str| i32::try_from(int(p, k).unwrap_or(0)).map_err(|_| bad("document.pixel", format!("{k} must fit in 32 bits")));
|
||
let (x, y) = (coord("x")?, coord("y")?);
|
||
let d = s.active().ok_or(EngineError::NoDocument)?;
|
||
// At i32::MAX the 1x1 rect saturates to empty: a pixel that far out is transparent.
|
||
let px = photocraft_compose::render(&d.doc, Rect::from_xywh(x, y, 1, 1)).px.first().copied().unwrap_or_default();
|
||
Ok(json!(px))
|
||
},
|
||
journal: false,
|
||
},
|
||
];
|
||
|
||
// Adjustment layers + destructive adjustments, generated from one list.
|
||
// Levels/Curves channel keys follow the document: red/green/blue (RGB), gray (Grayscale),
|
||
// cyan/magenta/yellow/black (CMYK), lightness/a/b (Lab); see `adjust_params`.
|
||
const ADJ: &[(&str, &str, &str)] = &[
|
||
("brightnessContrast", "Brightness/Contrast…", r##"{"brightness":-150..150=0,"contrast":-50..100=0,"legacy":bool=false}"##),
|
||
(
|
||
"levels",
|
||
"Levels…",
|
||
r##"{"inBlack":0..253=0,"gamma":0.01..9.99=1,"inWhite":2..255=255,"outBlack":0..255=0,"outWhite":0..255=255,"red":json,"green":json,"blue":json,"eyedropper":json} (top level = composite; per channel {"inBlack","gamma","inWhite","outBlack","outWhite"} under red/green/blue, gray, cyan/magenta/yellow/black or lightness/a/b; eyedropper = the dialog's Set Black/Neutral Gray/White Point picker {"point":"black|gray|white","at":[x,y],"size":1..101=1} or {"point",…,"color":[r,g,b] 0..1}: black/white set each channel's input black/white to the sample, gray each channel's gamma so the sample turns neutral at its luma; RGB and Grayscale (no gray) only, applied over the given levels)"##,
|
||
),
|
||
(
|
||
"curves",
|
||
"Curves…",
|
||
r##"{"points":json,"red":json,"green":json,"blue":json,"pencil":bool=false,"smooth":0..10=0,"eyedropper":json} (curves as [[in,out],…] in 0..255, 2..19 points: points = composite; red/green/blue, gray, cyan/magenta/yellow/black or lightness/a/b per channel; pencil = drawn curves (Draw to modify the curve): each curve is 256 output levels in 0..255 (point curves given are drawn in, and turning pencil off fits points to the drawing); smooth = Smooth passes over the drawn curves; eyedropper = the dialog's Set Black/Neutral Gray/White Point picker {"point":"black|gray|white","at":[x,y],"size":1..101=1} or {"point",…,"color":[r,g,b] 0..1}, RGB and Grayscale (no gray) only, applied over the given curves)"##,
|
||
),
|
||
("exposure", "Exposure…", r##"{"exposure":-20..20=0,"offset":-0.5..0.5=0,"gamma":0.01..9.99=1}"##),
|
||
("vibrance", "Vibrance…", r##"{"vibrance":-100..100=0,"saturation":-100..100=0}"##),
|
||
(
|
||
"hueSaturation",
|
||
"Hue/Saturation…",
|
||
r##"{"hue":-180..180=0,"saturation":-100..100=0,"lightness":-100..100=0,"colorize":bool=false,"reds":json,"yellows":json,"greens":json,"cyans":json,"blues":json,"magentas":json} (per range {"hue","saturation","lightness","range":[4 hue degrees]}; colorize: hue 0..360, saturation 0..100)"##,
|
||
),
|
||
(
|
||
"colorBalance",
|
||
"Color Balance…",
|
||
r##"{"shadows":json,"midtones":json,"highlights":json,"preserveLuminosity":bool=true} (each tone [cyan-red, magenta-green, yellow-blue] in -100..100)"##,
|
||
),
|
||
(
|
||
"blackWhite",
|
||
"Black & White…",
|
||
r##"{"reds":-200..300=40,"yellows":-200..300=60,"greens":-200..300=40,"cyans":-200..300=60,"blues":-200..300=20,"magentas":-200..300=80,"tint":bool=false,"tintColor":"#rrggbb"}"##,
|
||
),
|
||
(
|
||
"photoFilter",
|
||
"Photo Filter…",
|
||
r##"{"filter":"warming85|warmingLBA|warming81|cooling80|coolingLBB|cooling82|red|orange|yellow|green|cyan|blue|violet|magenta|sepia|deepRed|deepBlue|deepEmerald|deepYellow|underwater","color":"#rrggbb","density":0..100=25,"preserveLuminosity":bool=true}"##,
|
||
),
|
||
(
|
||
"channelMixer",
|
||
"Channel Mixer…",
|
||
r##"{"red":json,"green":json,"blue":json,"gray":json,"monochrome":bool=false} (per output channel [red %, green %, blue %, constant %] in -200..200; gray = the monochrome mix)"##,
|
||
),
|
||
("invert", "Invert", "{}"),
|
||
("posterize", "Posterize…", r##"{"levels":2..255=4}"##),
|
||
("threshold", "Threshold…", r##"{"level":1..255=128}"##),
|
||
("gradientMap", "Gradient Map…", r##"{"stops":json,"reverse":bool=false,"dither":bool=false} (stops [[location 0..1, "#rrggbb"], …], 2..64)"##),
|
||
(
|
||
"selectiveColor",
|
||
"Selective Color…",
|
||
r##"{"method":"relative|absolute"="relative","colors":"reds|yellows|greens|cyans|blues|magentas|whites|neutrals|blacks"="reds","cyan":-100..100=0,"magenta":-100..100=0,"yellow":-100..100=0,"black":-100..100=0,"reds":json} (per-range [c,m,y,k] arrays: reds yellows greens cyans blues magentas whites neutrals blacks)"##,
|
||
),
|
||
(
|
||
"colorLookup",
|
||
"Color Lookup…",
|
||
r##"{"lut":"none|warm|cool|tealOrange|bleachBypass|fadedFilm|dayForNight|monoContrast|crossProcess"="none","file":text,"interpolation":"trilinear|tetrahedral"="trilinear","dither":bool=false,"data":json} (file: .cube/.3dl/.look path; data: file text + "fileName")"##,
|
||
),
|
||
];
|
||
for &(kind, label, params) in ADJ {
|
||
let layer_id: &'static str = Box::leak(format!("layer.newAdjustmentLayer.{kind}").into_boxed_str());
|
||
let image_id: &'static str = Box::leak(format!("image.adjustments.{kind}").into_boxed_str());
|
||
v.push(CommandSpec {
|
||
id: layer_id,
|
||
label,
|
||
menu: &["Layer", "New Adjustment Layer"],
|
||
shortcut: None,
|
||
params: Box::leak(format!("{params} + {{{NEW_LAYER_PATH}}}").into_boxed_str()),
|
||
enabled: has_doc,
|
||
run: |s, p| {
|
||
let kind = p.get("__kind").and_then(Value::as_str).unwrap_or("invert").to_string();
|
||
let eyedropped = if matches!(kind.as_str(), "levels" | "curves") { crate::adjust_params::eyedropper_from_params(s, &kind, p)? } else { None };
|
||
let adj = match eyedropped {
|
||
Some(adj) => adj,
|
||
None => crate::adjust_params::from_params(&kind, p, None, doc_mode(s))?,
|
||
};
|
||
new_adjustment(s, adj, p, &format!("layer.newAdjustmentLayer.{kind}"))
|
||
},
|
||
journal: true,
|
||
});
|
||
v.push(CommandSpec {
|
||
id: image_id,
|
||
label,
|
||
menu: &["Image", "Adjustments"],
|
||
shortcut: match kind {
|
||
"levels" => Some("Cmd+L"),
|
||
"curves" => Some("Cmd+M"),
|
||
"hueSaturation" => Some("Cmd+U"),
|
||
"colorBalance" => Some("Cmd+B"),
|
||
"invert" => Some("Cmd+I"),
|
||
"blackWhite" => Some("Cmd+Alt+Shift+B"),
|
||
_ => None,
|
||
},
|
||
params,
|
||
enabled: crate::adjust_cmds::has_adjustable,
|
||
run: |s, p| {
|
||
let kind = p.get("__kind").and_then(Value::as_str).unwrap_or("invert").to_string();
|
||
let eyedropped = if matches!(kind.as_str(), "levels" | "curves") { crate::adjust_params::eyedropper_from_params(s, &kind, p)? } else { None };
|
||
// A smart filter re-runs its params, so it records what an eyedropper resolved
|
||
// to, not the sample (#3127).
|
||
let recorded = eyedropped.as_ref().map(|adj| {
|
||
let mut q = p.clone();
|
||
if let (Value::Object(q), Value::Object(resolved)) = (&mut q, crate::adjust_params::to_params(adj)) {
|
||
q.remove("eyedropper");
|
||
q.extend(resolved);
|
||
}
|
||
q
|
||
});
|
||
let adj = match eyedropped {
|
||
Some(adj) => adj,
|
||
None => crate::adjust_params::from_params(&kind, p, None, doc_mode(s))?,
|
||
};
|
||
let label = adj.label().to_string();
|
||
// A smart object records the adjustment as a smart filter (Photoshop), which
|
||
// re-runs from the source instead of baking into a copy of the pixels.
|
||
if crate::adjust_cmds::adjust_as_smart_filter(s, &kind, &label, recorded.as_ref().unwrap_or(p))? {
|
||
return Ok(Value::Null);
|
||
}
|
||
destructive_adjust(s, &label, adj, p)
|
||
},
|
||
journal: true,
|
||
});
|
||
}
|
||
v.extend(crate::layer_style::specs());
|
||
v.extend(crate::filters::specs());
|
||
v.extend(crate::filters_ext::specs());
|
||
v.extend(crate::color_to_alpha_cmds::specs());
|
||
v.extend(crate::gallery_cmds::specs());
|
||
v.extend(crate::gradient_fill_cmds::specs());
|
||
v.extend(crate::solid_fill_cmds::specs());
|
||
v.extend(crate::pattern_fill_cmds::specs());
|
||
v.extend(crate::type_cmds::specs());
|
||
v.extend(crate::type_mask_cmds::specs());
|
||
v.extend(crate::transform_cmds::specs());
|
||
v.extend(crate::float_cmds::specs());
|
||
v.extend(crate::vector_cmds::specs());
|
||
v.extend(crate::path_edit_cmds::specs());
|
||
v.extend(crate::smartselect_cmds::specs());
|
||
v.extend(crate::cutout_cmds::specs());
|
||
v.extend(crate::symmetry_cmds::specs());
|
||
v.extend(crate::edit_cmds::specs());
|
||
v.extend(crate::color_cmds::specs());
|
||
v.extend(crate::brush_cmds::specs());
|
||
v.extend(crate::brush_preset_cmds::specs());
|
||
v.extend(crate::eraser_cmds::specs());
|
||
v.extend(crate::preset_import_cmds::specs());
|
||
v.extend(crate::swatch_cmds::specs());
|
||
v.extend(crate::retouch_cmds::specs());
|
||
v.extend(crate::redeye_cmds::specs());
|
||
v.extend(crate::image_cmds::specs());
|
||
v.extend(crate::perspective_crop_cmds::specs());
|
||
v.extend(crate::selection_cmds::specs());
|
||
v.extend(crate::magnetic_cmds::specs());
|
||
v.extend(crate::select_extra_cmds::specs());
|
||
v.extend(crate::paint_cmds::specs());
|
||
v.extend(crate::extra_cmds::specs());
|
||
v.extend(crate::background_cmds::specs());
|
||
v.extend(crate::file_cmds::specs());
|
||
v.extend(crate::exr_cmds::specs());
|
||
v.extend(crate::type_extra_cmds::specs());
|
||
v.extend(crate::type_styles_cmds::specs());
|
||
v.extend(crate::type_spell_cmds::specs());
|
||
v.extend(crate::type_caret_cmds::specs());
|
||
v.extend(crate::smart_cmds::specs());
|
||
v.extend(crate::layer_multi_cmds::specs());
|
||
v.extend(crate::layer_copy_cmds::specs());
|
||
v.extend(crate::prefs::specs());
|
||
v.extend(crate::edit_menu_cmds::specs());
|
||
v.extend(crate::fill_key_cmds::specs());
|
||
v.extend(crate::sample_cmds::specs());
|
||
v.extend(crate::sampler_cmds::specs());
|
||
v.extend(crate::brush_key_cmds::specs());
|
||
v.extend(crate::stamp_cmds::specs());
|
||
v.extend(crate::align_cmds::specs());
|
||
v.extend(crate::photo_cmds::specs());
|
||
v.extend(crate::lens_cmds::specs());
|
||
v.extend(crate::vp_cmds::specs());
|
||
v.extend(crate::channel_cmds::specs());
|
||
v.extend(crate::adjust_cmds::specs());
|
||
v.extend(crate::layer_menu_cmds::specs());
|
||
v.extend(crate::layer_label_cmds::specs());
|
||
v.extend(crate::mode_cmds::specs());
|
||
v.extend(crate::multichannel_cmds::specs());
|
||
v.extend(crate::pattern_cmds::specs());
|
||
v.extend(crate::warp_cmds::specs());
|
||
v.extend(crate::comps_cmds::specs());
|
||
v.extend(crate::artboard_cmds::specs());
|
||
v.extend(crate::distort_cmds::specs());
|
||
v.extend(crate::analysis_cmds::specs());
|
||
v.extend(crate::notes_cmds::specs());
|
||
v.extend(crate::history_cmds::specs());
|
||
v.extend(crate::proof_sim::specs());
|
||
v.extend(crate::presets::specs());
|
||
v.extend(crate::document_preset_cmds::specs());
|
||
v.extend(crate::render_cmds::specs());
|
||
v.extend(crate::slice_cmds::specs());
|
||
v.extend(crate::web_cmds::specs());
|
||
v.extend(crate::automate_cmds::specs());
|
||
v.extend(crate::print_cmds::specs());
|
||
v.extend(crate::installed_profiles::specs());
|
||
v.extend(crate::pick_cmds::specs());
|
||
v.extend(crate::layer_nav_cmds::specs());
|
||
v.extend(crate::frame_cmds::specs());
|
||
v.extend(crate::migrate_cmds::specs());
|
||
v.extend(crate::trap_cmds::specs());
|
||
v.extend(crate::timeline_cmds::specs());
|
||
v.extend(crate::video_cmds::specs());
|
||
v.extend(crate::jobs::specs());
|
||
v.extend(crate::wia_cmds::specs());
|
||
v.extend(crate::rasterize_style_cmds::specs());
|
||
v.extend(crate::variables_cmds::specs());
|
||
v.extend(crate::plugin_cmds::specs());
|
||
v.extend(crate::group_view_cmds::specs());
|
||
v.extend(crate::fx_view_cmds::specs());
|
||
v.extend(crate::fx_visibility_cmds::specs());
|
||
v.extend(crate::mask_view_cmds::specs());
|
||
v.extend(crate::layer_mask_props_cmds::specs());
|
||
v.extend(crate::actions_cmds::specs());
|
||
// The dispatch guard's unit test needs a command that panics on purpose (REL-3).
|
||
#[cfg(test)]
|
||
v.push(test_panic_command());
|
||
v
|
||
}
|
||
|
||
/// A command whose `run` panics on purpose, so the last-resort guard in `jobs::dispatch`
|
||
/// can be tested (REL-3). Test builds only: `commands::build` pushes it under `cfg(test)`.
|
||
#[cfg(test)]
|
||
fn test_panic_command() -> CommandSpec {
|
||
#[allow(clippy::panic)]
|
||
fn run(_: &mut Session, _: &Value) -> Result<Value> {
|
||
panic!("test: this command panicked on purpose")
|
||
}
|
||
CommandSpec { id: "test.panic", label: "Test Panic", menu: &[], shortcut: None, params: r##"{}"##, enabled: |_: &Session| Ok(()), run, journal: false }
|
||
}
|
||
|
||
/// Commands generated from a table share one `run` fn; the kind is recovered from the id.
|
||
pub(crate) fn inject_kind(id: &str, params: Value) -> Value {
|
||
let kind = id.strip_prefix("layer.newAdjustmentLayer.").or_else(|| id.strip_prefix("image.adjustments."));
|
||
match (kind, params) {
|
||
(Some(k), Value::Object(mut m)) => {
|
||
m.insert("__kind".into(), Value::String(k.into()));
|
||
Value::Object(m)
|
||
}
|
||
(Some(k), _) => json!({ "__kind": k }),
|
||
(None, p) => p,
|
||
}
|
||
}
|
||
|
||
pub fn adjustment_kind(a: &Adjustment) -> &'static str {
|
||
match a {
|
||
Adjustment::BrightnessContrast { .. } => "brightnessContrast",
|
||
Adjustment::Levels { .. } => "levels",
|
||
Adjustment::Curves { .. } => "curves",
|
||
Adjustment::Exposure { .. } => "exposure",
|
||
Adjustment::Vibrance { .. } => "vibrance",
|
||
Adjustment::HueSaturation { .. } => "hueSaturation",
|
||
Adjustment::ColorBalance { .. } => "colorBalance",
|
||
Adjustment::BlackWhite { .. } => "blackWhite",
|
||
Adjustment::PhotoFilter { .. } => "photoFilter",
|
||
Adjustment::ChannelMixer { .. } => "channelMixer",
|
||
Adjustment::Posterize { .. } => "posterize",
|
||
Adjustment::Threshold { .. } => "threshold",
|
||
Adjustment::GradientMap { .. } => "gradientMap",
|
||
Adjustment::SelectiveColor { .. } => "selectiveColor",
|
||
Adjustment::ColorLookup { .. } => "colorLookup",
|
||
_ => "invert",
|
||
}
|
||
}
|
||
|
||
fn arrange(s: &mut Session, p: &Value, delta: i32) -> Result<Value> {
|
||
let id = layer_param(s, p)?;
|
||
s.edit("Arrange", |doc, _| {
|
||
// The Background stays at the bottom: it doesn't move and nothing goes below it.
|
||
let bg = crate::background_cmds::background_id(doc);
|
||
if bg == Some(id) {
|
||
return Err(EngineError::Other("the Background layer can't be moved".into()));
|
||
}
|
||
let steps = match delta {
|
||
i32::MAX => 10_000,
|
||
i32::MIN => -10_000,
|
||
d => d,
|
||
};
|
||
let dir = steps.signum();
|
||
let before = crate::clip_group::Before::read(doc, &[id]);
|
||
let mut moved = false;
|
||
for _ in 0..steps.abs() {
|
||
if !doc.shift(id, dir) {
|
||
break;
|
||
}
|
||
if crate::background_cmds::keep_background_at_bottom(bg, doc).is_err() {
|
||
doc.shift(id, -dir);
|
||
break;
|
||
}
|
||
moved = true;
|
||
}
|
||
if !moved {
|
||
return Err(EngineError::Other("layer can't move further".into()));
|
||
}
|
||
crate::clip_group::settle(doc, &[id], &before, false);
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}
|
||
|
||
/// Add (`Some`) or remove (`None`) a layer mask. Adding acts on every selected layer that can take
|
||
/// one ([`crate::layer_multi_cmds::mask_targets`]), in one history step.
|
||
fn set_mask(s: &mut Session, p: &Value, label: &str, mask: Option<LayerMask>) -> Result<Value> {
|
||
let ids = if mask.is_some() { crate::layer_multi_cmds::mask_targets(s, p)? } else { vec![layer_param(s, p)?] };
|
||
s.edit(label, |doc, _| {
|
||
let mask = mask.clone().map(|mask| mask_at_depth(mask, doc.depth)).transpose()?;
|
||
for id in &ids {
|
||
if mask.is_some() {
|
||
crate::extra_cmds::background_to_layer_for_mask(doc, *id);
|
||
}
|
||
doc.layer_mut(*id).ok_or(EngineError::NoLayer(*id))?.mask = mask.clone();
|
||
}
|
||
Ok(())
|
||
})?;
|
||
Ok(Value::Null)
|
||
}
|
||
|
||
/// Move a layer's pixels, linked mask and type by whole pixels (vectors move via
|
||
/// `vector_cmds::translate_vectors`).
|
||
pub(crate) fn translate_layer(doc: &Document, l: &mut Layer, dx: i32, dy: i32) {
|
||
use crate::layer_multi_cmds::shift_surface as translate_surface;
|
||
// Linked patterns in the layer's effects move with it.
|
||
if let Some(r) = &mut l.effects.reference {
|
||
*r = (r.0 + f64::from(dx), r.1 + f64::from(dy));
|
||
}
|
||
if let Some(m) = &mut l.mask
|
||
&& m.linked
|
||
{
|
||
m.surface = translate_surface(&m.surface, dx, dy);
|
||
}
|
||
match &mut l.content {
|
||
LayerContent::Raster(s) => *s = translate_surface(s, dx, dy),
|
||
LayerContent::Text(t) => {
|
||
t.transform = photocraft_geom::Affine::translate(dx as f64, dy as f64).mul(&t.transform);
|
||
// A whole-pixel move shifts the rendered text and its PSD position as they are.
|
||
// Re-rendering would replace Photoshop's rendering of imported type, and drop the
|
||
// text when its font is missing (artboard export, moving type with the Move tool).
|
||
let raw = t.psd_raw.as_deref().map(|r| photocraft_text::psd::translate_tysh(r, f64::from(dx), f64::from(dy)));
|
||
match (&mut t.cache, raw) {
|
||
(Some(c), Some(Some(r))) => {
|
||
*c = translate_surface(c, dx, dy);
|
||
t.psd_raw = Some(std::sync::Arc::new(r));
|
||
}
|
||
(Some(c), None) => *c = translate_surface(c, dx, dy),
|
||
_ => crate::type_cmds::refresh(doc, t),
|
||
}
|
||
}
|
||
LayerContent::Group(g) => {
|
||
// Moving an artboard moves the board with its contents.
|
||
if let Some(a) = &mut g.artboard {
|
||
a.rect = a.rect.translate(dx, dy);
|
||
}
|
||
for c in &mut g.children {
|
||
translate_layer(doc, c, dx, dy);
|
||
}
|
||
}
|
||
LayerContent::Smart(sm) => crate::smart_cmds::shift_smart(sm, dx, dy),
|
||
_ => {}
|
||
}
|
||
}
|
||
|
||
/// A copy of layer `id` as Layer › Duplicate Layer makes it, not yet in the document: a fresh id,
|
||
/// "… copy" appended to the name, and a copy of the Background layer is an ordinary, unlocked
|
||
/// layer (Photoshop).
|
||
pub(crate) fn layer_copy(doc: &Document, id: LayerId) -> Result<Layer> {
|
||
let src = doc.layer(id).ok_or(EngineError::NoLayer(id))?;
|
||
// A copy of the Background layer is an ordinary, unlocked layer (Photoshop).
|
||
let from_background = doc.is_background(id);
|
||
let mut dup = src.duplicate();
|
||
dup.name = doc.copy_name(&dup.name);
|
||
if from_background {
|
||
dup.locks = Default::default();
|
||
}
|
||
Ok(dup)
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod registry_tests {
|
||
use super::*;
|
||
|
||
#[test]
|
||
fn duplicate_ids_keep_the_first_spec_and_listing_order() {
|
||
let mut built = build().into_iter();
|
||
let first = built.next().unwrap();
|
||
let mut second = built.next().unwrap();
|
||
let id = first.id;
|
||
second.id = id;
|
||
let registry = Registry::new(vec![first, second]);
|
||
assert_eq!(registry.by_id.get(id), Some(&0));
|
||
assert_eq!(registry.specs.len(), 2);
|
||
}
|
||
}
|