basically failed (too much code, slower (macros), no new features)

.gitignore

@@ -1,2 +1 @@
 /target
-perf.data*

Cargo.toml

@@ -1,53 +1,13 @@
 [package]
-name = "iris"
-version.workspace = true
-edition.workspace = true
-
-[features]
-layout-diagnostics = ["iris-core/layout-diagnostics"]
+name = "gui"
+version = "0.1.0"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-iris-core = { workspace = true }
-iris-macro = { workspace = true }
-parley = { workspace = true }
-winit = { workspace = true }
-arboard = { workspace = true, features = ["wayland-data-control"] }
-pollster = { workspace = true }
-wgpu = { workspace = true }
-image = { workspace = true }
-tokio = { workspace = true, features = ["sync", "rt", "rt-multi-thread"] }
-
-[dev-dependencies]
-tokio = { workspace = true, features = ["sync", "rt", "rt-multi-thread", "time"] }
-
-[workspace]
-members = ["core", "macro", "rig-input"]
-
-[profile.dev]
-debug = 1
-
-[profile.test]
-debug = "line-tables-only"
-
-[workspace.package]
-version = "0.1.0"
-edition = "2024"
-
-[workspace.dependencies]
 pollster = "0.4.0"
-winit = "0.30.12"
-wgpu = "30.0.1"
+winit = "0.30.11"
+wgpu = "26.0.1"
 bytemuck = "1.23.1"
-image = "0.25.10"
-parley = "0.11.1"
-swash = "0.2.10"
-fxhash = "0.2.1"
-log = "0.4.29"
-arboard = "3.6.1"
-iris-core = { path = "core" }
-iris-macro = { path = "macro" }
-tokio = "1.49.0"
-wayland-client = "0.31.15"
-wayland-protocols-wlr = { version = "0.3.12", features = ["client"] }
+

TODO

@@ -1,26 +0,0 @@
-images
-    settings (sampler)
-    consider typed TextureHandle<T> variants for distinct texture uses
-
-WidgetRef<W> or smth instead of Id
-    enum that's either an Id or an actual concrete instance of W
-    painter takes them in instead of (or in addition to) id
-    then type wrapper widgets to contain them
-    allows for compile time optimization if a widget wrapper's inner is known at compile time
-        and the id of inner is not needed anywhere
-    maybe introduce InnerWidget trait to allow for editors to expose & modify inner type
-    maybe could also store a parent widget and keep using InnerWidget trait? unsure if possible
-
-vecs for each widget type?
-
-POTENTIAL BUG: closures that store IDs will not decrement the id!!! need to not increment id if moved into closure somehow??? wait no, need to decrement ID every time an event fn is added...... only if the id is used in it..??
-
-transforms on a move entry (scale + rotation)
-    an entry is a translation today; composing through one scales the rel
-    part and passes px through untouched, so fixed-size content and glyphs
-    do not follow a shortened entry
-    want a real transform per entry, resolved in resolve_move the way the
-    translation already is, so a whole subtree transforms with one buffer
-    write and no redraw
-    wanted for compose-style stretch at the end of a scroll area, and for
-    rotation generally

core/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "iris-core"
-version.workspace = true
-edition.workspace = true
-
-[features]
-layout-diagnostics = []
-
-[dependencies]
-wgpu = { workspace = true }
-bytemuck ={ workspace = true }
-image = { workspace = true }
-parley = { workspace = true }
-swash = { workspace = true }
-fxhash = { workspace = true }
-log = { workspace = true }

core/src/attr.rs

@@ -1,23 +0,0 @@
-use crate::{UiRsc, WeakWidget, WidgetIdFn, WidgetLike};
-
-pub trait WidgetAttr<Rsc, W: ?Sized> {
-    type Input;
-    fn run(rsc: &mut Rsc, id: WeakWidget<W>, input: Self::Input);
-}
-
-pub trait Attrable<Rsc, W: ?Sized, Tag> {
-    fn attr<A: WidgetAttr<Rsc, W>>(self, input: A::Input) -> impl WidgetIdFn<Rsc, W>;
-}
-
-impl<Rsc: UiRsc, WL: WidgetLike<Rsc, Tag>, Tag> Attrable<Rsc, WL::Widget, Tag> for WL {
-    fn attr<A: WidgetAttr<Rsc, WL::Widget>>(
-        self,
-        input: A::Input,
-    ) -> impl WidgetIdFn<Rsc, WL::Widget> {
-        |rsc| {
-            let id = self.add(rsc);
-            A::run(rsc, id, input);
-            id
-        }
-    }
-}

core/src/event/ctx.rs

@@ -1,18 +0,0 @@
-use crate::{HasEvents, WeakWidget, Widget};
-
-pub struct EventCtx<'a, Rsc: HasEvents, Data> {
-    pub state: &'a mut Rsc::State,
-    pub data: Data,
-}
-
-pub struct EventIdCtx<'a, Rsc: HasEvents, Data, W: ?Sized> {
-    pub widget: WeakWidget<W>,
-    pub state: &'a mut Rsc::State,
-    pub data: Data,
-}
-
-impl<Rsc: HasEvents, Data, W: Widget> EventIdCtx<'_, Rsc, Data, W> {
-    pub fn widget<'a>(&self, rsc: &'a mut Rsc) -> &'a mut W {
-        &mut rsc.ui_mut().widgets[self.widget]
-    }
-}

core/src/event/manager.rs

@@ -1,162 +0,0 @@
-use crate::{
-    ActiveData, Event, EventCtx, EventFn, EventIdCtx, EventLike, HasEvents, IdLike, LayerId,
-    WeakWidget, WidgetEventFn, WidgetId,
-    util::{HashMap, HashSet, TypeMap},
-};
-use std::{any::TypeId, rc::Rc};
-
-pub struct EventManager<Rsc> {
-    widget_to_types: HashMap<WidgetId, HashSet<TypeId>>,
-    types: TypeMap<dyn EventManagerLike<Rsc>>,
-}
-
-impl<Rsc> Default for EventManager<Rsc> {
-    fn default() -> Self {
-        Self {
-            widget_to_types: Default::default(),
-            types: Default::default(),
-        }
-    }
-}
-
-impl<Rsc: HasEvents + 'static> EventManager<Rsc> {
-    pub fn get_type<E: EventLike>(&mut self) -> &mut TypeEventManager<Rsc, E::Event> {
-        self.types.type_or_default()
-    }
-
-    pub fn register<I: IdLike + 'static, E: EventLike>(
-        &mut self,
-        id: I,
-        event: E,
-        f: impl for<'a> WidgetEventFn<Rsc, <E::Event as Event>::Data<'a>, I::Widget>,
-    ) {
-        let i = id.id();
-        self.get_type::<E>().register(id, event, f);
-        self.widget_to_types
-            .entry(i)
-            .or_default()
-            .insert(Self::type_key::<E>());
-    }
-
-    pub fn type_key<E: EventLike>() -> TypeId {
-        TypeId::of::<TypeEventManager<Rsc, E::Event>>()
-    }
-}
-
-pub trait EventsLike {
-    fn remove(&mut self, id: WidgetId);
-    fn draw(&mut self, active: &ActiveData);
-    fn undraw(&mut self, active: &ActiveData);
-}
-
-impl<Rsc: HasEvents + 'static> EventsLike for EventManager<Rsc> {
-    fn remove(&mut self, id: WidgetId) {
-        for t in self.widget_to_types.get(&id).into_flat_iter() {
-            self.types.get_mut(t).unwrap().remove(id);
-        }
-    }
-
-    fn draw(&mut self, active: &ActiveData) {
-        for t in self.widget_to_types.get(&active.id).into_flat_iter() {
-            self.types.get_mut(t).unwrap().draw(active);
-        }
-    }
-
-    fn undraw(&mut self, active: &ActiveData) {
-        for t in self.widget_to_types.get(&active.id).into_flat_iter() {
-            self.types.get_mut(t).unwrap().undraw(active);
-        }
-    }
-}
-
-pub trait EventManagerLike<State> {
-    fn remove(&mut self, id: WidgetId);
-    fn draw(&mut self, data: &ActiveData);
-    fn undraw(&mut self, data: &ActiveData);
-}
-
-type EventData<Rsc, E> = (E, Rc<dyn for<'a> EventFn<Rsc, <E as Event>::Data<'a>>>);
-pub struct TypeEventManager<Rsc: HasEvents, E: Event> {
-    // TODO: reduce visiblity!!
-    pub active: HashMap<LayerId, HashMap<WidgetId, E::State>>,
-    pub global: E::Global,
-    map: HashMap<WidgetId, Vec<EventData<Rsc, E>>>,
-}
-
-impl<Rsc: HasEvents, E: Event> EventManagerLike<Rsc> for TypeEventManager<Rsc, E> {
-    fn remove(&mut self, id: WidgetId) {
-        self.map.remove(&id);
-        for layer in self.active.values_mut() {
-            layer.remove(&id);
-        }
-    }
-    fn draw(&mut self, data: &ActiveData) {
-        self.active
-            .entry(data.layer)
-            .or_default()
-            .entry(data.id)
-            .or_default();
-    }
-    fn undraw(&mut self, data: &ActiveData) {
-        if let Some(layer) = self.active.get_mut(&data.layer) {
-            layer.remove(&data.id);
-        }
-    }
-}
-
-impl<Rsc: HasEvents, E: Event> Default for TypeEventManager<Rsc, E> {
-    fn default() -> Self {
-        Self {
-            active: Default::default(),
-            global: Default::default(),
-            map: Default::default(),
-        }
-    }
-}
-
-impl<Rsc: HasEvents + 'static, E: Event> TypeEventManager<Rsc, E> {
-    fn register<I: IdLike + 'static>(
-        &mut self,
-        widget: I,
-        event: impl EventLike<Event = E>,
-        f: impl for<'a> WidgetEventFn<Rsc, E::Data<'a>, I::Widget>,
-    ) {
-        let event = event.into_event();
-        self.map.entry(widget.id()).or_default().push((
-            event,
-            Rc::new(move |ctx, rsc| {
-                f(
-                    EventIdCtx {
-                        widget: WeakWidget::new(widget.id()),
-                        state: ctx.state,
-                        data: ctx.data,
-                    },
-                    rsc,
-                );
-            }),
-        ));
-    }
-
-    pub fn run_fn<'a>(
-        &mut self,
-        id: impl IdLike,
-    ) -> impl for<'b> FnOnce(EventCtx<'_, Rsc, E::Data<'b>>, &mut Rsc) -> bool + 'a {
-        let fs = self.map.get(&id.id()).cloned().unwrap_or_default();
-        move |ctx, rsc| {
-            let mut consumed = false;
-            for (e, f) in fs {
-                if let Some(data) = e.should_run(&ctx.data) {
-                    consumed |= e.consumes(&data);
-                    f(
-                        EventCtx {
-                            state: ctx.state,
-                            data,
-                        },
-                        rsc,
-                    )
-                }
-            }
-            consumed
-        }
-    }
-}

core/src/event/mod.rs

@@ -1,53 +0,0 @@
-mod ctx;
-mod manager;
-mod rsc;
-
-pub use ctx::*;
-pub use manager::*;
-pub use rsc::*;
-
-pub trait Event: Sized + 'static + Clone {
-    type Data<'a>: Clone = ();
-    type State: Default = ();
-    /// State the whole event type keeps, rather than one copy per widget.
-    type Global: Default = ();
-    #[allow(unused_variables)]
-    fn should_run<'a>(&self, data: &Self::Data<'a>) -> Option<Self::Data<'a>> {
-        Some(data.clone())
-    }
-
-    /// Whether having run on this data uses up whatever triggered it, so
-    /// nothing further should see it.
-    #[allow(unused_variables)]
-    fn consumes(&self, data: &Self::Data<'_>) -> bool {
-        false
-    }
-}
-
-pub trait EventLike {
-    type Event: Event;
-    fn into_event(self) -> Self::Event;
-}
-
-impl<E: Event> EventLike for E {
-    type Event = Self;
-
-    fn into_event(self) -> Self::Event {
-        self
-    }
-}
-
-pub trait EventFn<Rsc: HasEvents, Data>: Fn(EventCtx<Rsc, Data>, &mut Rsc) + 'static {}
-impl<Rsc: HasEvents, F: Fn(EventCtx<Rsc, Data>, &mut Rsc) + 'static, Data> EventFn<Rsc, Data>
-    for F
-{
-}
-
-pub trait WidgetEventFn<Rsc: HasEvents, Data, W: ?Sized>:
-    Fn(EventIdCtx<Rsc, Data, W>, &mut Rsc) + 'static
-{
-}
-impl<Rsc: HasEvents, F: Fn(EventIdCtx<Rsc, Data, W>, &mut Rsc) + 'static, Data, W: ?Sized>
-    WidgetEventFn<Rsc, Data, W> for F
-{
-}

core/src/event/rsc.rs

@@ -1,35 +0,0 @@
-use crate::{
-    Event, EventCtx, EventLike, EventManager, IdLike, UiRsc, WeakWidget, Widget, WidgetEventFn,
-};
-
-pub trait HasState: 'static {
-    type State;
-}
-
-pub trait HasEvents: Sized + UiRsc + HasState {
-    fn events(&self) -> &EventManager<Self>;
-    fn events_mut(&mut self) -> &mut EventManager<Self>;
-
-    fn register_event<W: Widget + ?Sized, E: EventLike>(
-        &mut self,
-        id: WeakWidget<W>,
-        event: E,
-        f: impl for<'a> WidgetEventFn<Self, <E::Event as Event>::Data<'a>, W>,
-    ) {
-        self.events_mut().register(id, event, f);
-    }
-}
-
-pub trait RunEvents: HasEvents {
-    /// Whether anything that ran used up what triggered it.
-    fn run_event<E: EventLike>(
-        &mut self,
-        id: impl IdLike,
-        data: <E::Event as Event>::Data<'_>,
-        state: &mut Self::State,
-    ) -> bool {
-        let f = self.events_mut().get_type::<E>().run_fn(id);
-        f(EventCtx { state, data }, self)
-    }
-}
-impl<T: HasEvents> RunEvents for T {}

core/src/fixed.rs

@@ -1,574 +0,0 @@
-use crate::{UiNum, util::Vec2};
-use std::{
-    fmt::{Debug, Display, Formatter},
-    ops::{Add, AddAssign, Div, Mul, Neg, Sub, SubAssign},
-};
-
-/// A number held as a whole count of `1 / 2^SHIFT`.
-///
-/// Layout reaches one place by more than one route -- a box composed down the
-/// chain, and the same box summed from what its children asked for -- and has
-/// to decide whether the two are the same place. In floats they land a few
-/// bits apart, which is a defect wherever the answer changes what is drawn
-/// rather than where. Here adding and subtracting are exact, a multiply
-/// drops to the step below, and a conversion between grids takes the nearest
-/// one, so two routes to one place land on one number and everything
-/// downstream compares for equality instead of for nearness.
-///
-/// `SHIFT` is the number of fractional bits, which is what makes the steps
-/// divide a whole number: a power of two also converts to `f32` without
-/// rounding while the value fits in its mantissa.
-///
-/// Arithmetic wraps at the ends of the range, the way the `i32` underneath
-/// does. Saturating instead was measured at a twelfth of layout's
-/// instructions -- five per add against one -- to keep the ordering of
-/// coordinates two million pixels out, where nothing draws anyway. A value
-/// off the end is a defect either way; wrapping makes it an obvious one.
-/// Only [`Self::from_f32`] clamps, since a float has further to come from.
-#[repr(transparent)]
-#[derive(
-    Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, bytemuck::Pod, bytemuck::Zeroable,
-)]
-pub struct Fixed<const SHIFT: u32>(i32);
-
-/// A length or a coordinate in pixels, in steps of `1/1024`. Finer than
-/// anything a display can show, and exact in `f32` up to 16,384 px, which is
-/// what lets the same number reach the GPU.
-pub type Px = Fixed<PX_SHIFT>;
-
-/// How many bits of a pixel a [`Px`] keeps. One place, because [`PxVec2`]
-/// and the shader's own decoding are the same grid or nothing lines up.
-pub const PX_SHIFT: u32 = 10;
-
-/// A share of what a box has left over, which is a weight beside its
-/// siblings rather than a fraction of anything: a list divides its room by
-/// the total of these, so the range has to hold a whole list's worth and the
-/// precision only has to tell two weights apart.
-pub type Weight = Fixed<16>;
-
-/// A fraction of a box. Twenty-four bits of it, which matches `f32` around a
-/// half and beats it above one -- where anchors actually sit -- and leaves
-/// +/-128 of range, enough to sum a hundred children each asking for a whole
-/// box. A `leftover` weight is not one of these: it is a share of what is
-/// left rather than a fraction of anything, and it sums over a whole list.
-pub type Rel = Fixed<REL_SHIFT>;
-
-/// How many bits of a box a [`Rel`] keeps, beside [`PX_SHIFT`] and for the
-/// same reason.
-pub const REL_SHIFT: u32 = 24;
-
-impl<const SHIFT: u32> Fixed<SHIFT> {
-    pub const ZERO: Self = Self(0);
-    pub const ONE: Self = Self::one();
-    /// The gap between neighbouring values, which is also how far apart two
-    /// numbers can be and still mean the same place.
-    pub const STEP: Self = Self(1);
-    /// Also what stands in for an unbounded end: compared against, never
-    /// added to, since arithmetic wraps past it.
-    pub const MIN: Self = Self(i32::MIN);
-    pub const MAX: Self = Self(i32::MAX);
-
-    const fn one() -> Self {
-        assert!(SHIFT < 31, "a Fixed needs a bit for the whole part");
-        Self(1 << SHIFT)
-    }
-
-    pub const fn from_raw(raw: i32) -> Self {
-        Self(raw)
-    }
-
-    /// The count of steps, for a caller that needs the representation rather
-    /// than the number.
-    pub const fn raw(self) -> i32 {
-        self.0
-    }
-
-    pub const fn from_int(v: i32) -> Self {
-        Self(v.wrapping_mul(Self::one().0))
-    }
-
-    /// Rounds to the nearest step, and clamps to the ends of the grid rather
-    /// than wrapping: this is where a number from outside arrives, and a float
-    /// has the range to be anywhere. A NaN has no nearest step and becomes
-    /// zero, which is a caller's mistake rather than a value worth carrying.
-    ///
-    /// Half-away is written out rather than called through `f32::round`,
-    /// which is not `const`: a layout constant has to stay a constant.
-    pub const fn from_f32(v: f32) -> Self {
-        debug_assert!(!v.is_nan(), "a NaN has no place on the grid");
-        let scaled = v * Self::one().0 as f32;
-        // Above 2^23 an `f32` has no fractional part left to round, and
-        // adding a half there rounds the number itself up instead. The cast
-        // saturates at both ends and sends NaN to zero, which is the
-        // behaviour wanted at both.
-        const WHOLE: f32 = (1 << 23) as f32;
-        Self(match (scaled >= WHOLE, scaled <= -WHOLE, scaled < 0.0) {
-            (true, _, _) | (_, true, _) => scaled as i32,
-            (_, _, true) => (scaled - 0.5) as i32,
-            _ => (scaled + 0.5) as i32,
-        })
-    }
-
-    /// The first step at or above `v`, where [`Self::from_f32`] takes the
-    /// nearest one and is below it half the time. For a bound that has to
-    /// admit the value it came from: a measurement rounded down is a bound
-    /// that leaves out the thing it was measured from.
-    pub const fn ceil_from_f32(v: f32) -> Self {
-        let nearest = Self::from_f32(v);
-        match nearest.to_f32() < v {
-            true => nearest.next_up(),
-            false => nearest,
-        }
-    }
-
-    /// From a number as it is written in source -- `16`, `1.5` -- which is
-    /// the other place a value enters the grid.
-    pub fn from_num(v: impl UiNum) -> Self {
-        Self::from_f32(v.to_f32())
-    }
-
-    pub const fn to_f32(self) -> f32 {
-        self.0 as f32 / Self::one().0 as f32
-    }
-
-    /// The same value on another grid, rounded where the new one is coarser.
-    pub const fn to_scale<const TO: u32>(self) -> Fixed<TO> {
-        Fixed(match TO >= SHIFT {
-            true => self.0 << (TO - SHIFT),
-            false => shift_round(self.0 as i64, SHIFT - TO) as i32,
-        })
-    }
-
-    pub const fn add(self, rhs: Self) -> Self {
-        Self(self.0.wrapping_add(rhs.0))
-    }
-
-    pub const fn sub(self, rhs: Self) -> Self {
-        Self(self.0.wrapping_sub(rhs.0))
-    }
-
-    pub const fn neg(self) -> Self {
-        Self(self.0.wrapping_neg())
-    }
-
-    /// Scaled by a number on any grid, which is how a length takes a fraction
-    /// of itself and keeps being a length: the product is measured in the
-    /// receiver's steps.
-    ///
-    /// Dropped to the step below rather than taken to the nearest one
-    /// (Bryan, 2026-09-16), which costs a share a thousandth of a pixel of
-    /// its row -- less than an even number of pixels draws. Toward negative
-    /// infinity on both sides of zero, since that is a shift and nothing
-    /// else: a value and its negation therefore land different distances
-    /// from where they came, so a flipped span can sit a step from its
-    /// mirror image.
-    pub const fn mul<const BY: u32>(self, by: Fixed<BY>) -> Self {
-        Self(((self.0 as i64 * by.0 as i64) >> BY) as i32)
-    }
-
-    /// Repeated a whole number of times, which no grid rounds.
-    pub const fn mul_int(self, by: i32) -> Self {
-        Self(self.0.wrapping_mul(by))
-    }
-
-    /// Divided into a whole number of parts, rounded to the nearest step.
-    pub const fn div_int(self, by: i32) -> Self {
-        debug_assert!(by != 0, "no part of nothing");
-        if by == 0 {
-            return Self::ZERO;
-        }
-        Self(div_round(self.0 as i64, by as i64) as i32)
-    }
-
-    /// Divided by a number on any grid. A zero divisor is a caller bug -- a
-    /// box of no length has no fraction of itself -- and answers with the end
-    /// of the range so that a release build lays out something absurd rather
-    /// than dying.
-    pub const fn div<const BY: u32>(self, by: Fixed<BY>) -> Self {
-        debug_assert!(by.0 != 0, "dividing by a length of zero");
-        if by.0 == 0 {
-            return match self.0 < 0 {
-                true => Self::MIN,
-                false => Self::MAX,
-            };
-        }
-        Self(div_round((self.0 as i64) << BY, by.0 as i64) as i32)
-    }
-
-    /// `num / den` on *this* grid rather than on theirs, for weights coarser
-    /// than the share they divide.
-    pub const fn ratio<const OF: u32>(num: Fixed<OF>, den: Fixed<OF>) -> Self {
-        debug_assert!(den.0 != 0, "no part of a whole of nothing");
-        if den.0 == 0 {
-            return Self::ZERO;
-        }
-        Self(div_round((num.0 as i64) << SHIFT, den.0 as i64) as i32)
-    }
-
-    /// `from` and `to` a fraction of the way apart, the fraction being the
-    /// receiver -- the argument order [`crate::util::LerpUtil`] already uses.
-    pub const fn lerp<const OF: u32>(self, from: Fixed<OF>, to: Fixed<OF>) -> Fixed<OF> {
-        from.add(to.sub(from).mul(self))
-    }
-
-    pub const fn min(self, other: Self) -> Self {
-        match self.0 < other.0 {
-            true => self,
-            false => other,
-        }
-    }
-
-    pub const fn max(self, other: Self) -> Self {
-        match self.0 > other.0 {
-            true => self,
-            false => other,
-        }
-    }
-
-    pub const fn abs(self) -> Self {
-        Self(self.0.wrapping_abs())
-    }
-
-    pub const fn clamp(self, lo: Self, hi: Self) -> Self {
-        debug_assert!(lo.0 <= hi.0, "an empty clamp has no answer");
-        self.max(lo).min(hi)
-    }
-
-    /// The next value along, for an interval that must not admit its own
-    /// boundary. The step is the whole gap, so there is nothing to exclude
-    /// between this and the boundary itself.
-    pub const fn next_up(self) -> Self {
-        Self(self.0.wrapping_add(1))
-    }
-
-    pub const fn next_down(self) -> Self {
-        Self(self.0.wrapping_sub(1))
-    }
-}
-
-/// Back to a single step, rounding halves away from zero so that a value and
-/// its negation round to the same distance.
-const fn shift_round(v: i64, bits: u32) -> i64 {
-    let half = (1i64 << bits) >> 1;
-    match v < 0 {
-        true => -((-v + half) >> bits),
-        false => (v + half) >> bits,
-    }
-}
-
-const fn div_round(num: i64, den: i64) -> i64 {
-    let (q, rem) = (num / den, num % den);
-    match rem.unsigned_abs() * 2 >= den.unsigned_abs() {
-        true => match (num < 0) == (den < 0) {
-            true => q + 1,
-            false => q - 1,
-        },
-        false => q,
-    }
-}
-
-/// Toward positive infinity when `up`, toward negative infinity otherwise.
-pub(crate) const fn div_toward(num: i64, den: i64, up: bool) -> i64 {
-    let (q, rem) = (num / den, num % den);
-    if rem == 0 {
-        return q;
-    }
-    match (rem < 0) == (den < 0) {
-        true => q + up as i64,
-        false => q - !up as i64,
-    }
-}
-
-/// Clamped to the ends, unlike a [`Fixed`]'s own arithmetic: a range of box
-/// lengths that runs past `i32` really is unbounded.
-pub(crate) const fn narrow(v: i64) -> i32 {
-    if v > i32::MAX as i64 {
-        return i32::MAX;
-    }
-    if v < i32::MIN as i64 {
-        return i32::MIN;
-    }
-    v as i32
-}
-
-const impl<const SHIFT: u32> Add for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self {
-        Fixed::add(self, rhs)
-    }
-}
-
-const impl<const SHIFT: u32> Sub for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self {
-        Fixed::sub(self, rhs)
-    }
-}
-
-const impl<const SHIFT: u32> Neg for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn neg(self) -> Self {
-        Fixed::neg(self)
-    }
-}
-
-const impl<const SHIFT: u32> AddAssign for Fixed<SHIFT> {
-    fn add_assign(&mut self, rhs: Self) {
-        *self = Fixed::add(*self, rhs);
-    }
-}
-
-const impl<const SHIFT: u32> SubAssign for Fixed<SHIFT> {
-    fn sub_assign(&mut self, rhs: Self) {
-        *self = Fixed::sub(*self, rhs);
-    }
-}
-
-const impl<const SHIFT: u32, const BY: u32> Mul<Fixed<BY>> for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn mul(self, rhs: Fixed<BY>) -> Self {
-        Fixed::mul(self, rhs)
-    }
-}
-
-const impl<const SHIFT: u32, const BY: u32> Div<Fixed<BY>> for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn div(self, rhs: Fixed<BY>) -> Self {
-        Fixed::div(self, rhs)
-    }
-}
-
-impl<const SHIFT: u32> Display for Fixed<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        Display::fmt(&self.to_f32(), f)
-    }
-}
-
-/// Prints the number rather than the count of steps: a failing layout test
-/// reports boxes, and `1126` is not a height anybody can read.
-impl<const SHIFT: u32> Debug for Fixed<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        Display::fmt(&self.to_f32(), f)
-    }
-}
-
-/// Two of them, for the places a size or a position needs both axes: a
-/// window, a box in pixels, a pointer. Held apart from [`crate::util::Vec2`]
-/// because that one is what the GPU and the platform speak.
-#[repr(C)]
-#[derive(Clone, Copy, PartialEq, Eq, Hash, Default)]
-pub struct FixedVec2<const SHIFT: u32> {
-    pub x: Fixed<SHIFT>,
-    pub y: Fixed<SHIFT>,
-}
-
-pub type PxVec2 = FixedVec2<PX_SHIFT>;
-
-impl<const SHIFT: u32> FixedVec2<SHIFT> {
-    pub const ZERO: Self = Self::splat(Fixed::ZERO);
-
-    pub const fn new(x: Fixed<SHIFT>, y: Fixed<SHIFT>) -> Self {
-        Self { x, y }
-    }
-
-    pub const fn splat(v: Fixed<SHIFT>) -> Self {
-        Self { x: v, y: v }
-    }
-
-    pub fn from_f32(v: Vec2) -> Self {
-        Self::new(Fixed::from_f32(v.x), Fixed::from_f32(v.y))
-    }
-
-    /// The first step at or above each part, for a measurement reported as a
-    /// box: what it occupies is not less than what was measured.
-    pub fn ceil_from_f32(v: Vec2) -> Self {
-        Self::new(Fixed::ceil_from_f32(v.x), Fixed::ceil_from_f32(v.y))
-    }
-
-    pub fn to_f32(self) -> Vec2 {
-        Vec2::new(self.x.to_f32(), self.y.to_f32())
-    }
-
-    pub const fn div_int(self, by: i32) -> Self {
-        Self::new(self.x.div_int(by), self.y.div_int(by))
-    }
-
-    pub const fn min(self, other: Self) -> Self {
-        Self::new(self.x.min(other.x), self.y.min(other.y))
-    }
-
-    pub const fn max(self, other: Self) -> Self {
-        Self::new(self.x.max(other.x), self.y.max(other.y))
-    }
-}
-
-// `impl_op!` names one concrete type, and this one is generic.
-const impl<const SHIFT: u32> Add for FixedVec2<SHIFT> {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self {
-        Self::new(self.x.add(rhs.x), self.y.add(rhs.y))
-    }
-}
-
-const impl<const SHIFT: u32> Sub for FixedVec2<SHIFT> {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self {
-        Self::new(self.x.sub(rhs.x), self.y.sub(rhs.y))
-    }
-}
-
-const impl<const SHIFT: u32> AddAssign for FixedVec2<SHIFT> {
-    fn add_assign(&mut self, rhs: Self) {
-        *self = Add::add(*self, rhs);
-    }
-}
-
-const impl<const SHIFT: u32> SubAssign for FixedVec2<SHIFT> {
-    fn sub_assign(&mut self, rhs: Self) {
-        *self = Sub::sub(*self, rhs);
-    }
-}
-
-impl<const SHIFT: u32> Debug for FixedVec2<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}
-
-impl<const SHIFT: u32> Display for FixedVec2<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn a_sum_of_steps_does_not_drift() {
-        let mut at = Px::ZERO;
-        for _ in 0..20_000 {
-            at += Px::from_raw(3);
-        }
-        assert_eq!(at, Px::from_raw(60_000));
-        for _ in 0..20_000 {
-            at -= Px::from_raw(3);
-        }
-        assert_eq!(at, Px::ZERO);
-    }
-
-    #[test]
-    fn a_pixel_survives_the_trip_through_f32() {
-        for raw in [0, 1, -1, 64, -1000, 16_777_215, -16_777_215] {
-            let px = Px::from_raw(raw);
-            assert_eq!(Px::from_f32(px.to_f32()), px);
-        }
-    }
-
-    #[test]
-    fn a_fraction_of_a_length_is_a_length() {
-        let half = Px::from_int(100) * Rel::from_f32(0.5);
-        assert_eq!(half, Px::from_int(50));
-        assert_eq!(Px::from_int(100) * Rel::ONE, Px::from_int(100));
-        assert_eq!(Px::from_int(100) * Rel::ZERO, Px::ZERO);
-    }
-
-    /// Toward negative infinity on both sides of zero, which is what makes
-    /// it a shift rather than a shift and a sign branch -- and what makes a
-    /// value and its negation land different distances from where they came,
-    /// so a flipped span can sit a step from its mirror image.
-    #[test]
-    fn a_multiply_drops_to_the_step_below_on_both_sides_of_zero() {
-        // A step and a half of one, which has no step of its own.
-        let step_and_a_half = Rel::from_f32(1.5).div_int(Px::ONE.raw());
-        assert_eq!(Px::ONE * step_and_a_half, Px::from_raw(1));
-        assert_eq!(Px::ONE.neg() * step_and_a_half, Px::from_raw(-2));
-    }
-
-    /// A division rounds to the nearest step, so it cannot put back the
-    /// steps a truncating multiply dropped: a round trip comes back short,
-    /// never long, and by the few steps the two operations gave up.
-    #[test]
-    fn dividing_by_a_fraction_cannot_undo_a_truncating_multiply() {
-        let third = Rel::ONE / Rel::from_int(3);
-        let len = Px::from_int(300);
-        let back = len * third / third;
-        assert!(back <= len, "{back:?} is longer than {len:?}");
-        assert!(len - back <= Px::from_raw(3), "{back:?} against {len:?}");
-        assert_eq!(Px::from_int(100) / Rel::from_f32(0.5), Px::from_int(200));
-    }
-
-    /// The bound a greedy line break needs: the width it was measured at is
-    /// not on the grid, and the narrowest box the break still holds for is
-    /// the step at or above it, never the one below.
-    #[test]
-    fn a_ceiling_never_lands_below_the_number_it_came_from() {
-        let step = 1.0 / (1 << PX_SHIFT) as f32;
-        for n in 0..64 {
-            let v = 189.0 + n as f32 * step / 3.0;
-            let up = Px::ceil_from_f32(v);
-            assert!(up.to_f32() >= v, "{up:?} is below {v}");
-            assert!(
-                up.to_f32() - v < step,
-                "{up:?} is more than a step above {v}"
-            );
-        }
-        // An exact step is its own ceiling.
-        assert_eq!(Px::ceil_from_f32(189.5), Px::from_f32(189.5));
-    }
-
-    #[test]
-    fn a_number_from_outside_is_clamped_to_the_grid() {
-        assert_eq!(Px::from_f32(1e12), Px::MAX);
-        assert_eq!(Px::from_f32(-1e12), Px::MIN);
-    }
-
-    #[test]
-    fn a_coarser_grid_rounds_and_a_finer_one_does_not() {
-        // A third, which neither grid holds exactly.
-        let third = Rel::ONE / Rel::from_int(3);
-        assert_eq!(third.to_scale::<6>(), Fixed::<6>::from_raw(21));
-        let coarse = Fixed::<6>::from_raw(21);
-        assert_eq!(coarse.to_scale::<24>().to_scale::<6>(), coarse);
-    }
-
-    #[test]
-    fn lerp_takes_the_fraction_as_the_receiver() {
-        let (from, to) = (Px::from_int(10), Px::from_int(20));
-        assert_eq!(Rel::ZERO.lerp(from, to), from);
-        assert_eq!(Rel::ONE.lerp(from, to), to);
-        assert_eq!(Rel::from_f32(0.5).lerp(from, to), Px::from_int(15));
-        assert_eq!(Rel::from_f32(0.5).lerp(to, from), Px::from_int(15));
-    }
-
-    #[test]
-    fn a_ratio_is_finer_than_the_weights_it_divides() {
-        let (one, three) = (Weight::ONE, Weight::from_int(3));
-        // A third, which the weights' own grid could only hold to 1/65536.
-        assert_eq!(Rel::ratio(one, three), Rel::from_raw(5592405));
-        assert_eq!(Rel::ratio(three, three), Rel::ONE);
-        assert_eq!(Rel::ratio(Weight::ZERO, three), Rel::ZERO);
-    }
-
-    #[test]
-    fn nothing_sits_between_a_value_and_the_next_one() {
-        let at = Px::from_int(3);
-        assert_eq!(at.next_up().next_down(), at);
-        assert_eq!(at.next_up().raw() - at.raw(), 1);
-        assert!(at.next_down() < at && at < at.next_up());
-    }
-
-    #[test]
-    fn it_prints_the_number_rather_than_the_steps() {
-        assert_eq!(format!("{:?}", Px::from_f32(17.59375)), "17.59375");
-        assert_eq!(format!("{}", Px::from_int(-2)), "-2");
-    }
-}

core/src/layout_diagnostics.rs

@@ -1,490 +0,0 @@
-//! Opt-in counters and coarse timers for explaining CPU layout cost.
-//!
-//! Enable the `layout-diagnostics` feature. With it disabled, none of the
-//! instrumentation is compiled into Iris. The retained rig in
-//! `tests/layout_diagnostics.rs` is the ordinary entry point.
-//!
-//! Timers are inclusive: `update total` contains `full layout` or
-//! `incremental layout`, and `text render` contains shaping and glyph
-//! placement. They locate cost within one instrumented run and must not be
-//! added together. Use an uninstrumented build under `perf` for final CPU
-//! totals; counting every primitive and distinct widget deliberately perturbs
-//! the instrumented run.
-//!
-//! Call [`trace_widget`] before a frame to retain the ordered constraint,
-//! reuse, size, placement, and text events for one suspicious widget. The
-//! selection is a set and survives [`take`] until cleared.
-
-use crate::{Axis, LayoutHolds, LayoutLen, PxVec2, Size, UiRegion, UiVec2, WidgetId};
-use std::{
-    cell::RefCell,
-    collections::{HashMap, HashSet},
-    fmt::Write,
-    time::Instant,
-};
-
-/// Declares a counter or timer kind beside the name its report prints. Two
-/// lists in the same order was one list too many: a variant inserted without
-/// its label moving with it renames every total after it, and nothing says
-/// so.
-macro_rules! labelled {
-    ($(#[$meta:meta])* $vis:vis enum $Name:ident { $($variant:ident = $label:literal,)* }) => {
-        $(#[$meta])*
-        #[derive(Clone, Copy)]
-        $vis enum $Name { $($variant,)* }
-
-        impl $Name {
-            const COUNT: usize = [$($label,)*].len();
-            const NAMES: [&'static str; Self::COUNT] = [$($label,)*];
-        }
-    };
-}
-
-labelled! {
-    pub(crate) enum Counter {
-        Updates = "updates",
-        DrawRequests = "draw requests",
-        WidgetDraws = "widget draws",
-        RegionNodeDraws = "region-node draws",
-        SizeReads = "draw-result size reads",
-        HintHits = "hint hits",
-        HintMisses = "hint misses",
-        ReuseAttempts = "reuse attempts",
-        ReuseExact = "reuse exact",
-        ReuseMoved = "reuse moved",
-        ReuseDirty = "reuse: dirty",
-        ReuseUndrawn = "reuse: nothing drawn to keep",
-        ReuseWrongParent = "reuse: wrong parent",
-        ReuseRemapped = "reuse remapped",
-        ReuseOutside = "reuse: outside what it holds for",
-        ReuseWrongLayer = "reuse: another layer",
-        ReuseWrongNode = "reuse: region-node choice changed",
-        ReuseWrongMask = "reuse: a different inherited mask",
-        QueuePops = "redraw queue pops",
-        DepthReads = "depth reads",
-        LocalRedraws = "local redraws",
-        SizeChanges = "size changes",
-        ReaderEdges = "reader edges",
-        PrimitiveWrites = "primitive writes",
-        TextRenders = "text renders",
-        TextShapeHits = "text shape hits",
-        TextShapes = "text shapes",
-        TextBreaks = "text line breaks",
-        GlyphPlacements = "glyph placements",
-        OutsidePinnedLen = "reuse outside: the length it was pinned to",
-        OutsideRelBase = "reuse outside: a rel base",
-        OutsideRegion = "reuse outside: a region length",
-    }
-}
-
-labelled! {
-    pub(crate) enum TimerKind {
-        Update = "update total",
-        FullLayout = "full layout",
-        IncrementalLayout = "incremental layout",
-        TextRender = "text render",
-        TextShape = "text shape",
-        TextBreak = "text line break",
-        GlyphPlacement = "glyph placement",
-    }
-}
-
-#[derive(Clone)]
-pub struct Report {
-    counters: [u64; Counter::COUNT],
-    nanos: [u64; TimerKind::COUNT],
-    distinct_widgets: usize,
-    distinct_text_widgets: usize,
-    hot_widgets: Vec<Callsite>,
-    hot_text: Vec<Callsite>,
-    traces: Vec<TraceEvent>,
-}
-
-impl Default for Report {
-    fn default() -> Self {
-        Self {
-            counters: [0; Counter::COUNT],
-            nanos: [0; TimerKind::COUNT],
-            distinct_widgets: 0,
-            distinct_text_widgets: 0,
-            hot_widgets: Vec::new(),
-            hot_text: Vec::new(),
-            traces: Vec::new(),
-        }
-    }
-}
-
-impl Report {
-    pub fn counters(&self) -> impl Iterator<Item = (&'static str, u64)> + '_ {
-        Counter::NAMES.into_iter().zip(self.counters)
-    }
-
-    /// Inclusive elapsed time accumulated for each targeted operation.
-    pub fn timings_ns(&self) -> impl Iterator<Item = (&'static str, u64)> + '_ {
-        TimerKind::NAMES.into_iter().zip(self.nanos)
-    }
-
-    pub fn distinct_widgets(&self) -> usize {
-        self.distinct_widgets
-    }
-
-    pub fn distinct_text_widgets(&self) -> usize {
-        self.distinct_text_widgets
-    }
-
-    pub fn hot_widgets(&self) -> &[Callsite] {
-        &self.hot_widgets
-    }
-
-    pub fn hot_text(&self) -> &[Callsite] {
-        &self.hot_text
-    }
-
-    /// Ordered layout events for widgets selected with [`trace_widget`].
-    pub fn traces(&self) -> &[TraceEvent] {
-        &self.traces
-    }
-
-    /// Formats nonzero totals divided by `frames`.
-    pub fn per_frame(&self, frames: usize) -> String {
-        let divisor = frames.max(1) as f64;
-        let mut out = String::new();
-        for (name, value) in self.counters() {
-            if value != 0 {
-                let _ = writeln!(out, "  {name:<27} {:>12.2}", value as f64 / divisor);
-            }
-        }
-        if self.distinct_widgets != 0 {
-            let _ = writeln!(
-                out,
-                "  {:<27} {:>12}",
-                "distinct widgets", self.distinct_widgets
-            );
-        }
-        if self.distinct_text_widgets != 0 {
-            let _ = writeln!(
-                out,
-                "  {:<27} {:>12}",
-                "distinct text widgets", self.distinct_text_widgets
-            );
-        }
-        for (name, nanos) in self.timings_ns() {
-            if nanos != 0 {
-                let ms = nanos as f64 / divisor / 1_000_000.0;
-                let _ = writeln!(out, "  {name:<27} {ms:>12.3} ms");
-            }
-        }
-        if !self.hot_widgets.is_empty() {
-            let _ = writeln!(out, "  hottest widget draws:");
-            for callsite in &self.hot_widgets {
-                let calls = callsite.calls as f64 / divisor;
-                let _ = writeln!(
-                    out,
-                    "    {calls:>9.2}  {:?} {}",
-                    callsite.id, callsite.label
-                );
-            }
-        }
-        if !self.hot_text.is_empty() {
-            let _ = writeln!(out, "  hottest text renders:");
-            for callsite in &self.hot_text {
-                let calls = callsite.calls as f64 / divisor;
-                let _ = writeln!(
-                    out,
-                    "    {calls:>9.2}  {:>3} widths  {:?} {}",
-                    callsite.distinct_widths, callsite.id, callsite.label
-                );
-            }
-        }
-        if !self.traces.is_empty() {
-            let _ = writeln!(out, "  targeted layout trace:");
-            for event in &self.traces {
-                let _ = writeln!(out, "    {event:?}");
-            }
-        }
-        out
-    }
-}
-
-#[derive(Clone)]
-pub struct Callsite {
-    pub id: WidgetId,
-    pub label: String,
-    pub calls: u64,
-    pub distinct_widths: usize,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum ReuseOutcome {
-    Exact,
-    Moved,
-    Dirty,
-    WrongParent,
-    WrongLayer,
-    WrongMask,
-    WrongNode,
-    Remapped,
-    Outside,
-    Undrawn,
-}
-
-/// One targeted layout event. Events are retained in execution order, making
-/// repeated constraint paths visible without logging every widget globally.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum TraceEvent {
-    DrawRequest {
-        id: WidgetId,
-        parent: Option<WidgetId>,
-        region: UiRegion,
-        region_px: PxVec2,
-        region_node: bool,
-    },
-    Reuse {
-        id: WidgetId,
-        outcome: ReuseOutcome,
-    },
-    SizeReported {
-        id: WidgetId,
-        size: Size,
-    },
-    RegionNode {
-        id: WidgetId,
-        parent: WidgetId,
-        region: UiRegion,
-    },
-    SizeRead {
-        id: WidgetId,
-        reader: WidgetId,
-        size: Size,
-    },
-    HintRead {
-        id: WidgetId,
-        reader: WidgetId,
-        axis: Axis,
-        hint: Option<LayoutLen>,
-    },
-    TextRendered {
-        id: WidgetId,
-        width: Option<f32>,
-    },
-}
-
-#[derive(Default)]
-struct Calls {
-    label: String,
-    count: u64,
-    widths: HashSet<Option<u32>>,
-}
-
-#[derive(Default)]
-struct Current {
-    report: Report,
-    widgets: HashMap<WidgetId, Calls>,
-    text_widgets: HashMap<WidgetId, Calls>,
-    traced: HashSet<WidgetId>,
-}
-
-thread_local! {
-    static CURRENT: RefCell<Current> = RefCell::new(Current::default());
-}
-
-pub(crate) fn bump(counter: Counter) {
-    CURRENT.with_borrow_mut(|current| current.report.counters[counter as usize] += 1);
-}
-
-pub(crate) fn draw_widget(id: WidgetId, label: &str) {
-    CURRENT.with_borrow_mut(|current| {
-        let calls = current.widgets.entry(id).or_default();
-        if calls.label.is_empty() {
-            calls.label = label.to_owned();
-        }
-        calls.count += 1;
-    });
-}
-
-/// Adds a widget to the targeted trace set. Selection survives [`take`]
-/// until explicitly removed or cleared.
-pub fn trace_widget(id: impl Into<WidgetId>) {
-    CURRENT.with_borrow_mut(|current| {
-        current.traced.insert(id.into());
-    });
-}
-
-pub fn untrace_widget(id: impl Into<WidgetId>) {
-    CURRENT.with_borrow_mut(|current| {
-        current.traced.remove(&id.into());
-    });
-}
-
-pub fn clear_traced_widgets() {
-    CURRENT.with_borrow_mut(|current| current.traced.clear());
-}
-
-fn trace(id: WidgetId, event: TraceEvent) {
-    CURRENT.with_borrow_mut(|current| {
-        if current.traced.contains(&id) {
-            current.report.traces.push(event);
-        }
-    });
-}
-
-pub(crate) fn draw_request(
-    id: WidgetId,
-    parent: Option<WidgetId>,
-    region: UiRegion,
-    region_px: PxVec2,
-    region_node: bool,
-) {
-    trace(
-        id,
-        TraceEvent::DrawRequest {
-            id,
-            parent,
-            region,
-            region_px,
-            region_node,
-        },
-    );
-}
-
-pub(crate) fn reuse(id: WidgetId, outcome: ReuseOutcome) {
-    trace(id, TraceEvent::Reuse { id, outcome });
-}
-
-/// A drawing that cannot be reused because the box on offer is outside what
-/// it holds for, and which of the three contracts said so. They overlap: a
-/// drawing can be outside two of them at once, and counting each is what
-/// says where a rel base redrawing more than it should is coming from.
-pub(crate) fn outside(
-    id: WidgetId,
-    holds: LayoutHolds,
-    region: UiRegion,
-    rel_base: UiVec2,
-    window: PxVec2,
-) {
-    for axis in Axis::BOTH {
-        let holds = holds[axis];
-        let len = region[axis].len();
-        let window = window[axis];
-        if holds.region_len.is_some_and(|pinned| pinned != len) {
-            bump(Counter::OutsidePinnedLen);
-        }
-        if !holds.window.contains(window)
-            || holds
-                .rel_base
-                .is_some_and(|pinned| pinned != rel_base[axis])
-        {
-            bump(Counter::OutsideRelBase);
-        }
-        if !holds.region.contains(len.to_px(window)) {
-            bump(Counter::OutsideRegion);
-        }
-    }
-    bump(Counter::ReuseOutside);
-    reuse(id, ReuseOutcome::Outside);
-}
-
-pub(crate) fn size_reported(id: WidgetId, size: Size) {
-    trace(id, TraceEvent::SizeReported { id, size });
-}
-
-pub(crate) fn region_node(id: WidgetId, parent: WidgetId, region: UiRegion) {
-    trace(id, TraceEvent::RegionNode { id, parent, region });
-}
-
-pub(crate) fn size_read(id: WidgetId, reader: WidgetId, size: Size) {
-    trace(id, TraceEvent::SizeRead { id, reader, size });
-}
-
-pub(crate) fn hint_read(id: WidgetId, reader: WidgetId, axis: Axis, hint: Option<LayoutLen>) {
-    trace(
-        id,
-        TraceEvent::HintRead {
-            id,
-            reader,
-            axis,
-            hint,
-        },
-    );
-}
-
-pub(crate) fn render_text(id: WidgetId, label: &str, width: Option<f32>) {
-    CURRENT.with_borrow_mut(|current| {
-        let calls = current.text_widgets.entry(id).or_default();
-        if calls.label.is_empty() {
-            calls.label = label.to_owned();
-        }
-        calls.count += 1;
-        calls.widths.insert(width.map(f32::to_bits));
-        if current.traced.contains(&id) {
-            current
-                .report
-                .traces
-                .push(TraceEvent::TextRendered { id, width });
-        }
-    });
-}
-
-pub(crate) struct Timer {
-    kind: TimerKind,
-    start: Instant,
-}
-
-pub(crate) fn timer(kind: TimerKind) -> Timer {
-    Timer {
-        kind,
-        start: Instant::now(),
-    }
-}
-
-impl Drop for Timer {
-    fn drop(&mut self) {
-        let nanos = self.start.elapsed().as_nanos().min(u64::MAX as u128) as u64;
-        CURRENT.with_borrow_mut(|current| current.report.nanos[self.kind as usize] += nanos);
-    }
-}
-
-/// Takes all diagnostics accumulated on this thread and resets them.
-pub fn take() -> Report {
-    CURRENT.with_borrow_mut(|current| {
-        current.report.distinct_widgets = current.widgets.len();
-        current.report.distinct_text_widgets = current.text_widgets.len();
-        current.report.hot_widgets = hottest(&current.widgets);
-        current.report.hot_text = hottest(&current.text_widgets);
-        let report = std::mem::take(&mut current.report);
-        current.widgets.clear();
-        current.text_widgets.clear();
-        report
-    })
-}
-
-fn hottest(calls: &HashMap<WidgetId, Calls>) -> Vec<Callsite> {
-    let mut calls: Vec<_> = calls
-        .iter()
-        .map(|(&id, calls)| Callsite {
-            id,
-            label: calls.label.clone(),
-            calls: calls.count,
-            distinct_widths: calls.widths.len(),
-        })
-        .collect();
-    calls.sort_by(|a, b| b.calls.cmp(&a.calls).then_with(|| a.label.cmp(&b.label)));
-    calls.truncate(8);
-    calls
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn taking_a_report_resets_its_counters() {
-        let _ = take();
-        bump(Counter::Updates);
-        bump(Counter::Updates);
-
-        let report = take();
-        assert_eq!(report.counters().next(), Some(("updates", 2)));
-        assert!(take().counters().all(|(_, count)| count == 0));
-    }
-}

core/src/lib.rs

@@ -1,39 +0,0 @@
-#![feature(macro_metavar_expr_concat)]
-#![feature(const_ops)]
-#![feature(const_trait_impl)]
-#![feature(const_convert)]
-#![feature(unboxed_closures)]
-#![feature(fn_traits)]
-#![feature(const_destruct)]
-#![feature(associated_type_defaults)]
-#![feature(unsize)]
-#![feature(coerce_unsized)]
-#![feature(option_into_flat_iter)]
-#![feature(const_index)]
-
-#[cfg(feature = "layout-diagnostics")]
-pub mod layout_diagnostics;
-
-mod attr;
-mod event;
-mod fixed;
-mod num;
-mod orientation;
-mod primitive;
-mod render;
-mod ui;
-mod widget;
-
-pub mod util;
-
-pub use attr::*;
-pub use event::*;
-pub use fixed::*;
-pub use num::*;
-pub use orientation::*;
-pub use primitive::*;
-pub use render::*;
-pub use ui::*;
-pub use widget::*;
-
-pub type UiColor = primitive::Color<u8>;

core/src/num.rs

@@ -1,49 +0,0 @@
-use crate::util::Vec2;
-use std::marker::Destruct;
-
-pub const trait UiNum {
-    fn to_f32(self) -> f32;
-}
-
-const impl UiNum for f32 {
-    fn to_f32(self) -> f32 {
-        self
-    }
-}
-
-const impl UiNum for u32 {
-    fn to_f32(self) -> f32 {
-        self as f32
-    }
-}
-
-const impl UiNum for i32 {
-    fn to_f32(self) -> f32 {
-        self as f32
-    }
-}
-
-pub const fn vec2(x: impl const UiNum, y: impl const UiNum) -> Vec2 {
-    Vec2::new(x.to_f32(), y.to_f32())
-}
-
-const impl<T: const UiNum + Copy> From<T> for Vec2 {
-    fn from(v: T) -> Self {
-        Self {
-            x: v.to_f32(),
-            y: v.to_f32(),
-        }
-    }
-}
-
-const impl<T: const UiNum, U: const UiNum> From<(T, U)> for Vec2
-where
-    (T, U): const Destruct,
-{
-    fn from((x, y): (T, U)) -> Self {
-        Self {
-            x: x.to_f32(),
-            y: y.to_f32(),
-        }
-    }
-}

core/src/orientation/align.rs

@@ -1,222 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Px, Rel};
-
-use super::*;
-
-#[derive(Clone, Copy, PartialEq)]
-pub struct Align {
-    pub x: Option<AxisAlign>,
-    pub y: Option<AxisAlign>,
-}
-
-impl Align {
-    pub const TOP_LEFT: RegionAlign = RegionAlign::TOP_LEFT;
-    pub const TOP_CENTER: RegionAlign = RegionAlign::TOP_CENTER;
-    pub const TOP_RIGHT: RegionAlign = RegionAlign::TOP_RIGHT;
-    pub const CENTER_LEFT: RegionAlign = RegionAlign::CENTER_LEFT;
-    pub const CENTER: RegionAlign = RegionAlign::CENTER;
-    pub const CENTER_RIGHT: RegionAlign = RegionAlign::CENTER_RIGHT;
-    pub const BOT_LEFT: RegionAlign = RegionAlign::BOT_LEFT;
-    pub const BOT_CENTER: RegionAlign = RegionAlign::BOT_CENTER;
-    pub const BOT_RIGHT: RegionAlign = RegionAlign::BOT_RIGHT;
-    pub const LEFT: CardinalAlign = CardinalAlign::LEFT;
-    pub const H_CENTER: CardinalAlign = CardinalAlign::H_CENTER;
-    pub const RIGHT: CardinalAlign = CardinalAlign::RIGHT;
-    pub const TOP: CardinalAlign = CardinalAlign::TOP;
-    pub const V_CENTER: CardinalAlign = CardinalAlign::V_CENTER;
-    pub const BOT: CardinalAlign = CardinalAlign::BOT;
-
-    pub fn tuple(&self) -> (Option<AxisAlign>, Option<AxisAlign>) {
-        (self.x, self.y)
-    }
-}
-
-/// Where a widget sits in a box longer than it is. The default is the middle,
-/// because the two edges are the ones that assume a direction: which of them
-/// is the near one depends on the writing system and on which way a container
-/// runs, and the middle is the same either way.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct AxisAlign(Rel);
-
-impl AxisAlign {
-    pub const NEG: Self = Self::new(0.0);
-    pub const CENTER: Self = Self::new(0.5);
-    pub const POS: Self = Self::new(1.0);
-
-    pub const fn new(rel: f32) -> Self {
-        Self(Rel::from_f32(rel))
-    }
-
-    /// A fraction of the room left over, which is what the layout reads: the
-    /// three constants are the familiar places along it, not the only ones.
-    pub const fn rel(&self) -> Rel {
-        self.0
-    }
-}
-
-impl Default for AxisAlign {
-    fn default() -> Self {
-        Self::CENTER
-    }
-}
-
-pub struct CardinalAlign {
-    axis: Axis,
-    align: AxisAlign,
-}
-
-impl CardinalAlign {
-    pub const LEFT: Self = Self::new(Axis::X, AxisAlign::NEG);
-    pub const H_CENTER: Self = Self::new(Axis::X, AxisAlign::CENTER);
-    pub const RIGHT: Self = Self::new(Axis::X, AxisAlign::POS);
-    pub const TOP: Self = Self::new(Axis::Y, AxisAlign::NEG);
-    pub const V_CENTER: Self = Self::new(Axis::Y, AxisAlign::CENTER);
-    pub const BOT: Self = Self::new(Axis::Y, AxisAlign::POS);
-
-    pub const fn new(axis: Axis, align: AxisAlign) -> Self {
-        Self { axis, align }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub struct RegionAlign {
-    pub x: AxisAlign,
-    pub y: AxisAlign,
-}
-
-impl RegionAlign {
-    /// Both axes at the near edge: the start of a box in its own orientation.
-    pub const NEAR: Self = Self {
-        x: AxisAlign::NEG,
-        y: AxisAlign::NEG,
-    };
-}
-
-impl RegionAlign {
-    pub const TOP_LEFT: Self = Self::new(AxisAlign::NEG, AxisAlign::NEG);
-    pub const TOP_CENTER: Self = Self::new(AxisAlign::CENTER, AxisAlign::NEG);
-    pub const TOP_RIGHT: Self = Self::new(AxisAlign::POS, AxisAlign::NEG);
-    pub const CENTER_LEFT: Self = Self::new(AxisAlign::NEG, AxisAlign::CENTER);
-    pub const CENTER: Self = Self::new(AxisAlign::CENTER, AxisAlign::CENTER);
-    pub const CENTER_RIGHT: Self = Self::new(AxisAlign::POS, AxisAlign::CENTER);
-    pub const BOT_LEFT: Self = Self::new(AxisAlign::NEG, AxisAlign::POS);
-    pub const BOT_CENTER: Self = Self::new(AxisAlign::CENTER, AxisAlign::POS);
-    pub const BOT_RIGHT: Self = Self::new(AxisAlign::POS, AxisAlign::POS);
-
-    pub const fn new(x: AxisAlign, y: AxisAlign) -> Self {
-        Self { x, y }
-    }
-}
-
-impl UiVec2 {
-    pub fn partial_align(&self, align: Align) -> UiRegion {
-        UiRegion {
-            x: if let Some(align) = align.x {
-                self.x.align(align)
-            } else {
-                UiSpan::FULL
-            },
-            y: if let Some(align) = align.y {
-                self.y.align(align)
-            } else {
-                UiSpan::FULL
-            },
-        }
-    }
-
-    pub fn align(&self, align: RegionAlign) -> UiRegion {
-        UiRegion {
-            x: self.x.align(align.x),
-            y: self.y.align(align.y),
-        }
-    }
-}
-
-impl Vec2 {
-    pub fn partial_align(&self, align: Align) -> UiRegion {
-        let s = UiVec2::from(*self);
-        UiRegion {
-            x: if let Some(align) = align.x {
-                s.x.align(align)
-            } else {
-                UiSpan::FULL
-            },
-            y: if let Some(align) = align.y {
-                s.y.align(align)
-            } else {
-                UiSpan::FULL
-            },
-        }
-    }
-
-    pub fn align(&self, align: RegionAlign) -> UiRegion {
-        let s = UiVec2::from(*self);
-        UiRegion {
-            x: s.x.align(align.x),
-            y: s.y.align(align.y),
-        }
-    }
-}
-
-impl Len {
-    pub const fn align(&self, align: AxisAlign) -> UiSpan {
-        let rel = align.rel();
-        let rest = Rel::ONE.sub(rel);
-        let at = Len::from_parts(rel, Px::ZERO);
-        UiSpan {
-            start: Len::from_parts(at.rel.sub(self.rel.mul(rel)), at.px.sub(self.px.mul(rel))),
-            end: Len::from_parts(at.rel.add(self.rel.mul(rest)), at.px.add(self.px.mul(rest))),
-        }
-    }
-}
-
-impl From<RegionAlign> for Align {
-    fn from(region: RegionAlign) -> Self {
-        Self {
-            x: Some(region.x),
-            y: Some(region.y),
-        }
-    }
-}
-
-impl From<Align> for RegionAlign {
-    fn from(align: Align) -> Self {
-        Self {
-            x: align.x.unwrap_or(AxisAlign::CENTER),
-            y: align.y.unwrap_or(AxisAlign::CENTER),
-        }
-    }
-}
-
-impl From<CardinalAlign> for RegionAlign {
-    fn from(align: CardinalAlign) -> Self {
-        Align::from(align).into()
-    }
-}
-
-impl From<CardinalAlign> for Align {
-    fn from(cardinal: CardinalAlign) -> Self {
-        let align = Some(cardinal.align);
-        match cardinal.axis {
-            Axis::X => Self { x: align, y: None },
-            Axis::Y => Self { x: None, y: align },
-        }
-    }
-}
-
-const impl From<RegionAlign> for UiVec2 {
-    fn from(align: RegionAlign) -> Self {
-        Self::new(
-            Len::from_parts(align.x.rel(), Px::ZERO),
-            Len::from_parts(align.y.rel(), Px::ZERO),
-        )
-    }
-}
-
-impl RegionAlign {
-    pub const fn pos(self) -> UiVec2 {
-        UiVec2::from(self)
-    }
-}
-
-impl_axis_index!(RegionAlign => AxisAlign);

core/src/orientation/axis.rs

@@ -1,129 +0,0 @@
-use super::*;
-use crate::util::impl_axis_index;
-use crate::{Fixed, FixedVec2};
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum Axis {
-    X,
-    Y,
-}
-
-impl Axis {
-    /// Both of them, for the layout code that asks the same question of each.
-    pub const BOTH: [Self; 2] = [Self::X, Self::Y];
-
-    /// A per-axis pair with `aligned` on this axis and `ortho` on the other,
-    /// which is what `from_axis` does for a vector.
-    pub fn pair<T>(self, aligned: T, ortho: T) -> [T; 2] {
-        match self {
-            Self::X => [aligned, ortho],
-            Self::Y => [ortho, aligned],
-        }
-    }
-}
-
-impl std::ops::Not for Axis {
-    type Output = Self;
-
-    fn not(self) -> Self::Output {
-        match self {
-            Self::X => Self::Y,
-            Self::Y => Self::X,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Eq, PartialEq)]
-pub struct Dir {
-    pub axis: Axis,
-    pub sign: Sign,
-}
-
-impl Dir {
-    pub const fn new(axis: Axis, dir: Sign) -> Self {
-        Self { axis, sign: dir }
-    }
-
-    pub const LEFT: Self = Self::new(Axis::X, Sign::Neg);
-    pub const RIGHT: Self = Self::new(Axis::X, Sign::Pos);
-    pub const UP: Self = Self::new(Axis::Y, Sign::Neg);
-    pub const DOWN: Self = Self::new(Axis::Y, Sign::Pos);
-}
-
-#[derive(Clone, Copy, Eq, PartialEq)]
-pub enum Sign {
-    Neg,
-    Pos,
-}
-
-impl<const SHIFT: u32> FixedVec2<SHIFT> {
-    pub const fn from_axis(axis: Axis, aligned: Fixed<SHIFT>, ortho: Fixed<SHIFT>) -> Self {
-        match axis {
-            Axis::X => Self::new(aligned, ortho),
-            Axis::Y => Self::new(ortho, aligned),
-        }
-    }
-}
-
-impl Vec2 {
-    pub const fn from_axis(axis: Axis, aligned: f32, ortho: f32) -> Self {
-        Self {
-            x: match axis {
-                Axis::X => aligned,
-                Axis::Y => ortho,
-            },
-            y: match axis {
-                Axis::Y => aligned,
-                Axis::X => ortho,
-            },
-        }
-    }
-}
-
-pub const trait AxisT {
-    fn get() -> Axis;
-}
-
-pub struct XAxis;
-const impl AxisT for XAxis {
-    fn get() -> Axis {
-        Axis::X
-    }
-}
-
-pub struct YAxis;
-const impl AxisT for YAxis {
-    fn get() -> Axis {
-        Axis::Y
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct BothAxis<T> {
-    pub x: T,
-    pub y: T,
-}
-
-impl<T> BothAxis<T> {
-    pub const fn axis<A: const AxisT>(&mut self) -> &mut T {
-        match A::get() {
-            Axis::X => &mut self.x,
-            Axis::Y => &mut self.y,
-        }
-    }
-    pub fn take_axis<A: const AxisT>(self) -> T {
-        match A::get() {
-            Axis::X => self.x,
-            Axis::Y => self.y,
-        }
-    }
-    pub fn axis_dyn(&mut self, axis: Axis) -> &mut T {
-        match axis {
-            Axis::X => &mut self.x,
-            Axis::Y => &mut self.y,
-        }
-    }
-}
-
-impl_axis_index!({const SHIFT: u32} FixedVec2<SHIFT> => Fixed<SHIFT>);
-impl_axis_index!(Vec2 => f32);

core/src/orientation/len.rs

@@ -1,255 +0,0 @@
-use super::*;
-use crate::util::impl_axis_index;
-use crate::{Px, PxVec2, Rel, UiNum, Weight, util::impl_op};
-
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
-pub struct Size {
-    pub x: LayoutLen,
-    pub y: LayoutLen,
-}
-
-/// What a widget asks for along one axis: a [`Len`] -- pixels and a fraction
-/// of the box it is given -- plus a share of whatever is left over once
-/// everything fixed has been taken. The parts add up rather than choosing
-/// between one another.
-///
-/// Only a container dividing its room can answer a share, so a length nobody
-/// divides is a `Len`: a position, a padding, a cap, anything already
-/// resolved.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LayoutLen {
-    pub px: Px,
-    pub rel: Rel,
-    pub leftover: Weight,
-}
-
-impl<N: UiNum> From<N> for LayoutLen {
-    fn from(value: N) -> Self {
-        LayoutLen::px(value.to_f32())
-    }
-}
-
-impl<Nx: UiNum, Ny: UiNum> From<(Nx, Ny)> for Size {
-    fn from((x, y): (Nx, Ny)) -> Self {
-        Self {
-            x: x.into(),
-            y: y.into(),
-        }
-    }
-}
-
-/// A length with no share in it is a length a container does not have to
-/// divide, which is one it can always give.
-impl From<Len> for LayoutLen {
-    fn from(len: Len) -> Self {
-        Self {
-            px: len.px,
-            rel: len.rel,
-            leftover: Weight::ZERO,
-        }
-    }
-}
-
-impl From<LayoutLen> for Size {
-    fn from(value: LayoutLen) -> Self {
-        Self { x: value, y: value }
-    }
-}
-
-impl Size {
-    pub const ZERO: Self = Self {
-        x: LayoutLen::ZERO,
-        y: LayoutLen::ZERO,
-    };
-
-    pub const LEFTOVER: Self = Self {
-        x: LayoutLen::LEFTOVER,
-        y: LayoutLen::LEFTOVER,
-    };
-
-    /// From something measured outside layout -- a texture, a shaped line --
-    /// which is where a size in floats comes from.
-    pub fn px(v: Vec2) -> Self {
-        Self::from_px(PxVec2::from_f32(v))
-    }
-
-    pub const fn from_px(v: PxVec2) -> Self {
-        Self {
-            x: LayoutLen {
-                px: v.x,
-                ..LayoutLen::ZERO
-            },
-            y: LayoutLen {
-                px: v.y,
-                ..LayoutLen::ZERO
-            },
-        }
-    }
-
-    pub fn rel(v: Vec2) -> Self {
-        Self {
-            x: LayoutLen::rel(v.x),
-            y: LayoutLen::rel(v.y),
-        }
-    }
-
-    pub fn leftover(v: Vec2) -> Self {
-        Self {
-            x: LayoutLen::leftover(v.x),
-            y: LayoutLen::leftover(v.y),
-        }
-    }
-
-    pub fn to_uivec2(self) -> UiVec2 {
-        UiVec2 {
-            x: self.x.apply_leftover(),
-            y: self.y.apply_leftover(),
-        }
-    }
-
-    pub fn from_axis(axis: Axis, aligned: LayoutLen, ortho: LayoutLen) -> Self {
-        match axis {
-            Axis::X => Self {
-                x: aligned,
-                y: ortho,
-            },
-            Axis::Y => Self {
-                x: ortho,
-                y: aligned,
-            },
-        }
-    }
-}
-
-impl LayoutLen {
-    pub const ZERO: Self = Self {
-        px: Px::ZERO,
-        rel: Rel::ZERO,
-        leftover: Weight::ZERO,
-    };
-
-    pub const LEFTOVER: Self = Self {
-        px: Px::ZERO,
-        rel: Rel::ZERO,
-        leftover: Weight::ONE,
-    };
-
-    /// The whole of what is left over counts as the whole box, which is what
-    /// a length means to something that is not dividing a box between
-    /// siblings -- a scroll asking how long its content is.
-    pub fn apply_leftover(&self) -> Len {
-        let share = match self.leftover > Weight::ZERO {
-            true => Rel::ONE,
-            false => Rel::ZERO,
-        };
-        Len::from_parts(self.rel.add(share), self.px)
-    }
-
-    /// Only pixels: the same number of them whatever box it lands in, and
-    /// whatever anyone else in the row asks for. A length that is any part
-    /// of a box or of what is left over is not one.
-    pub fn is_px(self) -> bool {
-        self.rel == Rel::ZERO && self.leftover == Weight::ZERO
-    }
-
-    /// Nothing but a claim on what is left over, so there is no length here
-    /// at all where nothing is.
-    pub fn is_only_leftover(self) -> bool {
-        self.leftover > Weight::ZERO && self.without_leftover() == Len::ZERO
-    }
-
-    /// This as a length of a box, where it is one. `leftover` is not: a
-    /// share of what is left over is a length only to whoever divides one,
-    /// so it passes up in the reported size instead and is resolved there.
-    pub fn declared(self) -> Option<Len> {
-        (self.leftover == Weight::ZERO).then(|| self.without_leftover())
-    }
-
-    /// What this takes whatever is left over: the reading of a length for
-    /// anyone not dividing a box between siblings, where a share is a claim
-    /// on someone else's room rather than a length of its own.
-    /// [`Self::apply_leftover`] is the opposite reading of the same value.
-    pub const fn without_leftover(self) -> Len {
-        Len::from_parts(self.rel, self.px)
-    }
-
-    /// This length, given as a part of a box `len` long, as a part of the
-    /// box `len` is itself a part of. The share is untouched: it is a claim
-    /// on whoever divides the room, not a fraction of anything.
-    pub const fn within_len(self, len: Len) -> Self {
-        let part = self.without_leftover().within_len(len);
-        Self {
-            px: part.px,
-            rel: part.rel,
-            leftover: self.leftover,
-        }
-    }
-
-    pub fn px(px: impl UiNum) -> Self {
-        Self {
-            px: Px::from_num(px),
-            ..Self::ZERO
-        }
-    }
-    pub fn rel(rel: impl UiNum) -> Self {
-        Self {
-            rel: Rel::from_num(rel),
-            ..Self::ZERO
-        }
-    }
-    pub fn leftover(ratio: impl UiNum) -> Self {
-        Self {
-            leftover: Weight::from_num(ratio),
-            ..Self::ZERO
-        }
-    }
-}
-
-pub mod len_fns {
-    use super::*;
-
-    pub fn px(px: impl UiNum) -> LayoutLen {
-        LayoutLen::px(px)
-    }
-    pub fn rel(rel: impl UiNum) -> LayoutLen {
-        LayoutLen::rel(rel)
-    }
-    pub fn leftover(ratio: impl UiNum) -> LayoutLen {
-        LayoutLen::leftover(ratio)
-    }
-}
-
-impl_op!(same LayoutLen Add add; px rel leftover);
-impl_op!(same LayoutLen Sub sub; px rel leftover);
-
-impl_op!(same Size Add add; x y);
-impl_op!(same Size Sub sub; x y);
-
-impl Default for LayoutLen {
-    fn default() -> Self {
-        Self::leftover(1.0)
-    }
-}
-
-impl std::fmt::Display for Size {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}
-
-impl std::fmt::Display for LayoutLen {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.px != Px::ZERO {
-            write!(f, "{} px;", self.px)?;
-        }
-        if self.rel != Rel::ZERO {
-            write!(f, "{} rel;", self.rel)?;
-        }
-        if self.leftover != Weight::ZERO {
-            write!(f, "{} leftover;", self.leftover)?;
-        }
-        Ok(())
-    }
-}
-
-impl_axis_index!(Size => LayoutLen);

core/src/orientation/mod.rs

@@ -1,11 +0,0 @@
-mod align;
-mod axis;
-mod len;
-mod pos;
-
-use crate::util::Vec2;
-
-pub use align::*;
-pub use axis::*;
-pub use len::*;
-pub use pos::*;

core/src/orientation/pos.rs

@@ -1,437 +0,0 @@
-use crate::util::impl_axis_index;
-use std::{fmt::Display, marker::Destruct};
-
-use super::*;
-use crate::{Px, PxVec2, Rel, UiNum, util::impl_op};
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, bytemuck::Pod, bytemuck::Zeroable, Default)]
-pub struct UiVec2 {
-    pub x: Len,
-    pub y: Len,
-}
-
-impl UiVec2 {
-    pub const ZERO: Self = Self {
-        x: Len::ZERO,
-        y: Len::ZERO,
-    };
-
-    pub const fn new(x: Len, y: Len) -> Self {
-        Self { x, y }
-    }
-
-    pub const fn px(px: impl const Into<Vec2>) -> Self {
-        let px = px.into();
-        Self {
-            x: Len::px(px.x),
-            y: Len::px(px.y),
-        }
-    }
-
-    /// From lengths already on the grid, with no fraction of a box.
-    pub const fn from_px(px: PxVec2) -> Self {
-        Self {
-            x: Len::from_parts(Rel::ZERO, px.x),
-            y: Len::from_parts(Rel::ZERO, px.y),
-        }
-    }
-
-    pub const fn rel(rel: impl const Into<Vec2>) -> Self {
-        let rel = rel.into();
-        Self {
-            x: Len::rel(rel.x),
-            y: Len::rel(rel.y),
-        }
-    }
-
-    pub const fn shift(&mut self, offset: impl const Into<UiVec2>) {
-        let offset = offset.into();
-        *self += offset;
-    }
-
-    pub const fn offset(mut self, offset: impl const Into<UiVec2>) -> Self {
-        self.shift(offset);
-        self
-    }
-
-    pub const fn within(&self, region: &UiRegion) -> UiVec2 {
-        UiVec2 {
-            x: self.x.within(&region.x),
-            y: self.y.within(&region.y),
-        }
-    }
-
-    /// Resolved against a box of `size`, which is where a fraction stops
-    /// being one and becomes a place.
-    pub fn to_px(&self, size: PxVec2) -> PxVec2 {
-        PxVec2::new(self.x.to_px(size.x), self.y.to_px(size.y))
-    }
-
-    pub const FULL_SIZE: Self = Self::rel(Vec2::ONE);
-
-    pub const fn from_axis(axis: Axis, aligned: Len, ortho: Len) -> Self {
-        match axis {
-            Axis::X => Self {
-                x: aligned,
-                y: ortho,
-            },
-            Axis::Y => Self {
-                x: ortho,
-                y: aligned,
-            },
-        }
-    }
-
-    pub fn get_px(&self) -> Vec2 {
-        (self.x.px.to_f32(), self.y.px.to_f32()).into()
-    }
-
-    pub fn get_rel(&self) -> Vec2 {
-        (self.x.rel.to_f32(), self.y.rel.to_f32()).into()
-    }
-}
-
-impl Display for UiVec2 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "rel{};px{}", self.get_rel(), self.get_px())
-    }
-}
-
-impl_op!(same UiVec2 Add add; x y);
-impl_op!(same UiVec2 Sub sub; x y);
-
-const impl From<Vec2> for UiVec2 {
-    fn from(px: Vec2) -> Self {
-        Self::px(px)
-    }
-}
-
-const impl<T: const UiNum, U: const UiNum> From<(T, U)> for UiVec2
-where
-    (T, U): const Destruct,
-{
-    fn from(px: (T, U)) -> Self {
-        Self::px(px)
-    }
-}
-
-/// A length along one axis: a fraction of the box it is measured in plus an
-/// offset, `rel * box + px`. A position is the same number -- the length from
-/// the start of the box to the point -- which is why a [`UiSpan`] is two of
-/// these. Both parts are fixed point, so composing one through a chain of
-/// boxes rounds only where it multiplies, and lands on the same number as any
-/// other route to the same place.
-///
-/// It carries no claim on what a container has left over. That is
-/// [`crate::LayoutLen`], which is this plus a weight, and which means nothing
-/// to anyone but whoever divides the room.
-#[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, bytemuck::Pod, Default, bytemuck::Zeroable)]
-pub struct Len {
-    pub rel: Rel,
-    pub px: Px,
-}
-
-impl_op!(same Len Add add; rel px);
-impl_op!(same Len Sub sub; rel px);
-
-impl Len {
-    pub const ZERO: Self = Self {
-        rel: Rel::ZERO,
-        px: Px::ZERO,
-    };
-    pub const FULL: Self = Self {
-        rel: Rel::ONE,
-        px: Px::ZERO,
-    };
-
-    pub const fn new(rel: f32, px: f32) -> Self {
-        Self::from_parts(Rel::from_f32(rel), Px::from_f32(px))
-    }
-
-    /// From parts already on the grid, rather than numbers to be put on it.
-    pub const fn from_parts(rel: Rel, px: Px) -> Self {
-        Self { rel, px }
-    }
-
-    pub const fn rel(rel: f32) -> Self {
-        Self::from_parts(Rel::from_f32(rel), Px::ZERO)
-    }
-
-    pub const fn px(px: f32) -> Self {
-        Self::from_parts(Rel::ZERO, Px::from_f32(px))
-    }
-
-    pub const fn max(&self, other: Self) -> Self {
-        Self {
-            rel: self.rel.max(other.rel),
-            px: self.px.max(other.px),
-        }
-    }
-
-    pub const fn min(&self, other: Self) -> Self {
-        Self {
-            rel: self.rel.min(other.rel),
-            px: self.px.min(other.px),
-        }
-    }
-
-    /// Both parts by the same fraction, which is what a part of a length
-    /// means when the length is part pixels and part a fraction of a box.
-    pub const fn scale(&self, by: Rel) -> Self {
-        Self {
-            rel: self.rel.mul(by),
-            px: self.px.mul(by),
-        }
-    }
-
-    pub const fn offset(mut self, amt: Px) -> Self {
-        self.px = self.px.add(amt);
-        self
-    }
-
-    pub const fn within(&self, span: &UiSpan) -> Self {
-        Self {
-            rel: self.rel.lerp(span.start.rel, span.end.rel),
-            px: self.px.add(self.rel.lerp(span.start.px, span.end.px)),
-        }
-    }
-
-    pub const fn within_len(&self, len: Len) -> Self {
-        self.within(&UiSpan {
-            start: Len::ZERO,
-            end: len,
-        })
-    }
-
-    pub const fn flip(&mut self) {
-        self.rel = Rel::ONE.sub(self.rel);
-        self.px = self.px.neg();
-    }
-
-    pub const fn to(&self, end: Self) -> UiSpan {
-        UiSpan { start: *self, end }
-    }
-
-    /// Resolved against a box of `len`, which is the only place a fraction
-    /// becomes a number of pixels.
-    pub const fn to_px(&self, len: Px) -> Px {
-        self.px.add(len.mul(self.rel))
-    }
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct UiSpan {
-    pub start: Len,
-    pub end: Len,
-}
-
-impl UiSpan {
-    pub const FULL: Self = Self {
-        start: Len::ZERO,
-        end: Len::FULL,
-    };
-
-    pub const fn rel(rel: f32) -> Self {
-        Self {
-            start: Len::rel(rel),
-            end: Len::rel(rel),
-        }
-    }
-
-    pub const fn new(start: Len, end: Len) -> Self {
-        Self { start, end }
-    }
-
-    pub const fn flip(&mut self) {
-        self.start.flip();
-        self.end.flip();
-        std::mem::swap(&mut self.start.rel, &mut self.end.rel);
-        std::mem::swap(&mut self.start.px, &mut self.end.px);
-    }
-
-    pub const fn shift(&mut self, offset: Len) {
-        self.start += offset;
-        self.end += offset;
-    }
-
-    /// Composing a box through the one it sits in, and the hottest line in
-    /// layout. It used to skip the multiplies where a span was the whole of
-    /// its parent or the parent the whole of its own; both come out of the
-    /// multiply unchanged anyway, and the body those comparisons cost was
-    /// what kept the inliner from taking this at all.
-    pub const fn within(&self, parent: &Self) -> Self {
-        Self {
-            start: self.start.within(parent),
-            end: self.end.within(parent),
-        }
-    }
-
-    /// A box `len` long inside this one, on the side `align` says. Both must
-    /// be lengths of the same rel base: it subtracts one from the other
-    /// rather than composing it in, which is what keeps a fraction the same
-    /// fraction however long this box turns out to be.
-    pub const fn place(self, len: Len, align: AxisAlign) -> Self {
-        let start = self.start + (self.len() - len).scale(align.rel());
-        Self::new(start, start + len)
-    }
-
-    pub const fn len(&self) -> Len {
-        self.end - self.start
-    }
-
-    /// Both ends by the same amount, which is what moving a box without
-    /// changing its length does to every part of it.
-    pub const fn translated(self, by: Len) -> Self {
-        Self {
-            start: self.start + by,
-            end: self.end + by,
-        }
-    }
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct UiRegion {
-    pub x: UiSpan,
-    pub y: UiSpan,
-}
-
-impl UiRegion {
-    /// Every part of the box by the same amount on each axis. Done to the
-    /// whole region rather than an end at a time, because that is what it is
-    /// -- and because four adds in a row are four adds, where four asked for
-    /// separately are four sequences.
-    pub const fn translated(self, x: Len, y: Len) -> Self {
-        Self {
-            x: self.x.translated(x),
-            y: self.y.translated(y),
-        }
-    }
-
-    pub const FULL: Self = Self {
-        x: UiSpan::FULL,
-        y: UiSpan::FULL,
-    };
-
-    pub const fn new(x: UiSpan, y: UiSpan) -> Self {
-        Self { x, y }
-    }
-
-    pub const fn rel(rel: Vec2) -> Self {
-        Self {
-            x: UiSpan::rel(rel.x),
-            y: UiSpan::rel(rel.y),
-        }
-    }
-    pub const fn within(&self, parent: &Self) -> Self {
-        Self {
-            x: self.x.within(&parent.x),
-            y: self.y.within(&parent.y),
-        }
-    }
-    pub const fn flip(&mut self, axis: Axis) {
-        match axis {
-            Axis::X => self.x.flip(),
-            Axis::Y => self.y.flip(),
-        }
-    }
-
-    pub fn shift(&mut self, offset: impl Into<UiVec2>) {
-        let offset = offset.into();
-        self.x.shift(offset.x);
-        self.y.shift(offset.y);
-    }
-
-    pub fn offset(mut self, offset: impl Into<UiVec2>) -> Self {
-        self.shift(offset);
-        self
-    }
-
-    pub fn to_px(&self, size: PxVec2) -> PixelRegion {
-        PixelRegion {
-            top_left: self.top_left().to_px(size),
-            bot_right: self.bot_right().to_px(size),
-        }
-    }
-
-    pub const fn center(&self) -> UiVec2 {
-        Align::CENTER.pos().within(self)
-    }
-
-    pub const fn size(&self) -> UiVec2 {
-        UiVec2 {
-            x: self.x.len(),
-            y: self.y.len(),
-        }
-    }
-
-    pub const fn top_left(&self) -> UiVec2 {
-        UiVec2 {
-            x: self.x.start,
-            y: self.y.start,
-        }
-    }
-
-    pub const fn bot_right(&self) -> UiVec2 {
-        UiVec2 {
-            x: self.x.end,
-            y: self.y.end,
-        }
-    }
-
-    pub const fn from_axis(axis: Axis, aligned: UiSpan, ortho: UiSpan) -> Self {
-        Self {
-            x: match axis {
-                Axis::X => aligned,
-                Axis::Y => ortho,
-            },
-            y: match axis {
-                Axis::X => ortho,
-                Axis::Y => aligned,
-            },
-        }
-    }
-}
-
-impl Display for UiRegion {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{} -> {} (size: {})",
-            self.top_left(),
-            self.bot_right(),
-            self.size()
-        )
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct PixelRegion {
-    pub top_left: PxVec2,
-    pub bot_right: PxVec2,
-}
-
-impl PixelRegion {
-    pub fn contains(&self, pos: PxVec2) -> bool {
-        pos.x >= self.top_left.x
-            && pos.x <= self.bot_right.x
-            && pos.y >= self.top_left.y
-            && pos.y <= self.bot_right.y
-    }
-
-    pub fn size(&self) -> PxVec2 {
-        self.bot_right - self.top_left
-    }
-}
-
-impl Display for PixelRegion {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{} -> {}", self.top_left, self.bot_right)
-    }
-}
-
-impl_axis_index!(UiVec2 => Len);
-impl_axis_index!(UiRegion => UiSpan);

core/src/primitive/color.rs

@@ -1,169 +0,0 @@
-use std::marker::Destruct;
-
-/// stored in linear for sane manipulation
-#[repr(C)]
-#[derive(Clone, Copy, Hash, PartialEq, Eq, bytemuck::Zeroable, Debug)]
-pub struct Color<T> {
-    pub r: T,
-    pub g: T,
-    pub b: T,
-    pub a: T,
-}
-
-impl<T: ColorNum> Default for Color<T> {
-    fn default() -> Self {
-        Self::BLACK
-    }
-}
-
-impl<T: ColorNum> Color<T> {
-    pub const BLACK: Self = Self::rgb(T::MIN, T::MIN, T::MIN);
-    pub const WHITE: Self = Self::rgb(T::MAX, T::MAX, T::MAX);
-    pub const GRAY: Self = Self::rgb(T::MID, T::MID, T::MID);
-
-    pub const RED: Self = Self::rgb(T::MAX, T::MIN, T::MIN);
-    pub const ORANGE: Self = Self::rgb(T::MAX, T::MID, T::MIN);
-    pub const YELLOW: Self = Self::rgb(T::MAX, T::MAX, T::MIN);
-    pub const LIME: Self = Self::rgb(T::MID, T::MAX, T::MIN);
-    pub const GREEN: Self = Self::rgb(T::MIN, T::MAX, T::MIN);
-    pub const TURQUOISE: Self = Self::rgb(T::MIN, T::MAX, T::MID);
-    pub const CYAN: Self = Self::rgb(T::MIN, T::MAX, T::MAX);
-    pub const SKY: Self = Self::rgb(T::MIN, T::MID, T::MAX);
-    pub const BLUE: Self = Self::rgb(T::MIN, T::MIN, T::MAX);
-    pub const PURPLE: Self = Self::rgb(T::MID, T::MIN, T::MAX);
-    pub const MAGENTA: Self = Self::rgb(T::MAX, T::MIN, T::MAX);
-
-    pub const NONE: Self = Self::new(T::MIN, T::MIN, T::MIN, T::MIN);
-
-    pub const fn new(r: T, g: T, b: T, a: T) -> Self {
-        Self { r, g, b, a }
-    }
-    pub const fn rgb(r: T, g: T, b: T) -> Self {
-        Self { r, g, b, a: T::MAX }
-    }
-    pub fn alpha(mut self, a: T) -> Self {
-        self.a = a;
-        self
-    }
-
-    pub fn as_arr(self) -> [T; 4] {
-        [self.r, self.g, self.b, self.a]
-    }
-}
-
-pub const trait F32Conversion {
-    fn to(self) -> f32;
-    fn from(x: f32) -> Self;
-}
-
-pub trait ColorNum {
-    const MIN: Self;
-    const MID: Self;
-    const MAX: Self;
-}
-
-macro_rules! map_rgb {
-    ($x:ident,$self:ident, $e:tt) => {
-        #[allow(unused_braces)]
-        Self {
-            r: {
-                let $x = $self.r;
-                $e
-            },
-            g: {
-                let $x = $self.g;
-                $e
-            },
-            b: {
-                let $x = $self.b;
-                $e
-            },
-            a: $self.a,
-        }
-    };
-}
-
-impl<T: ColorNum + const F32Conversion> Color<T>
-where
-    Self: const Destruct,
-{
-    pub const fn mul_rgb(self, amt: impl const F32Conversion) -> Self {
-        let amt = amt.to();
-        map_rgb!(x, self, { T::from(x.to() * amt) })
-    }
-
-    pub const fn add_rgb(self, amt: impl const F32Conversion) -> Self {
-        let amt = amt.to();
-        map_rgb!(x, self, { T::from(x.to() + amt) })
-    }
-
-    pub const fn darker(self, amt: f32) -> Self {
-        self.mul_rgb(1.0 - amt)
-    }
-
-    pub const fn brighter(self, amt: f32) -> Self {
-        map_rgb!(x, self, {
-            let x = x.to();
-            T::from(x + (1.0 - x) * amt)
-        })
-    }
-
-    pub fn map_rgb(self, f: impl Fn(T) -> T) -> Self {
-        Self {
-            r: f(self.r),
-            g: f(self.g),
-            b: f(self.b),
-            a: self.a,
-        }
-    }
-
-    pub fn srgb(r: T, g: T, b: T) -> Self {
-        Self {
-            r: s_to_l(r),
-            g: s_to_l(g),
-            b: s_to_l(b),
-            a: T::MAX,
-        }
-    }
-}
-
-fn s_to_l<T: F32Conversion>(x: T) -> T {
-    let x = x.to();
-    T::from(if x <= 0.0405 {
-        x / 12.92
-    } else {
-        ((x + 0.055) / 1.055).powf(2.4)
-    })
-}
-
-impl ColorNum for u8 {
-    const MIN: Self = u8::MIN;
-    const MID: Self = u8::MAX / 2;
-    const MAX: Self = u8::MAX;
-}
-
-impl ColorNum for f32 {
-    const MIN: Self = 0.0;
-    const MID: Self = 0.5;
-    const MAX: Self = 1.0;
-}
-
-unsafe impl bytemuck::Pod for Color<u8> {}
-
-const impl F32Conversion for f32 {
-    fn to(self) -> f32 {
-        self
-    }
-    fn from(x: f32) -> Self {
-        x
-    }
-}
-
-const impl F32Conversion for u8 {
-    fn to(self) -> f32 {
-        self as f32 / 255.0
-    }
-    fn from(x: f32) -> Self {
-        (x * 255.0).clamp(0.0, 255.0) as Self
-    }
-}

core/src/primitive/layer.rs

@@ -1,279 +0,0 @@
-use std::ops::{Index, IndexMut};
-
-use crate::{
-    render::{LayerDraws, MaskIdx, Primitive, PrimitiveHandle, PrimitiveInst},
-    util::to_mut,
-};
-
-pub type LayerId = usize;
-
-struct LayerNode<T> {
-    next: Ptr,
-    prev: Ptr,
-    child: Option<Child>,
-    depth: usize,
-    data: T,
-}
-
-#[derive(Clone, Copy, Debug)]
-enum Ptr {
-    /// continue on same level
-    Next(usize),
-    /// go back to parent
-    Parent(usize),
-    /// end
-    None,
-}
-
-/// TODO: currently this does not ever free layers
-/// is that realistically desired?
-pub struct Layers<T> {
-    vec: Vec<LayerNode<T>>,
-    /// index of last layer at top level (start at first = 0)
-    last: usize,
-}
-
-#[derive(Clone, Copy)]
-struct Child {
-    head: usize,
-    tail: usize,
-}
-
-pub type DrawLayers = Layers<LayerDraws>;
-
-impl<T: Default> Layers<T> {
-    pub fn new() -> Layers<T> {
-        Self {
-            vec: vec![LayerNode::head()],
-            last: 0,
-        }
-    }
-
-    pub fn clear(&mut self) {
-        self.vec.clear();
-        self.vec.push(LayerNode::head());
-    }
-
-    fn push(&mut self, node: LayerNode<T>) -> LayerId {
-        let i = self.vec.len();
-        self.vec.push(node);
-        i
-    }
-
-    pub fn next(&mut self, i: LayerId) -> LayerId {
-        if let Ptr::Next(i) = self.vec[i].next {
-            return i;
-        }
-        let i_new = self.push(LayerNode::new(
-            T::default(),
-            self.vec[i].next,
-            Ptr::Next(i),
-            self.vec[i].depth,
-        ));
-        self.vec[i].next = Ptr::Next(i_new);
-        self.vec[i_new].prev = Ptr::Next(i);
-        match self.vec[i_new].next {
-            Ptr::Next(i) => self.vec[i].prev = Ptr::Next(i_new),
-            Ptr::Parent(i) => self.vec[i].child.as_mut().unwrap().tail = i_new,
-            Ptr::None => self.last = i_new,
-        }
-        i_new
-    }
-
-    pub fn child(&mut self, i: LayerId) -> LayerId {
-        if let Some(c) = self.vec[i].child {
-            return c.head;
-        }
-        let i_child = self.push(LayerNode::new(
-            T::default(),
-            Ptr::Parent(i),
-            Ptr::Parent(i),
-            self.vec[i].depth + 1,
-        ));
-        self.vec[i].child = Some(Child {
-            head: i_child,
-            tail: i_child,
-        });
-        i_child
-    }
-
-    pub fn iter_mut(&mut self) -> LayerIteratorMut<'_, T> {
-        LayerIteratorMut::new(&mut self.vec, self.last)
-    }
-
-    pub fn iter_orderless_mut(&mut self) -> impl Iterator<Item = (usize, &mut T)> {
-        self.vec.iter_mut().map(|n| &mut n.data).enumerate()
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (LayerId, &T)> {
-        self.indices().map(|i| (i, &self.vec[i].data))
-    }
-
-    pub fn iter_depth(&self) -> impl Iterator<Item = ((LayerId, usize), &T)> {
-        self.indices()
-            .map(|i| ((i, self.vec[i].depth), &self.vec[i].data))
-    }
-
-    pub fn indices(&self) -> LayerIndexIterator<'_, T> {
-        LayerIndexIterator::new(&self.vec, self.last)
-    }
-}
-
-impl DrawLayers {
-    /// Inlined on purpose: it is one call per glyph, the innermost thing a
-    /// frame does, and whether the inliner takes it turns out to depend on
-    /// unrelated code elsewhere in the crate -- 12% of a resize frame.
-    #[inline]
-    pub fn write<P: Primitive>(
-        &mut self,
-        layer: LayerId,
-        info: PrimitiveInst<P>,
-    ) -> PrimitiveHandle {
-        self[layer].write(layer, info)
-    }
-
-    pub fn free(&mut self, h: &PrimitiveHandle) -> MaskIdx {
-        self[h.layer].free(h)
-    }
-}
-
-impl<T: Default> Default for Layers<T> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl<T> Index<LayerId> for Layers<T> {
-    type Output = T;
-
-    fn index(&self, index: LayerId) -> &Self::Output {
-        &self.vec[index].data
-    }
-}
-
-impl<T> IndexMut<LayerId> for Layers<T> {
-    fn index_mut(&mut self, index: LayerId) -> &mut Self::Output {
-        &mut self.vec[index].data
-    }
-}
-
-impl<T: Default> LayerNode<T> {
-    pub fn new(data: T, next: Ptr, prev: Ptr, depth: usize) -> Self {
-        Self {
-            next,
-            prev,
-            child: None,
-            data,
-            depth,
-        }
-    }
-
-    pub fn head() -> Self {
-        Self::new(T::default(), Ptr::None, Ptr::None, 0)
-    }
-}
-
-pub struct LayerIteratorMut<'a, T> {
-    inner: LayerIndexIterator<'a, T>,
-}
-
-impl<'a, T> Iterator for LayerIteratorMut<'a, T> {
-    type Item = (usize, &'a mut T);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let i = self.inner.next()?;
-        // SAFETY: requires index iterator to work properly
-        let layer = unsafe { to_mut(&self.inner.vec[i].data) };
-        Some((i, layer))
-    }
-}
-
-impl<'a, T> DoubleEndedIterator for LayerIteratorMut<'a, T> {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        let i = self.inner.next_back()?;
-        // SAFETY: requires index iterator to work properly
-        let layer = unsafe { to_mut(&self.inner.vec[i].data) };
-        Some((i, layer))
-    }
-}
-
-impl<'a, T> LayerIteratorMut<'a, T> {
-    fn new(vec: &'a mut Vec<LayerNode<T>>, last: usize) -> Self {
-        Self {
-            inner: LayerIndexIterator::new(vec, last),
-        }
-    }
-}
-
-pub struct LayerIndexIterator<'a, T> {
-    next: Option<usize>,
-    next_back: Option<usize>,
-    vec: &'a Vec<LayerNode<T>>,
-}
-
-impl<'a, T> Iterator for LayerIndexIterator<'a, T> {
-    type Item = usize;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let ret_i = self.next?;
-        let node = &self.vec[ret_i];
-        self.next = if let Some(c) = node.child {
-            Some(c.head)
-        } else if let Ptr::Next(i) = node.next {
-            Some(i)
-        } else if let Ptr::Parent(i) = node.next {
-            let mut node = &self.vec[i];
-            while let Ptr::Parent(i) = node.next {
-                node = &self.vec[i];
-            }
-            if let Ptr::Next(i) = node.next {
-                Some(i)
-            } else {
-                None
-            }
-        } else {
-            None
-        };
-        if self.next_back.unwrap() == ret_i {
-            self.next = None;
-            self.next_back = None;
-        }
-        Some(ret_i)
-    }
-}
-
-impl<'a, T> DoubleEndedIterator for LayerIndexIterator<'a, T> {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        let ret_i = self.next_back?;
-        let node = &self.vec[ret_i];
-        self.next_back = if let Ptr::Next(mut i) = node.prev {
-            while let Some(c) = self.vec[i].child {
-                i = c.tail
-            }
-            Some(i)
-        } else if let Ptr::Parent(i) = node.prev {
-            Some(i)
-        } else {
-            None
-        };
-        if self.next.unwrap() == ret_i {
-            self.next = None;
-            self.next_back = None;
-        }
-        Some(ret_i)
-    }
-}
-
-impl<'a, T> LayerIndexIterator<'a, T> {
-    fn new(vec: &'a Vec<LayerNode<T>>, last: usize) -> Self {
-        let mut last = last;
-        while let Some(c) = vec[last].child {
-            last = c.tail;
-        }
-        Self {
-            next: Some(0),
-            next_back: Some(last),
-            vec,
-        }
-    }
-}

core/src/primitive/mod.rs

@@ -1,9 +0,0 @@
-mod color;
-mod layer;
-mod text;
-mod texture;
-
-pub use color::*;
-pub use layer::*;
-pub use text::*;
-pub use texture::*;

core/src/primitive/text.rs

@@ -1,440 +0,0 @@
-#[cfg(feature = "layout-diagnostics")]
-use crate::layout_diagnostics::{self as diag, Counter, TimerKind};
-use crate::{
-    Align, GlyphAtlas, GlyphEntry, GlyphKey, PlacedGlyph, Px, PxVec2, RegionAlign, UiColor,
-    util::Vec2,
-};
-use parley::{
-    Alignment, AlignmentOptions, FontContext, FontFamily, FontFamilyName, GenericFamily, Layout,
-    LayoutContext, LineHeight, PositionedLayoutItem, StyleProperty,
-};
-use std::{
-    collections::VecDeque,
-    hash::{DefaultHasher, Hash, Hasher},
-};
-use swash::{
-    FontRef,
-    scale::{Render, ScaleContext, Source, StrikeWith},
-    zeno::{Format, Vector},
-};
-
-pub struct TextData {
-    pub font_ctx: FontContext,
-    pub layout_ctx: LayoutContext<UiColor>,
-    scale_ctx: ScaleContext,
-    pub atlas: GlyphAtlas,
-    spare: VecDeque<Placed>,
-}
-
-/// The glyphs of one text at one width. A buffer holds the ones it is drawn
-/// as; these are the ones it had before, kept because a container measures a
-/// child by drawing it in a box it may not keep, and so comes back to widths
-/// it has already asked for.
-struct Placed {
-    /// Where the glyphs land is a function of these three and nothing else,
-    /// so no widget or buffer identity is involved and two texts of the same
-    /// words share an answer.
-    text: String,
-    key: LayoutKey,
-    glyphs: RenderedText,
-}
-
-/// How many to keep. Bounding the whole store rather than each buffer is what
-/// makes this a fixed cost instead of one a tree of ten thousand texts pays
-/// ten thousand times; the re-asks come from laying out one subtree, so they
-/// are close together and few are needed. Instructions over 500 resize frames
-/// of `tests/revision_cost.rs`, both the repeating widths and the sweep that
-/// cannot hit across frames: 13.7B at 32, 12.1B at 64, 10.4B and 12.1B at 128,
-/// and nothing past that -- so 128, which is no worse in the case that never
-/// repeats and better in the one that does.
-const SPARE_PLACED: usize = 128;
-
-impl Default for TextData {
-    fn default() -> Self {
-        Self {
-            font_ctx: FontContext::new(),
-            layout_ctx: LayoutContext::new(),
-            scale_ctx: ScaleContext::new(),
-            atlas: GlyphAtlas::default(),
-            spare: VecDeque::new(),
-        }
-    }
-}
-
-#[derive(Clone, PartialEq)]
-pub enum Family {
-    SansSerif,
-    Serif,
-    Monospace,
-    Named(String),
-}
-
-impl Family {
-    fn family(&self) -> FontFamily<'_> {
-        let name = match self {
-            Self::SansSerif => FontFamilyName::Generic(GenericFamily::SansSerif),
-            Self::Serif => FontFamilyName::Generic(GenericFamily::Serif),
-            Self::Monospace => FontFamilyName::Generic(GenericFamily::Monospace),
-            Self::Named(name) => FontFamilyName::Named(name.as_str().into()),
-        };
-        FontFamily::Single(name)
-    }
-}
-
-#[derive(Clone, PartialEq)]
-pub struct TextAttrs {
-    pub color: UiColor,
-    pub font_size: f32,
-    pub line_height: f32,
-    pub family: Family,
-    pub wrap: bool,
-    pub align: RegionAlign,
-}
-
-pub const LINE_HEIGHT_MULT: f32 = 1.1;
-
-impl Default for TextAttrs {
-    fn default() -> Self {
-        let size = 16.0;
-        Self {
-            color: UiColor::WHITE,
-            font_size: size,
-            line_height: size * LINE_HEIGHT_MULT,
-            family: Family::SansSerif,
-            wrap: false,
-            align: Align::CENTER_LEFT,
-        }
-    }
-}
-
-/// Keeps text and its corresponding layout from getting out of sync.
-pub struct TextBuffer {
-    text: String,
-    layout: Layout<UiColor>,
-    layout_key: Option<LayoutKey>,
-    /// The glyphs placed from `layout`, so drawing this text again at the
-    /// width it already has places them once.
-    placed: Option<RenderedText>,
-}
-
-#[derive(PartialEq)]
-struct LayoutKey {
-    attrs: TextAttrs,
-    max_width: Option<f32>,
-}
-
-impl TextBuffer {
-    pub fn new(text: impl Into<String>) -> Self {
-        Self {
-            text: text.into(),
-            layout: Layout::new(),
-            layout_key: None,
-            placed: None,
-        }
-    }
-
-    pub fn new_empty() -> Self {
-        Self::new("")
-    }
-
-    pub fn text(&self) -> &str {
-        &self.text
-    }
-
-    pub fn layout(&self) -> &Layout<UiColor> {
-        &self.layout
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.text.is_empty()
-    }
-
-    pub fn set_text(&mut self, text: impl Into<String>) {
-        let text = text.into();
-        if text != self.text {
-            self.text = text;
-            self.layout_key = None;
-            self.placed = None;
-        }
-    }
-
-    /// Invalidates the layout and returns the underlying string for editing.
-    pub fn edit(&mut self) -> &mut String {
-        self.layout_key = None;
-        self.placed = None;
-        &mut self.text
-    }
-
-    /// The glyphs of the shaping it is drawn as, once they are placed.
-    pub fn rendered(&self) -> Option<&RenderedText> {
-        self.placed.as_ref()
-    }
-
-    /// The width its shaping wraps at, and `None` where it does not wrap or
-    /// has not been shaped.
-    pub fn wrap_width(&self) -> Option<f32> {
-        self.layout_key.as_ref()?.max_width
-    }
-
-    /// Widths covered by the current line breaks, including a wider shaping
-    /// retained when a later draw requested a narrower box.
-    pub fn width_holds(&self) -> crate::Holds {
-        let Some(width) = self.wrap_width() else {
-            return crate::Holds::ANY;
-        };
-        let width = Px::from_f32(width);
-        let soft_wrapped = self.layout.lines().any(|line| {
-            matches!(
-                line.break_reason(),
-                parley::layout::BreakReason::Regular | parley::layout::BreakReason::Emergency
-            )
-        });
-        let upper = if soft_wrapped { width } else { Px::MAX };
-        crate::Holds::from(Px::ceil_from_f32(self.layout.width()).min(width)..=upper)
-    }
-
-    pub fn size(&self) -> Vec2 {
-        Vec2::new(self.layout.width(), self.layout.height())
-    }
-
-    pub fn shape(&mut self, data: &mut TextData, attrs: &TextAttrs, width: Option<f32>) {
-        let layout_key = LayoutKey {
-            attrs: attrs.clone(),
-            max_width: width,
-        };
-        if self.layout_key.as_ref() == Some(&layout_key) {
-            #[cfg(feature = "layout-diagnostics")]
-            diag::bump(Counter::TextShapeHits);
-            return;
-        }
-        // A greedy break at one width is the same break at every width down
-        // to the longest line it produced: each line still fits, and none can
-        // take a word that would not fit in the wider box. So the layout in
-        // hand already answers, and re-breaking would only be work.
-        //
-        // At the longest line exactly, with no margin below it. A narrower
-        // width really does break differently, so answering one from the
-        // break in hand is how a warm tree keeps lines a cold tree would
-        // never produce. The margin was here because a text reports the
-        // width it used and a parent hands that back; the report is the step
-        // at or above its longest line now, so what comes back fits.
-        if let Some(key) = &self.layout_key
-            && key.attrs == *attrs
-            && let (Some(broke_at), Some(want)) = (key.max_width, width)
-            && want <= broke_at
-            && want >= self.layout.width()
-        {
-            #[cfg(feature = "layout-diagnostics")]
-            diag::bump(Counter::TextShapeHits);
-            return;
-        }
-        let same_shaping = self
-            .layout_key
-            .as_ref()
-            .is_some_and(|key| key.attrs == *attrs);
-        let old_key = self.layout_key.replace(layout_key);
-        // The glyphs it holds are of the width it held, which the layout may
-        // well come back to.
-        if let Some(key) = old_key
-            && let Some(glyphs) = self.placed.take()
-        {
-            data.keep_placed(Placed {
-                text: self.text.clone(),
-                key,
-                glyphs,
-            });
-        }
-        // Only the line breaking depends on the width: the shaped runs under
-        // it are a function of the text and the attrs, and parley re-breaks
-        // them in place. So a new width is a break, not a shaping.
-        if same_shaping {
-            #[cfg(feature = "layout-diagnostics")]
-            diag::bump(Counter::TextBreaks);
-            #[cfg(feature = "layout-diagnostics")]
-            let _break = diag::timer(TimerKind::TextBreak);
-            self.break_lines(width);
-            return;
-        }
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::TextShapes);
-        #[cfg(feature = "layout-diagnostics")]
-        let _shape = diag::timer(TimerKind::TextShape);
-        let mut builder = data
-            .layout_ctx
-            .ranged_builder(&mut data.font_ctx, &self.text, 1.0, true);
-        builder.push_default(StyleProperty::FontFamily(attrs.family.family()));
-        builder.push_default(StyleProperty::FontSize(attrs.font_size));
-        builder.push_default(StyleProperty::LineHeight(LineHeight::Absolute(
-            attrs.line_height,
-        )));
-        builder.push_default(StyleProperty::Brush(attrs.color));
-        builder.build_into(&mut self.layout, &self.text);
-        self.break_lines(width);
-    }
-
-    fn break_lines(&mut self, width: Option<f32>) {
-        self.layout.break_all_lines(width);
-        self.layout
-            .align(Alignment::Start, AlignmentOptions::default());
-    }
-}
-
-impl TextData {
-    pub fn place(&mut self, buffer: &TextBuffer) -> Vec<PlacedGlyph> {
-        let mut placed = Vec::new();
-        for line in buffer.layout.lines() {
-            for item in line.items() {
-                let PositionedLayoutItem::GlyphRun(run) = item else {
-                    continue;
-                };
-                let font = run.run().font();
-                let font_size = run.run().font_size();
-                let coords = run.run().normalized_coords();
-                let Some(font_ref) = FontRef::from_index(font.data.as_ref(), font.index as usize)
-                else {
-                    continue;
-                };
-                let coords_hash = hash_coords(coords);
-                let font_id = font.data.id();
-
-                for glyph in run.positioned_glyphs() {
-                    let subpixel = ((glyph.x.fract() * 4.0).round() as i32).rem_euclid(4) as u8;
-                    let key = GlyphKey {
-                        font: font_id,
-                        glyph: glyph.id,
-                        size: glyph_size_key(font_size),
-                        subpixel,
-                        coords: coords_hash,
-                    };
-                    let Some(entry) = self.glyph_entry(GlyphRaster {
-                        key,
-                        font: font_ref,
-                        font_size,
-                        coords,
-                        subpixel,
-                        glyph_id: glyph.id,
-                    }) else {
-                        continue;
-                    };
-                    placed.push(PlacedGlyph {
-                        entry,
-                        offset: PxVec2::new(
-                            Px::from_int(glyph.x.floor() as i32 + entry.left),
-                            Px::from_int(glyph.y.floor() as i32 - entry.top),
-                        ),
-                    });
-                }
-            }
-        }
-        placed
-    }
-
-    fn glyph_entry(&mut self, glyph: GlyphRaster<'_>) -> Option<GlyphEntry> {
-        if let Some(entry) = self.atlas.get(&glyph.key) {
-            return entry;
-        }
-
-        let mut scaler = self
-            .scale_ctx
-            .builder(glyph.font)
-            .size(glyph.font_size)
-            .hint(true)
-            .normalized_coords(glyph.coords)
-            .build();
-        let image = Render::new(&[
-            Source::ColorOutline(0),
-            Source::ColorBitmap(StrikeWith::BestFit),
-            Source::Outline,
-        ])
-        .format(Format::Alpha)
-        .offset(Vector::new(glyph.subpixel as f32 / 4.0, 0.0))
-        .render(&mut scaler, glyph.glyph_id as u16);
-
-        if let Some(image) = image {
-            self.atlas.insert(glyph.key, &image)
-        } else {
-            self.atlas.insert_empty(glyph.key);
-            None
-        }
-    }
-}
-
-struct GlyphRaster<'a> {
-    key: GlyphKey,
-    font: FontRef<'a>,
-    font_size: f32,
-    coords: &'a [i16],
-    subpixel: u8,
-    glyph_id: u32,
-}
-
-fn hash_coords(coords: &[i16]) -> u64 {
-    let mut hasher = DefaultHasher::new();
-    coords.hash(&mut hasher);
-    hasher.finish()
-}
-
-const GLYPH_SIZE_STEPS_PER_PIXEL: f32 = 16.0;
-
-fn glyph_size_key(font_size: f32) -> u32 {
-    (font_size * GLYPH_SIZE_STEPS_PER_PIXEL).round() as u32
-}
-
-pub struct RenderedText {
-    pub glyphs: Vec<PlacedGlyph>,
-    pub size: Vec2,
-    pub color: UiColor,
-}
-
-impl TextData {
-    /// The glyphs of this text at this width, taken out of what is kept.
-    fn take_placed(&mut self, text: &str, key: &LayoutKey) -> Option<RenderedText> {
-        // From the newest, since a re-ask is usually of something recent.
-        let at = self
-            .spare
-            .iter()
-            .rposition(|spare| spare.key == *key && spare.text == text)?;
-        self.spare.remove(at).map(|spare| spare.glyphs)
-    }
-
-    fn keep_placed(&mut self, placed: Placed) {
-        if self.spare.len() >= SPARE_PLACED {
-            self.spare.pop_front();
-        }
-        self.spare.push_back(placed);
-    }
-
-    pub fn render<'b>(
-        &mut self,
-        buffer: &'b mut TextBuffer,
-        attrs: &TextAttrs,
-        width: Option<f32>,
-    ) -> &'b RenderedText {
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::TextRenders);
-        #[cfg(feature = "layout-diagnostics")]
-        let _render = diag::timer(TimerKind::TextRender);
-        buffer.shape(self, attrs, width);
-        // Only asked for when the buffer no longer holds them: taking one out
-        // of the store to then drop it would throw an answer away.
-        let placed = buffer.placed.take().or_else(|| {
-            let key = buffer.layout_key.as_ref()?;
-            self.take_placed(&buffer.text, key)
-        });
-        let placed = match placed {
-            Some(placed) => placed,
-            None => {
-                #[cfg(feature = "layout-diagnostics")]
-                diag::bump(Counter::GlyphPlacements);
-                #[cfg(feature = "layout-diagnostics")]
-                let _place = diag::timer(TimerKind::GlyphPlacement);
-                RenderedText {
-                    glyphs: self.place(buffer),
-                    size: buffer.size(),
-                    color: attrs.color,
-                }
-            }
-        };
-        buffer.placed.insert(placed)
-    }
-}

core/src/primitive/texture.rs

@@ -1,161 +0,0 @@
-use crate::util::{RefCounter, Vec2};
-use image::{DynamicImage, GenericImageView};
-use std::{
-    ops::Index,
-    sync::mpsc::{Receiver, Sender, channel},
-};
-
-#[derive(Debug, Clone)]
-pub struct TextureHandle {
-    slot: u32,
-    size: Vec2,
-    counter: RefCounter,
-    send: Sender<u32>,
-}
-
-/// a texture manager for a ui
-/// note that this is heavily oriented towards wgpu's renderer so the primitives don't need mapped
-pub struct Textures {
-    free: Vec<u32>,
-    images: Vec<Option<DynamicImage>>,
-    updates: Vec<Update>,
-    send: Sender<u32>,
-    recv: Receiver<u32>,
-}
-
-pub enum TextureUpdate<'a> {
-    Push(&'a DynamicImage),
-    Set(u32, &'a DynamicImage),
-    Patch(u32, PatchRect, &'a DynamicImage),
-    Free(u32),
-    /// Added and freed before the renderer drained either update. It still has
-    /// to push a slot to stay lined up with `images`; `Free` then empties it.
-    PushFree,
-    SetFree,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct PatchRect {
-    pub x: u32,
-    pub y: u32,
-    pub width: u32,
-    pub height: u32,
-}
-
-enum Update {
-    Push(u32),
-    Set(u32),
-    Patch(u32, PatchRect),
-    Free(u32),
-}
-
-impl Textures {
-    pub fn new() -> Self {
-        let (send, recv) = channel();
-        Self {
-            free: Vec::new(),
-            images: Vec::new(),
-            updates: Vec::new(),
-            send,
-            recv,
-        }
-    }
-    pub fn add(&mut self, image: impl Into<DynamicImage>) -> TextureHandle {
-        let image = image.into();
-        let size = image.dimensions().into();
-        TextureHandle {
-            slot: self.push(image),
-            size,
-            counter: RefCounter::new(),
-            send: self.send.clone(),
-        }
-    }
-
-    fn push(&mut self, image: DynamicImage) -> u32 {
-        if let Some(i) = self.free.pop() {
-            self.images[i as usize] = Some(image);
-            self.updates.push(Update::Set(i));
-            i
-        } else {
-            let i = self.images.len() as u32;
-            self.images.push(Some(image));
-            self.updates.push(Update::Push(i));
-            i
-        }
-    }
-
-    pub fn image_mut(&mut self, handle: &TextureHandle) -> &mut DynamicImage {
-        self.images[handle.slot as usize]
-            .as_mut()
-            .expect("texture was freed while still held")
-    }
-
-    /// Queue an upload of just `rect`, after writing it with `image_mut`.
-    pub fn patch(&mut self, handle: &TextureHandle, rect: PatchRect) {
-        self.updates.push(Update::Patch(handle.slot, rect));
-    }
-
-    /// How many textures are live, which is what a ui can ask; the renderer's
-    /// copies follow from the updates it drains.
-    pub fn count(&self) -> usize {
-        self.images.iter().flatten().count()
-    }
-
-    pub fn free(&mut self) {
-        for idx in self.recv.try_iter() {
-            self.images[idx as usize] = None;
-            self.updates.push(Update::Free(idx));
-            self.free.push(idx);
-        }
-    }
-
-    pub fn updates(&mut self) -> impl Iterator<Item = TextureUpdate<'_>> {
-        self.updates.drain(..).map(|u| match u {
-            Update::Push(i) => self.images[i as usize]
-                .as_ref()
-                .map(TextureUpdate::Push)
-                .unwrap_or(TextureUpdate::PushFree),
-            Update::Set(i) => self.images[i as usize]
-                .as_ref()
-                .map(|img| TextureUpdate::Set(i, img))
-                .unwrap_or(TextureUpdate::SetFree),
-            Update::Patch(i, rect) => self.images[i as usize]
-                .as_ref()
-                .map(|img| TextureUpdate::Patch(i, rect, img))
-                .unwrap_or(TextureUpdate::SetFree),
-            Update::Free(i) => TextureUpdate::Free(i),
-        })
-    }
-}
-
-impl TextureHandle {
-    /// Index into `Textures`, and into the renderer's parallel slots.
-    pub fn slot(&self) -> u32 {
-        self.slot
-    }
-    pub fn size(&self) -> Vec2 {
-        self.size
-    }
-}
-
-impl Drop for TextureHandle {
-    fn drop(&mut self) {
-        if self.counter.drop() {
-            let _ = self.send.send(self.slot);
-        }
-    }
-}
-
-impl Index<&TextureHandle> for Textures {
-    type Output = DynamicImage;
-
-    fn index(&self, index: &TextureHandle) -> &Self::Output {
-        self.images[index.slot as usize].as_ref().unwrap()
-    }
-}
-
-impl Default for Textures {
-    fn default() -> Self {
-        Self::new()
-    }
-}

core/src/render/atlas.rs

@@ -1,247 +0,0 @@
-use crate::{
-    PatchRect, PxVec2,
-    util::{HashMap, Vec2},
-};
-use image::RgbaImage;
-use swash::scale::image::{Content, Image};
-
-/// Side of one page, and so of every layer of `render::page`'s array texture.
-pub(crate) const PAGE: u32 = 1024;
-
-/// Transparent margin kept around every glyph, so that sampling one cannot
-/// pick up its neighbour along a shared edge.
-const PAD: u32 = 1;
-
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
-pub struct GlyphKey {
-    pub font: u64,
-    pub glyph: u32,
-    /// Font size in 1/16 px, so sizes that round to the same pixels share a
-    /// raster instead of filling the atlas with near-duplicates.
-    pub size: u32,
-    /// Horizontal subpixel phase, in 1/4 px.
-    pub subpixel: u8,
-    /// Hash of the variation coordinates; a variable font at two weights is two
-    /// different sets of pixels from one glyph id.
-    pub coords: u64,
-}
-
-#[derive(Clone, Copy)]
-pub struct GlyphEntry {
-    pub uv_min: Vec2,
-    pub uv_max: Vec2,
-    /// Offset from the glyph's pen position to the top-left of its pixels.
-    pub left: i32,
-    pub top: i32,
-    pub width: u32,
-    pub height: u32,
-    pub is_colored: bool,
-    /// Which atlas array layer this glyph is on.
-    pub layer: u32,
-}
-
-impl GlyphEntry {
-    const IS_COLORED: u32 = 1;
-
-    pub(crate) fn flags(&self) -> u32 {
-        if self.is_colored { Self::IS_COLORED } else { 0 }
-    }
-}
-
-struct Page {
-    image: RgbaImage,
-    x: u32,
-    y: u32,
-    shelf_height: u32,
-}
-
-/// A rectangle of one page the renderer has not uploaded yet.
-#[derive(Clone, Copy)]
-pub struct PageUpload {
-    pub layer: u32,
-    pub rect: PatchRect,
-}
-
-#[derive(Default)]
-pub struct GlyphAtlas {
-    pages: Vec<Page>,
-    /// `None` for a glyph that rasterised to nothing -- a space, say. Cached
-    /// too, so it is not re-rasterised on every layout.
-    entries: HashMap<GlyphKey, Option<GlyphEntry>>,
-    uploads: Vec<PageUpload>,
-}
-
-impl GlyphAtlas {
-    pub fn get(&self, key: &GlyphKey) -> Option<Option<GlyphEntry>> {
-        self.entries.get(key).copied()
-    }
-
-    pub fn insert(&mut self, key: GlyphKey, image: &Image) -> Option<GlyphEntry> {
-        let w = image.placement.width;
-        let h = image.placement.height;
-        if w == 0 || h == 0 {
-            log::warn!(
-                "glyph {} in font {} rasterized at {w}x{h}; skipping it",
-                key.glyph,
-                key.font,
-            );
-            self.entries.insert(key, None);
-            return None;
-        }
-        if w > PAGE - PAD * 2 || h > PAGE - PAD * 2 {
-            log::warn!(
-                "glyph {} in font {} rasterized at {w}x{h}, too large for the {PAGE}x{PAGE} atlas; skipping it",
-                key.glyph,
-                key.font,
-            );
-            self.entries.insert(key, None);
-            return None;
-        }
-
-        let upload = self.allocate(w, h);
-        let PatchRect { x, y, .. } = upload.rect;
-        write_glyph(&mut self.pages[upload.layer as usize].image, image, x, y);
-        self.uploads.push(upload);
-
-        let scale = 1.0 / PAGE as f32;
-        let entry = GlyphEntry {
-            uv_min: Vec2::new(x as f32 * scale, y as f32 * scale),
-            uv_max: Vec2::new((x + w) as f32 * scale, (y + h) as f32 * scale),
-            left: image.placement.left,
-            top: image.placement.top,
-            width: w,
-            height: h,
-            is_colored: matches!(image.content, Content::Color),
-            layer: upload.layer,
-        };
-        self.entries.insert(key, Some(entry));
-        Some(entry)
-    }
-
-    /// Reserves room for a `w` by `h` glyph, adding a page if none has it.
-    fn allocate(&mut self, w: u32, h: u32) -> PageUpload {
-        let rect = |x, y| PatchRect {
-            x,
-            y,
-            width: w,
-            height: h,
-        };
-        if let Some((i, (x, y))) = self
-            .pages
-            .iter_mut()
-            .enumerate()
-            .find_map(|(i, page)| page.allocate(w, h).map(|position| (i, position)))
-        {
-            return PageUpload {
-                layer: i as u32,
-                rect: rect(x, y),
-            };
-        }
-
-        self.pages.push(Page {
-            image: RgbaImage::new(PAGE, PAGE),
-            x: PAD + w + PAD,
-            y: PAD,
-            shelf_height: h + PAD,
-        });
-        PageUpload {
-            layer: self.pages.len() as u32 - 1,
-            rect: rect(PAD, PAD),
-        }
-    }
-
-    /// Drains what has been written since the last call, for the renderer to
-    /// upload. A new page needs nothing more: wgpu leaves the rest of a fresh
-    /// layer transparent, which is what an atlas wants.
-    pub fn uploads(&mut self) -> impl Iterator<Item = (PageUpload, &RgbaImage)> {
-        let pages = &self.pages;
-        self.uploads
-            .drain(..)
-            .map(|upload| (upload, &pages[upload.layer as usize].image))
-    }
-
-    pub fn insert_empty(&mut self, key: GlyphKey) {
-        self.entries.insert(key, None);
-    }
-
-    pub fn page_count(&self) -> u32 {
-        self.pages.len() as u32
-    }
-
-    pub fn glyph_count(&self) -> usize {
-        self.entries.len()
-    }
-}
-
-impl Page {
-    fn allocate(&mut self, w: u32, h: u32) -> Option<(u32, u32)> {
-        let need_w = w + PAD;
-        let need_h = h + PAD;
-        if self.x + need_w > PAGE {
-            if need_w + PAD > PAGE || self.y + self.shelf_height + need_h > PAGE {
-                return None;
-            }
-            self.y += self.shelf_height;
-            self.x = PAD;
-            self.shelf_height = 0;
-        } else if self.y + need_h > PAGE {
-            return None;
-        }
-
-        let position = (self.x, self.y);
-        self.x += need_w;
-        self.shelf_height = self.shelf_height.max(need_h);
-        Some(position)
-    }
-}
-
-/// Mask glyphs keep coverage in alpha so their raster can be tinted at draw time.
-fn write_glyph(page: &mut RgbaImage, image: &Image, x: u32, y: u32) {
-    let width = image.placement.width as usize;
-    let height = image.placement.height as usize;
-    let page_stride = page.width() as usize * 4;
-    let x = x as usize * 4;
-    let y = y as usize;
-    let page = page.as_mut();
-
-    for row in 0..height {
-        let start = (y + row) * page_stride + x;
-        let target = &mut page[start..start + width * 4];
-        match image.content {
-            Content::Color => {
-                let start = row * width * 4;
-                target.copy_from_slice(&image.data[start..start + width * 4]);
-            }
-            Content::Mask => {
-                let start = row * width;
-                for (target, &alpha) in target
-                    .as_chunks_mut::<4>()
-                    .0
-                    .iter_mut()
-                    .zip(&image.data[start..start + width])
-                {
-                    target.copy_from_slice(&[255, 255, 255, alpha]);
-                }
-            }
-            Content::SubpixelMask => {
-                let start = row * width * 4;
-                for (target, source) in target
-                    .as_chunks_mut::<4>()
-                    .0
-                    .iter_mut()
-                    .zip(image.data[start..start + width * 4].as_chunks::<4>().0)
-                {
-                    target.copy_from_slice(&[255, 255, 255, source[1]]);
-                }
-            }
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct PlacedGlyph {
-    pub entry: GlyphEntry,
-    /// Whole pixels from the origin of the text to this glyph's top-left,
-    /// on the grid once here rather than on every frame that draws it.
-    pub offset: PxVec2,
-}

core/src/render/data.rs

@@ -1,90 +0,0 @@
-use crate::{UiRegion, util::Id, util::Vec2};
-use wgpu::*;
-
-#[repr(C)]
-#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable, Default)]
-pub struct WindowUniform {
-    pub dim: Vec2,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct PrimitiveInstance {
-    pub region: UiRegion,
-    pub mask_idx: MaskIdx,
-    pub move_idx: MoveIdx,
-}
-
-impl PrimitiveInstance {
-    // The region's four scalars, each a `Rel` beside a `Px`: whole counts
-    // that the shader decodes, rather than the numbers themselves.
-    const ATTRIBS: [VertexAttribute; 6] = vertex_attr_array![
-        0 => Sint32x2,
-        1 => Sint32x2,
-        2 => Sint32x2,
-        3 => Sint32x2,
-        4 => Uint32,
-        5 => Uint32,
-    ];
-
-    pub fn desc() -> VertexBufferLayout<'static> {
-        VertexBufferLayout {
-            array_stride: std::mem::size_of::<Self>() as BufferAddress,
-            step_mode: VertexStepMode::Instance,
-            attributes: &Self::ATTRIBS,
-        }
-    }
-}
-
-pub type MaskIdx = Id<u32>;
-
-impl MaskIdx {
-    pub const NONE: Self = Self::preset(u32::MAX);
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct Mask {
-    pub region: UiRegion,
-    pub move_idx: MoveIdx,
-}
-
-/// Its own type rather than another `Id<u32>`, because it sits beside
-/// `MaskIdx` in an instance and the two must not be swappable.
-#[repr(transparent)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct MoveIdx(u32);
-
-impl MoveIdx {
-    pub const NONE: Self = Self(u32::MAX);
-
-    pub(crate) fn slot(idx: usize) -> Self {
-        Self(idx as u32)
-    }
-
-    pub(crate) fn idx(self) -> usize {
-        self.0 as usize
-    }
-}
-
-/// One link of the chain a primitive's position is resolved through: the box
-/// its contents are placed within, given in the coordinates of the slot it
-/// names. Moving or resizing a subtree writes its own slot and nothing else.
-///
-/// The identity is `UiRegion::FULL`, not zero: a zeroed entry is a box of no
-/// extent, which collapses everything under it to a point.
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct MoveOffset {
-    pub region: UiRegion,
-    pub parent: MoveIdx,
-}
-
-unsafe impl bytemuck::Pod for MoveOffset {}
-unsafe impl bytemuck::Zeroable for MoveOffset {}
-
-impl MoveOffset {
-    pub fn new(parent: MoveIdx, region: UiRegion) -> Self {
-        Self { region, parent }
-    }
-}

core/src/render/mod.rs

@@ -1,447 +0,0 @@
-use crate::{
-    UiData, UiRenderState,
-    render::{data::PrimitiveInstance, util::ArrBuf},
-    util::{HashMap, Vec2},
-};
-use data::WindowUniform;
-use wgpu::{
-    util::{BufferInitDescriptor, DeviceExt},
-    *,
-};
-
-mod atlas;
-mod data;
-mod page;
-mod primitive;
-mod texture;
-mod util;
-
-pub use atlas::*;
-pub use data::{Mask, MaskIdx, MoveIdx, MoveOffset};
-pub use primitive::*;
-
-const PRELUDE: &str = include_str!("./shader/prelude.wgsl");
-
-fn module_source(wgsl: &str) -> String {
-    // The steps come from the same constants the CPU counts in, rather than
-    // a second copy of them written into the shader: a grid the two disagree
-    // about puts every coordinate somewhere else.
-    format!(
-        "const PX_STEP: f32 = 1.0 / {}.0;\nconst REL_STEP: f32 = 1.0 / {}.0;\n{PRELUDE}\n{wgsl}",
-        1u32 << crate::PX_SHIFT,
-        1u32 << crate::REL_SHIFT,
-    )
-}
-
-pub struct UiRenderNode {
-    shared_layout: BindGroupLayout,
-    shared_group: BindGroup,
-    format: TextureFormat,
-
-    /// One per registered primitive, in id order.
-    primitives: Vec<PrimitivePipeline>,
-
-    layers: HashMap<usize, RenderLayer>,
-    active: Vec<usize>,
-    window_buffer: Buffer,
-    masks: ArrBuf<Mask>,
-    moves: ArrBuf<MoveOffset>,
-}
-
-struct RenderLayer {
-    /// One per registered primitive, `None` where this layer draws none.
-    primitives: Vec<Option<ListBuffers>>,
-}
-
-/// What draws one registered primitive.
-struct PrimitivePipeline {
-    data_layout: BindGroupLayout,
-    pipeline: RenderPipeline,
-    render: Box<dyn PrimitiveRender>,
-}
-
-/// One list's vertex buffer and the data its shader reads.
-struct ListBuffers {
-    instance: ArrBuf<PrimitiveInstance>,
-    data: ArrBuf<u8>,
-    group: Option<BindGroup>,
-    /// What the primitive asked to keep per instance, if anything.
-    bindings: Vec<u32>,
-}
-
-impl UiRenderNode {
-    pub fn draw<'a>(&'a self, pass: &mut RenderPass<'a>) {
-        pass.set_bind_group(0, &self.shared_group, &[]);
-        for i in &self.active {
-            let layer = &self.layers[i];
-            for (id, list) in layer.primitives.iter().enumerate() {
-                let Some(list) = list else { continue };
-                let Some(group) = &list.group else { continue };
-                let primitive = &self.primitives[id];
-                pass.set_pipeline(&primitive.pipeline);
-                pass.set_bind_group(1, group, &[]);
-                pass.set_vertex_buffer(0, list.instance.buffer.slice(..));
-                primitive.render.draw(
-                    pass,
-                    ListDraw {
-                        instances: list.instance.len() as u32,
-                        bindings: &list.bindings,
-                    },
-                );
-            }
-        }
-    }
-
-    pub fn update(
-        &mut self,
-        device: &Device,
-        queue: &Queue,
-        ui: &mut UiData,
-        ui_render: &mut UiRenderState,
-    ) {
-        // Before the layers: each list is given its pipeline's data layout.
-        self.build_pipelines(device, queue, &ui.primitives);
-        self.active.clear();
-        for (i, draws) in ui_render.layers.iter_mut() {
-            self.active.push(i);
-            for change in draws.apply_free() {
-                if let Some(inst) = ui_render.active.get_mut(&change.id) {
-                    for primitive in &mut inst.primitives {
-                        let h = &mut primitive.handle;
-                        if h.layer == i && h.kind == change.kind && h.inst_idx == change.old {
-                            h.inst_idx = change.new;
-                            break;
-                        }
-                    }
-                }
-            }
-            let rlayer = self.layers.entry(i).or_insert_with(RenderLayer::new);
-            if draws.updated {
-                let lists = draws.primitives();
-                // The zip would otherwise skip a list with no pipeline.
-                assert!(lists.len() <= self.primitives.len());
-                rlayer.primitives.resize_with(lists.len(), || None);
-                for ((buffers, list), primitive) in rlayer
-                    .primitives
-                    .iter_mut()
-                    .zip(lists)
-                    .zip(&self.primitives)
-                {
-                    let Some(list) = list else {
-                        continue;
-                    };
-                    buffers
-                        .get_or_insert_with(|| ListBuffers::new(device))
-                        .update(device, queue, primitive, list);
-                }
-                draws.updated = false;
-            }
-        }
-        for primitive in &mut self.primitives {
-            primitive.render.update(ui);
-        }
-        let mut regroup = false;
-        if ui.masks.changed {
-            ui.masks.changed = false;
-            regroup |= self.masks.update(device, queue, &ui.masks[..]);
-        }
-        if ui_render.moves.changed {
-            ui_render.moves.changed = false;
-            regroup |= self.moves.update(device, queue, ui_render.moves.entries());
-        }
-        if regroup {
-            self.shared_group = Self::shared_group(
-                device,
-                &self.shared_layout,
-                &self.window_buffer,
-                &self.masks,
-                &self.moves,
-            );
-        }
-    }
-
-    pub fn resize(&mut self, size: impl Into<Vec2>, queue: &Queue) {
-        let size = size.into();
-        let slice = &[WindowUniform { dim: size }];
-        queue.write_buffer(&self.window_buffer, 0, bytemuck::cast_slice(slice));
-    }
-
-    pub fn new(device: &Device, config: &SurfaceConfiguration) -> Self {
-        let window_uniform = WindowUniform {
-            dim: Vec2::new(config.width as f32, config.height as f32),
-        };
-        let window_buffer = device.create_buffer_init(&BufferInitDescriptor {
-            label: Some("window"),
-            contents: bytemuck::cast_slice(&[window_uniform]),
-            usage: BufferUsages::UNIFORM | BufferUsages::COPY_DST,
-        });
-
-        let shared_layout = Self::shared_layout(device);
-        let masks = ArrBuf::new(
-            device,
-            BufferUsages::STORAGE | BufferUsages::COPY_DST,
-            "ui masks",
-        );
-        let moves = ArrBuf::new(
-            device,
-            BufferUsages::STORAGE | BufferUsages::COPY_DST,
-            "ui move offsets",
-        );
-        let shared_group =
-            Self::shared_group(device, &shared_layout, &window_buffer, &masks, &moves);
-
-        Self {
-            shared_layout,
-            shared_group,
-            format: config.format,
-            primitives: Vec::new(),
-            window_buffer,
-            layers: HashMap::default(),
-            active: Vec::new(),
-            masks,
-            moves,
-        }
-    }
-
-    /// Compiles a pipeline for every primitive registered since the last call.
-    /// Sources only ever arrive at the end, so an id keeps its pipeline.
-    fn build_pipelines(&mut self, device: &Device, queue: &Queue, registry: &PrimitiveRegistry) {
-        for source in &registry.sources()[self.primitives.len()..] {
-            let render = (source.render)(device, queue);
-            let data_layout = Self::data_layout(device, source.stride);
-            let mut groups = vec![Some(&self.shared_layout), Some(&data_layout)];
-            groups.extend(render.layout().map(Some));
-            let layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
-                label: Some(source.label),
-                bind_group_layouts: &groups,
-                immediate_size: 0,
-            });
-            let pipeline = Self::pipeline(device, &layout, self.format, source.wgsl, source.label);
-            self.primitives.push(PrimitivePipeline {
-                data_layout,
-                pipeline,
-                render,
-            });
-        }
-    }
-
-    fn pipeline(
-        device: &Device,
-        layout: &PipelineLayout,
-        format: TextureFormat,
-        wgsl: &str,
-        label: &str,
-    ) -> RenderPipeline {
-        let module = device.create_shader_module(ShaderModuleDescriptor {
-            label: Some(label),
-            source: ShaderSource::Wgsl(module_source(wgsl).into()),
-        });
-        device.create_render_pipeline(&RenderPipelineDescriptor {
-            label: Some(label),
-            layout: Some(layout),
-            vertex: VertexState {
-                module: &module,
-                entry_point: Some("vs_main"),
-                buffers: &[Some(PrimitiveInstance::desc())],
-                compilation_options: Default::default(),
-            },
-            fragment: Some(FragmentState {
-                module: &module,
-                entry_point: Some("fs_main"),
-                targets: &[Some(ColorTargetState {
-                    format,
-                    blend: Some(BlendState::ALPHA_BLENDING),
-                    write_mask: ColorWrites::ALL,
-                })],
-                compilation_options: Default::default(),
-            }),
-            primitive: PrimitiveState {
-                topology: PrimitiveTopology::TriangleStrip,
-                strip_index_format: None,
-                front_face: FrontFace::Cw,
-                cull_mode: Some(Face::Back),
-                polygon_mode: PolygonMode::Fill,
-                unclipped_depth: false,
-                conservative: false,
-            },
-            depth_stencil: None,
-            multisample: MultisampleState {
-                count: 1,
-                mask: !0,
-                alpha_to_coverage_enabled: false,
-            },
-            multiview_mask: None,
-            cache: None,
-        })
-    }
-
-    /// What every draw in the ui is given: the window, the masks and the
-    /// move chain every position is resolved through.
-    fn shared_layout(device: &Device) -> BindGroupLayout {
-        device.create_bind_group_layout(&BindGroupLayoutDescriptor {
-            entries: &[
-                BindGroupLayoutEntry {
-                    binding: 0,
-                    visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT,
-                    ty: BindingType::Buffer {
-                        ty: BufferBindingType::Uniform,
-                        has_dynamic_offset: false,
-                        min_binding_size: BufferSize::new(size_of::<WindowUniform>() as u64),
-                    },
-                    count: None,
-                },
-                BindGroupLayoutEntry {
-                    binding: 1,
-                    visibility: ShaderStages::FRAGMENT,
-                    ty: BindingType::Buffer {
-                        ty: BufferBindingType::Storage { read_only: true },
-                        has_dynamic_offset: false,
-                        min_binding_size: BufferSize::new(size_of::<Mask>() as u64),
-                    },
-                    count: None,
-                },
-                BindGroupLayoutEntry {
-                    binding: 2,
-                    visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT,
-                    ty: BindingType::Buffer {
-                        ty: BufferBindingType::Storage { read_only: true },
-                        has_dynamic_offset: false,
-                        min_binding_size: BufferSize::new(size_of::<MoveOffset>() as u64),
-                    },
-                    count: None,
-                },
-            ],
-            label: Some("ui shared"),
-        })
-    }
-
-    fn shared_group(
-        device: &Device,
-        layout: &BindGroupLayout,
-        window: &Buffer,
-        masks: &ArrBuf<Mask>,
-        moves: &ArrBuf<MoveOffset>,
-    ) -> BindGroup {
-        device.create_bind_group(&BindGroupDescriptor {
-            layout,
-            entries: &[
-                BindGroupEntry {
-                    binding: 0,
-                    resource: window.as_entire_binding(),
-                },
-                BindGroupEntry {
-                    binding: 1,
-                    resource: masks.buffer.as_entire_binding(),
-                },
-                BindGroupEntry {
-                    binding: 2,
-                    resource: moves.buffer.as_entire_binding(),
-                },
-            ],
-            label: Some("ui shared"),
-        })
-    }
-
-    /// Layout for a list of one primitive's data. Every size in the ui is
-    /// stated, so "is the buffer big enough for one entry?" is answered when
-    /// the bind group is made; a `None` size is wgpu's to check on every draw.
-    fn data_layout(device: &Device, stride: u64) -> BindGroupLayout {
-        device.create_bind_group_layout(&BindGroupLayoutDescriptor {
-            entries: &[BindGroupLayoutEntry {
-                binding: 0,
-                visibility: ShaderStages::FRAGMENT,
-                ty: BindingType::Buffer {
-                    ty: BufferBindingType::Storage { read_only: true },
-                    has_dynamic_offset: false,
-                    min_binding_size: BufferSize::new(stride),
-                },
-                count: None,
-            }],
-            label: Some("ui primitive data"),
-        })
-    }
-}
-
-impl RenderLayer {
-    fn new() -> Self {
-        Self {
-            primitives: Vec::new(),
-        }
-    }
-}
-
-impl ListBuffers {
-    fn new(device: &Device) -> Self {
-        Self {
-            instance: ArrBuf::new(
-                device,
-                BufferUsages::VERTEX | BufferUsages::COPY_DST,
-                "instance",
-            ),
-            data: ArrBuf::new(
-                device,
-                BufferUsages::STORAGE | BufferUsages::COPY_DST,
-                "primitive data",
-            ),
-            group: None,
-            bindings: Vec::new(),
-        }
-    }
-
-    fn update(
-        &mut self,
-        device: &Device,
-        queue: &Queue,
-        primitive: &PrimitivePipeline,
-        list: &InstanceList,
-    ) {
-        self.bindings.clear();
-        primitive.render.instance_bindings(list, &mut self.bindings);
-        self.instance.update(device, queue, list.instances());
-        let resized = self.data.update(device, queue, list.data());
-        if list.instances().is_empty() {
-            self.group = None;
-        } else if resized || self.group.is_none() {
-            self.group = Some(device.create_bind_group(&BindGroupDescriptor {
-                layout: &primitive.data_layout,
-                entries: &[BindGroupEntry {
-                    binding: 0,
-                    resource: self.data.buffer.as_entire_binding(),
-                }],
-                label: Some("ui primitive data"),
-            }));
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::module_source;
-    use wgpu::naga::{
-        front::wgsl,
-        valid::{Capabilities, ValidationFlags, Validator},
-    };
-
-    /// Every shader file, composed as the renderer composes it, parses and
-    /// validates with no device -- so an edit that breaks one fails here and
-    /// not in the first window opened.
-    #[test]
-    fn every_shader_validates() {
-        let dir = concat!(env!("CARGO_MANIFEST_DIR"), "/src/render/shader");
-        let mut checked = 0;
-        for entry in std::fs::read_dir(dir).unwrap() {
-            let path = entry.unwrap().path();
-            if path.extension().is_none_or(|e| e != "wgsl") || path.ends_with("prelude.wgsl") {
-                continue;
-            }
-            let source = module_source(&std::fs::read_to_string(&path).unwrap());
-            let module = wgsl::parse_str(&source)
-                .unwrap_or_else(|e| panic!("{}: {}", path.display(), e.emit_to_string(&source)));
-            Validator::new(ValidationFlags::all(), Capabilities::all())
-                .validate(&module)
-                .unwrap_or_else(|e| panic!("{}: {e:?}", path.display()));
-            checked += 1;
-        }
-        assert!(checked > 0, "no shaders found in {dir}");
-    }
-}

core/src/render/page.rs

@@ -1,156 +0,0 @@
-use wgpu::*;
-
-use crate::{GlyphAtlas, UiData};
-
-use super::{
-    atlas::PAGE,
-    primitive::{ListDraw, PrimitiveRender},
-    texture::{default_sampler, sampled_group, sampled_layout, write_region},
-};
-
-/// Draws glyphs from the atlas, which it owns: one array texture bound once
-/// for a whole list, since every glyph in it reads the same pages.
-pub struct GlyphRender {
-    pages: GpuPages,
-    layout: BindGroupLayout,
-    sampler: Sampler,
-}
-
-impl GlyphRender {
-    pub fn new(device: &Device, queue: &Queue) -> Self {
-        let layout = sampled_layout(device, TextureViewDimension::D2Array, "ui atlas");
-        let sampler = default_sampler(device);
-        Self {
-            pages: GpuPages::new(device, queue, &layout, &sampler),
-            layout,
-            sampler,
-        }
-    }
-}
-
-impl PrimitiveRender for GlyphRender {
-    fn layout(&self) -> Option<&BindGroupLayout> {
-        Some(&self.layout)
-    }
-
-    fn update(&mut self, ui: &mut UiData) {
-        self.pages
-            .update(&mut ui.text.atlas, &self.layout, &self.sampler);
-    }
-
-    fn draw<'a>(&'a self, pass: &mut RenderPass<'a>, list: ListDraw<'a>) {
-        pass.set_bind_group(2, self.pages.group(), &[]);
-        pass.draw(0..4, 0..list.instances);
-    }
-}
-
-/// The glyph atlas on the GPU: one array texture whose layers are the pages
-/// `GlyphAtlas` packs.
-///
-/// One array rather than a texture per page because a layer index is ordinary
-/// Vulkan 1.0 / GLES sampling, where a `binding_array` would need
-/// `VK_EXT_descriptor_indexing`, which a real share of Android GPUs lack.
-pub struct GpuPages {
-    device: Device,
-    queue: Queue,
-    texture: Texture,
-    group: BindGroup,
-}
-
-impl GpuPages {
-    pub fn new(
-        device: &Device,
-        queue: &Queue,
-        layout: &BindGroupLayout,
-        sampler: &Sampler,
-    ) -> Self {
-        let texture = create_array(device, 1);
-        Self {
-            device: device.clone(),
-            queue: queue.clone(),
-            group: atlas_group(device, layout, &texture, sampler),
-            texture,
-        }
-    }
-
-    pub fn update(&mut self, atlas: &mut GlyphAtlas, layout: &BindGroupLayout, sampler: &Sampler) {
-        if atlas.page_count() > self.texture.depth_or_array_layers() {
-            self.grow(atlas.page_count(), layout, sampler);
-        }
-        for (upload, page) in atlas.uploads() {
-            let dst = TexelCopyTextureInfo {
-                texture: &self.texture,
-                mip_level: 0,
-                origin: Origin3d {
-                    x: upload.rect.x,
-                    y: upload.rect.y,
-                    z: upload.layer,
-                },
-                aspect: TextureAspect::All,
-            };
-            write_region(&self.queue, dst, page, upload.rect);
-        }
-    }
-
-    pub fn group(&self) -> &BindGroup {
-        &self.group
-    }
-
-    /// Doubles until `needed` fits and copies the old layers across GPU side.
-    /// The new texture stales the group, so that is rebuilt here.
-    fn grow(&mut self, needed: u32, layout: &BindGroupLayout, sampler: &Sampler) {
-        let old = self.texture.depth_or_array_layers();
-        let mut layers = old;
-        while layers < needed {
-            layers *= 2;
-        }
-        let texture = create_array(&self.device, layers);
-        let mut encoder = self
-            .device
-            .create_command_encoder(&CommandEncoderDescriptor {
-                label: Some("atlas grow"),
-            });
-        encoder.copy_texture_to_texture(
-            self.texture.as_image_copy(),
-            texture.as_image_copy(),
-            Extent3d {
-                width: PAGE,
-                height: PAGE,
-                depth_or_array_layers: old,
-            },
-        );
-        self.queue.submit(std::iter::once(encoder.finish()));
-        self.group = atlas_group(&self.device, layout, &texture, sampler);
-        self.texture = texture;
-    }
-}
-
-fn atlas_group(
-    device: &Device,
-    layout: &BindGroupLayout,
-    texture: &Texture,
-    sampler: &Sampler,
-) -> BindGroup {
-    let view = texture.create_view(&TextureViewDescriptor {
-        dimension: Some(TextureViewDimension::D2Array),
-        ..Default::default()
-    });
-    sampled_group(device, layout, &view, sampler, "ui atlas")
-}
-
-fn create_array(device: &Device, layers: u32) -> Texture {
-    device.create_texture(&TextureDescriptor {
-        label: Some("glyph atlas"),
-        size: Extent3d {
-            width: PAGE,
-            height: PAGE,
-            depth_or_array_layers: layers,
-        },
-        mip_level_count: 1,
-        sample_count: 1,
-        dimension: TextureDimension::D2,
-        format: TextureFormat::Rgba8Unorm,
-        usage: TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST | TextureUsages::COPY_SRC,
-        view_formats: &[],
-    })
-}

core/src/render/primitive.rs

@@ -1,401 +0,0 @@
-use std::{any::TypeId, marker::PhantomData};
-
-use crate::{
-    Color, TextureHandle, UiData, UiRegion, WidgetId,
-    render::{
-        data::{MaskIdx, MoveIdx, PrimitiveInstance},
-        page::GlyphRender,
-        texture::ImageRender,
-    },
-    util::{HashMap, Vec2},
-};
-use bytemuck::Pod;
-use wgpu::{BindGroupLayout, Device, Queue, RenderPass};
-
-/// One instance of a primitive, laid out as the struct its shader reads.
-///
-/// The type carries its own shader, so drawing one is all the wiring it needs:
-/// its list, free list, buffers and pipeline follow from being registered.
-pub trait Primitive: Pod + 'static {
-    /// Compiled after `prelude.wgsl`, which states what it declares and what
-    /// it is given.
-    const WGSL: &'static str;
-
-    /// Made once, the first time the renderer sees this primitive. It owns
-    /// whatever the shader samples and records the primitive's own draws; the
-    /// default owns nothing and draws every instance in one call.
-    fn render(device: &Device, queue: &Queue) -> Box<dyn PrimitiveRender>
-    where
-        Self: Sized,
-    {
-        let _ = (device, queue);
-        Box::new(Instanced)
-    }
-}
-
-/// The renderer's half of a primitive: what it samples, what it uploads, and
-/// what draws it records.
-///
-/// Everything a draw shares -- the pipeline, the window and masks, the list's
-/// own data and instance buffer -- is set before this is called. What is left
-/// is what only this primitive knows: its group 2, and how many draws its
-/// instances are.
-pub trait PrimitiveRender {
-    /// The layout its shader reads at group 2. `None` for a primitive whose
-    /// shader samples nothing, whose pipeline then has no group 2 at all.
-    fn layout(&self) -> Option<&BindGroupLayout> {
-        None
-    }
-
-    /// Uploads whatever this primitive owns, once a frame, before any draw.
-    fn update(&mut self, ui: &mut UiData) {
-        let _ = ui;
-    }
-
-    /// Keeps what the primitive needs per instance at draw time, read from
-    /// the list's own data. A primitive that binds nothing per instance --
-    /// most of them -- leaves this empty and draws in one call.
-    fn instance_bindings(&self, list: &InstanceList, out: &mut Vec<u32>) {
-        let _ = (list, out);
-    }
-
-    fn draw<'a>(&'a self, pass: &mut RenderPass<'a>, list: ListDraw<'a>);
-}
-
-/// What a `PrimitiveRender` draws: this list's instances, and whatever
-/// `instance_bindings` kept for them.
-pub struct ListDraw<'a> {
-    pub instances: u32,
-    pub bindings: &'a [u32],
-}
-
-/// The default: nothing sampled, every instance in one call.
-pub struct Instanced;
-
-impl PrimitiveRender for Instanced {
-    fn draw<'a>(&'a self, pass: &mut RenderPass<'a>, list: ListDraw<'a>) {
-        pass.draw(0..4, 0..list.instances);
-    }
-}
-
-/// Which registered primitive an instance is.
-pub struct PrimitiveKind<P> {
-    id: u32,
-    _p: PhantomData<fn(P)>,
-}
-
-impl<P> PrimitiveKind<P> {
-    fn new(id: u32) -> Self {
-        Self {
-            id,
-            _p: PhantomData,
-        }
-    }
-}
-
-impl<P> Clone for PrimitiveKind<P> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl<P> Copy for PrimitiveKind<P> {}
-
-/// Every primitive a ui can draw, in the order they were first drawn.
-#[derive(Default)]
-pub struct PrimitiveRegistry {
-    kinds: Vec<PrimitiveSource>,
-    ids: HashMap<TypeId, u32>,
-}
-
-pub struct PrimitiveSource {
-    pub wgsl: &'static str,
-    pub label: &'static str,
-    /// Size of one instance's entry, stated as the data binding's minimum.
-    pub stride: u64,
-    pub render: fn(&Device, &Queue) -> Box<dyn PrimitiveRender>,
-}
-
-impl PrimitiveRegistry {
-    /// Registers `P` if this is the first time it has been drawn.
-    pub fn kind<P: Primitive>(&mut self) -> PrimitiveKind<P> {
-        let Self { kinds, ids } = self;
-        let id = *ids.entry(TypeId::of::<P>()).or_insert_with(|| {
-            kinds.push(PrimitiveSource {
-                wgsl: P::WGSL,
-                label: std::any::type_name::<P>(),
-                stride: size_of::<P>() as u64,
-                render: P::render,
-            });
-            kinds.len() as u32 - 1
-        });
-        PrimitiveKind::new(id)
-    }
-
-    pub fn sources(&self) -> &[PrimitiveSource] {
-        &self.kinds
-    }
-}
-
-/// One registered primitive's instances in one layer. Everything per-instance
-/// rides here, so it stays in step through a `swap_remove`.
-pub struct InstanceList {
-    instances: Vec<PrimitiveInstance>,
-    /// The widget each instance belongs to, for renumbering its handles.
-    assoc: Vec<WidgetId>,
-    free: Vec<usize>,
-    /// `stride` bytes of the primitive's own data per instance.
-    data: Vec<u8>,
-    /// From the type the list was made for, so a write is never checked.
-    stride: usize,
-}
-
-impl InstanceList {
-    fn new<P: Primitive>() -> Self {
-        Self {
-            instances: Vec::new(),
-            assoc: Vec::new(),
-            free: Vec::new(),
-            data: Vec::new(),
-            stride: size_of::<P>(),
-        }
-    }
-
-    pub fn instances(&self) -> &[PrimitiveInstance] {
-        &self.instances
-    }
-
-    pub fn data(&self) -> &[u8] {
-        &self.data
-    }
-
-    pub fn stride(&self) -> usize {
-        self.stride
-    }
-
-    fn push(&mut self, id: WidgetId, inst: PrimitiveInstance, data: &[u8]) -> usize {
-        if let Some(i) = self.free.pop() {
-            self.instances[i] = inst;
-            self.assoc[i] = id;
-            self.data[i * self.stride..][..self.stride].copy_from_slice(data);
-            i
-        } else {
-            let i = self.instances.len();
-            self.instances.push(inst);
-            self.assoc.push(id);
-            self.data.extend_from_slice(data);
-            i
-        }
-    }
-
-    fn free(&mut self, i: usize) -> MaskIdx {
-        self.free.push(i);
-        self.instances[i].mask_idx
-    }
-
-    fn apply_free(&mut self, kind: u32) -> impl Iterator<Item = PrimitiveChange> {
-        self.free.sort_by(|a, b| b.cmp(a));
-        let instances = &mut self.instances;
-        let assoc = &mut self.assoc;
-        let data = &mut self.data;
-        let stride = self.stride;
-        self.free.drain(..).filter_map(move |i| {
-            instances.swap_remove(i);
-            assoc.swap_remove(i);
-            let last = instances.len();
-            data.copy_within(last * stride..(last + 1) * stride, i * stride);
-            data.truncate(last * stride);
-            if i == last {
-                return None;
-            }
-            let id = assoc[i];
-            Some(PrimitiveChange {
-                id,
-                kind,
-                old: last,
-                new: i,
-            })
-        })
-    }
-}
-
-/// Everything one layer draws, one list per registered primitive.
-pub struct LayerDraws {
-    /// `None` until this layer draws that primitive, because only the write
-    /// knows the type the list is for.
-    primitives: Vec<Option<InstanceList>>,
-    pub updated: bool,
-}
-
-impl Default for LayerDraws {
-    fn default() -> Self {
-        Self {
-            primitives: Vec::new(),
-            updated: true,
-        }
-    }
-}
-
-impl LayerDraws {
-    pub fn write<P: Primitive>(
-        &mut self,
-        layer: usize,
-        PrimitiveInst {
-            kind,
-            id,
-            primitive,
-            region,
-            mask_idx,
-            move_idx,
-        }: PrimitiveInst<P>,
-    ) -> PrimitiveHandle {
-        self.updated = true;
-        // Grown on first use rather than sized from the registry, which a
-        // layer cannot see.
-        if self.primitives.len() <= kind.id as usize {
-            self.primitives.resize_with(kind.id as usize + 1, || None);
-        }
-        let inst_idx = self.primitives[kind.id as usize]
-            .get_or_insert_with(InstanceList::new::<P>)
-            .push(
-                id,
-                PrimitiveInstance {
-                    region,
-                    mask_idx,
-                    move_idx,
-                },
-                bytemuck::bytes_of(&primitive),
-            );
-        PrimitiveHandle {
-            layer,
-            kind: kind.id,
-            inst_idx,
-        }
-    }
-
-    pub fn primitives(&self) -> &[Option<InstanceList>] {
-        &self.primitives
-    }
-
-    pub fn apply_free(&mut self) -> impl Iterator<Item = PrimitiveChange> {
-        self.primitives
-            .iter_mut()
-            .enumerate()
-            .filter_map(|(kind, list)| Some((kind as u32, list.as_mut()?)))
-            .flat_map(|(kind, list)| list.apply_free(kind))
-    }
-
-    pub fn free(&mut self, h: &PrimitiveHandle) -> MaskIdx {
-        self.updated = true;
-        self.list(h).free(h.inst_idx)
-    }
-
-    pub fn region_mut(&mut self, h: &PrimitiveHandle) -> &mut UiRegion {
-        self.updated = true;
-        &mut self.list(h).instances[h.inst_idx].region
-    }
-
-    /// A handle is only ever made by `write`, which is what created the list.
-    fn list(&mut self, h: &PrimitiveHandle) -> &mut InstanceList {
-        self.primitives[h.kind as usize]
-            .as_mut()
-            .expect("handle names a primitive this layer never drew")
-    }
-}
-
-pub struct PrimitiveInst<P> {
-    pub kind: PrimitiveKind<P>,
-    pub id: WidgetId,
-    pub primitive: P,
-    pub region: UiRegion,
-    pub mask_idx: MaskIdx,
-    pub move_idx: MoveIdx,
-}
-
-pub struct PrimitiveChange {
-    pub id: WidgetId,
-    /// Which registered primitive's list moved, since they index separately.
-    pub kind: u32,
-    pub old: usize,
-    pub new: usize,
-}
-
-#[derive(Debug)]
-pub struct PrimitiveHandle {
-    pub layer: usize,
-    pub kind: u32,
-    pub inst_idx: usize,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct RectPrimitive {
-    pub color: Color<u8>,
-    pub radius: f32,
-    pub thickness: f32,
-    pub inner_radius: f32,
-}
-
-impl Primitive for RectPrimitive {
-    const WGSL: &'static str = include_str!("shader/rect.wgsl");
-}
-
-impl RectPrimitive {
-    pub fn color(color: Color<u8>) -> Self {
-        Self {
-            color,
-            radius: 0.0,
-            thickness: 0.0,
-            inner_radius: 0.0,
-        }
-    }
-}
-
-/// `color` is multiplied by the atlas alpha for a mask glyph; a colour glyph
-/// takes the texel unchanged, which `GlyphEntry::IS_COLORED` selects.
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GlyphPrimitive {
-    pub uv_min: Vec2,
-    pub uv_max: Vec2,
-    /// Which atlas array layer this glyph is on.
-    pub layer: u32,
-    pub color: Color<u8>,
-    pub flags: u32,
-}
-
-// Manual rather than derived: `Vec2`'s alignment leaves four bytes of padding
-// here, which is how WGSL lays the struct out.
-unsafe impl bytemuck::Pod for GlyphPrimitive {}
-unsafe impl bytemuck::Zeroable for GlyphPrimitive {}
-impl Primitive for GlyphPrimitive {
-    const WGSL: &'static str = include_str!("shader/glyph.wgsl");
-
-    fn render(device: &Device, queue: &Queue) -> Box<dyn PrimitiveRender> {
-        Box::new(GlyphRender::new(device, queue))
-    }
-}
-
-/// One drawn image. Its shader reads nothing per instance; the slot names the
-/// texture to bind for it.
-#[repr(C)]
-#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct TexturePrimitive {
-    pub slot: u32,
-}
-
-impl Primitive for TexturePrimitive {
-    const WGSL: &'static str = include_str!("shader/texture.wgsl");
-
-    fn render(device: &Device, queue: &Queue) -> Box<dyn PrimitiveRender> {
-        Box::new(ImageRender::new(device, queue))
-    }
-}
-
-impl From<&TextureHandle> for TexturePrimitive {
-    fn from(handle: &TextureHandle) -> Self {
-        Self {
-            slot: handle.slot(),
-        }
-    }
-}

core/src/render/shader/glyph.wgsl

@@ -1,33 +0,0 @@
-// Matches `GlyphEntry::IS_COLORED`.
-const COLORED: u32 = 1u;
-
-// The glyph atlas, whose array layers are its pages.
-@group(2) @binding(0)
-var atlas: texture_2d_array<f32>;
-@group(2) @binding(1)
-var samp: sampler;
-
-struct GlyphInfo {
-    uv_min: vec2<f32>,
-    uv_max: vec2<f32>,
-    // Which layer of the atlas array this glyph's page is.
-    layer: u32,
-    color: u32,
-    flags: u32,
-}
-
-@group(1) @binding(0)
-var<storage> glyphs: array<GlyphInfo>;
-
-@fragment
-fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-    let g = glyphs[in.idx];
-    let uv = mix(g.uv_min, g.uv_max, in.uv);
-    let texel = textureSample(atlas, samp, uv, i32(g.layer));
-    if (g.flags & COLORED) != 0u {
-        return masked(in, texel);
-    }
-    var color = unpack4x8unorm(g.color);
-    color.a *= texel.a;
-    return masked(in, color);
-}

core/src/render/shader/prelude.wgsl

@@ -1,193 +0,0 @@
-// Prepended to every primitive's shader, which declares its own instance data
-// as `var<storage> <name>: array<T>` at group 1 binding 0, and an `fs_main`
-// shading one instance of it. What it samples, if anything, is bound at group
-// 2: the texture at binding 0 and the sampler at binding 1.
-
-@group(0) @binding(0)
-var<uniform> window: WindowUniform;
-@group(0) @binding(1)
-var<storage> masks: array<Mask>;
-@group(0) @binding(2)
-var<storage> move_offsets: array<MoveOffset>;
-
-struct WindowUniform {
-    dim: vec2<f32>,
-};
-
-struct Mask {
-    x: RawSpan,
-    y: RawSpan,
-    move_idx: u32,
-}
-
-struct MoveOffset {
-    x: RawSpan,
-    y: RawSpan,
-    parent: u32,
-}
-
-// `PX_STEP` and `REL_STEP` are prepended from `iris_core`'s own constants:
-// what it stores is a whole count of each, both powers of two, so decoding
-// is exact and the number here is the number the CPU decided.
-
-// Every coordinate the CPU decided is a whole count of `PX_STEP`, so one that
-// composes to within half a step of a pixel boundary is on that boundary and
-// belongs to the pixel above it. Flooring the product instead drops a pixel
-// wherever a fraction divides a window exactly: a fifth of 1920 comes out of
-// `REL_STEP` as 383.99998, and five tabs each lose their last column.
-//
-// Taken over the whole coordinate, fraction and pixels summed, since a floor
-// does not distribute over a sum: floored apart, a half of one and a half of
-// the other lose the pixel the two together make.
-fn snap_floor(v: vec2<f32>) -> vec2<f32> {
-    return floor(v + PX_STEP * 0.5);
-}
-
-struct RawScalar {
-    rel: i32,
-    px: i32,
-}
-
-struct RawSpan {
-    start: RawScalar,
-    end: RawScalar,
-}
-
-fn scalar_of(raw: RawScalar) -> Len {
-    return Len(f32(raw.rel) * REL_STEP, f32(raw.px) * PX_STEP);
-}
-
-fn span_of(raw: RawSpan) -> UiSpan {
-    return UiSpan(scalar_of(raw.start), scalar_of(raw.end));
-}
-
-fn scalar_of_pair(raw: vec2<i32>) -> Len {
-    return Len(f32(raw.x) * REL_STEP, f32(raw.y) * PX_STEP);
-}
-
-struct Region {
-    x: UiSpan,
-    y: UiSpan,
-}
-
-const MOVE_NONE: u32 = 4294967295u;
-// Keep in step with `iris_core::CHAIN_LIMIT`. It bounds a malformed cycle
-// rather than any real tree, and the CPU walk uses the same number so both
-// resolve a deep one the same way.
-const CHAIN_LIMIT: u32 = 64u;
-
-// The same expression `Len::within` uses, in floats rather than on the
-// CPU's grid: a move is resolved here so that scrolling a subtree writes one
-// entry instead of walking it. What has to hold is that this agrees with
-// itself frame to frame, not that it matches the CPU to the last bit.
-fn scalar_within(s: Len, p: UiSpan) -> Len {
-    return Len(
-        p.start.rel + (p.end.rel - p.start.rel) * s.rel,
-        s.px + (p.start.px + (p.end.px - p.start.px) * s.rel),
-    );
-}
-
-fn span_within(s: UiSpan, p: UiSpan) -> UiSpan {
-    return UiSpan(scalar_within(s.start, p), scalar_within(s.end, p));
-}
-
-fn resolve_move(idx: u32, local: Region) -> Region {
-    var r = local;
-    var at = idx;
-    for (var step = 0u; step < CHAIN_LIMIT; step++) {
-        if at == MOVE_NONE {
-            break;
-        }
-        let entry = move_offsets[at];
-        r = Region(span_within(r.x, span_of(entry.x)), span_within(r.y, span_of(entry.y)));
-        at = entry.parent;
-    }
-    return r;
-}
-
-struct UiSpan {
-    start: Len,
-    end: Len,
-}
-
-struct Len {
-    rel: f32,
-    px: f32,
-}
-
-struct InstanceInput {
-    @location(0) x_start: vec2<i32>,
-    @location(1) x_end: vec2<i32>,
-    @location(2) y_start: vec2<i32>,
-    @location(3) y_end: vec2<i32>,
-    @location(4) mask_idx: u32,
-    @location(5) move_idx: u32,
-}
-
-struct VertexOutput {
-    @location(0) top_left: vec2<f32>,
-    @location(1) bot_right: vec2<f32>,
-    @location(2) uv: vec2<f32>,
-    @location(3) @interpolate(flat) mask_idx: u32,
-    @location(4) @interpolate(flat) idx: u32,
-    @builtin(position) clip_position: vec4<f32>,
-};
-
-@vertex
-fn vs_main(
-    @builtin(vertex_index) vi: u32,
-    @builtin(instance_index) ii: u32,
-    in: InstanceInput,
-) -> VertexOutput {
-    var out: VertexOutput;
-
-    let local = Region(
-        UiSpan(scalar_of_pair(in.x_start), scalar_of_pair(in.x_end)),
-        UiSpan(scalar_of_pair(in.y_start), scalar_of_pair(in.y_end)),
-    );
-    let r = resolve_move(in.move_idx, local);
-    let top_left_rel = vec2(r.x.start.rel, r.y.start.rel);
-    let top_left_px = vec2(r.x.start.px, r.y.start.px);
-    let bot_right_rel = vec2(r.x.end.rel, r.y.end.rel);
-    let bot_right_px = vec2(r.x.end.px, r.y.end.px);
-
-    let top_left = snap_floor(top_left_rel * window.dim + top_left_px);
-    let bot_right = snap_floor(bot_right_rel * window.dim + bot_right_px);
-    let size = bot_right - top_left;
-
-    let uv = vec2<f32>(
-        f32(vi % 2u),
-        f32(vi / 2u)
-    );
-    let pos = (top_left + uv * size) / window.dim * 2.0 - 1.0;
-    out.clip_position = vec4<f32>(pos.x, -pos.y, 0.0, 1.0);
-    out.uv = uv;
-    out.top_left = top_left;
-    out.bot_right = bot_right;
-    out.mask_idx = in.mask_idx;
-    out.idx = ii;
-
-    return out;
-}
-
-fn masked(in: VertexOutput, color: vec4<f32>) -> vec4<f32> {
-    if in.mask_idx == 4294967295u {
-        return color;
-    }
-    let mask = masks[in.mask_idx];
-    // Its own chain, not the drawn primitive's, so a stationary viewport
-    // clips content that moves inside it.
-    let m = resolve_move(mask.move_idx, Region(span_of(mask.x), span_of(mask.y)));
-    let tl = vec2(m.x.start.rel, m.y.start.rel);
-    let tl_px = vec2(m.x.start.px, m.y.start.px);
-    let br = vec2(m.x.end.rel, m.y.end.rel);
-    let br_px = vec2(m.x.end.px, m.y.end.px);
-
-    let top_left = snap_floor(tl * window.dim + tl_px);
-    let bot_right = snap_floor(br * window.dim + br_px);
-    let pos = in.clip_position.xy;
-    if pos.x < top_left.x || pos.x > bot_right.x || pos.y < top_left.y || pos.y > bot_right.y {
-        return color * 0.0;
-    }
-    return color;
-}

core/src/render/shader/rect.wgsl

@@ -1,39 +0,0 @@
-struct Rect {
-    color: u32,
-    radius: f32,
-    thickness: f32,
-    inner_radius: f32,
-}
-
-@group(1) @binding(0)
-var<storage> rects: array<Rect>;
-
-@fragment
-fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-    let rect = rects[in.idx];
-    var color = unpack4x8unorm(rect.color);
-
-    let edge = 0.5;
-    let size = in.bot_right - in.top_left;
-    let corner = size / 2.0;
-    let center = in.top_left + corner;
-    let pos = in.clip_position.xy;
-
-    let dist = distance_from_rect(pos, center, corner, rect.radius);
-    color.a *= 1.0 - smoothstep(-min(edge, rect.radius), edge, dist);
-
-    if rect.thickness > 0.0 {
-        let dist2 = distance_from_rect(pos, center, corner - rect.thickness, rect.inner_radius);
-        color.a *= smoothstep(-min(edge, rect.inner_radius), edge, dist2);
-    }
-
-    return masked(in, color);
-}
-
-fn distance_from_rect(pixel_pos: vec2<f32>, rect_center: vec2<f32>, rect_corner: vec2<f32>, radius: f32) -> f32 {
-    // vec from center to pixel
-    let p = pixel_pos - rect_center;
-    // vec from inner rect corner to pixel
-    let q = abs(p) - (rect_corner - radius);
-    return length(max(q, vec2(0.0))) - radius;
-}

core/src/render/shader/texture.wgsl

@@ -1,10 +0,0 @@
-// The image this instance draws, bound for it alone.
-@group(2) @binding(0)
-var image: texture_2d<f32>;
-@group(2) @binding(1)
-var samp: sampler;
-
-@fragment
-fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-    return masked(in, textureSample(image, samp, in.uv));
-}

core/src/render/texture.rs

@@ -1,243 +0,0 @@
-use image::{DynamicImage, EncodableLayout, GenericImageView, RgbaImage};
-use wgpu::{util::DeviceExt, *};
-
-use crate::{
-    PatchRect, TextureUpdate, Textures, UiData,
-    render::{
-        TexturePrimitive,
-        primitive::{ListDraw, PrimitiveRender},
-    },
-};
-
-/// Draws standalone images, which it owns. Each is its own texture, so each
-/// instance binds its own and is a draw of its own.
-pub struct ImageRender {
-    textures: GpuTextures,
-    layout: BindGroupLayout,
-    sampler: Sampler,
-}
-
-impl ImageRender {
-    pub fn new(device: &Device, queue: &Queue) -> Self {
-        Self {
-            textures: GpuTextures::new(device, queue),
-            layout: sampled_layout(device, TextureViewDimension::D2, "ui image"),
-            sampler: default_sampler(device),
-        }
-    }
-}
-
-impl PrimitiveRender for ImageRender {
-    fn layout(&self) -> Option<&BindGroupLayout> {
-        Some(&self.layout)
-    }
-
-    fn update(&mut self, ui: &mut UiData) {
-        self.textures
-            .update(&mut ui.textures, &self.layout, &self.sampler);
-    }
-
-    fn instance_bindings(&self, list: &super::InstanceList, out: &mut Vec<u32>) {
-        let slots = list
-            .data()
-            .chunks_exact(list.stride())
-            .map(|data| bytemuck::pod_read_unaligned::<TexturePrimitive>(data).slot);
-        out.extend(slots);
-    }
-
-    fn draw<'a>(&'a self, pass: &mut RenderPass<'a>, list: ListDraw<'a>) {
-        for (i, &slot) in list.bindings.iter().enumerate() {
-            let Some(image) = self.textures.group(slot) else {
-                continue;
-            };
-            pass.set_bind_group(2, image, &[]);
-            pass.draw(0..4, i as u32..i as u32 + 1);
-        }
-    }
-}
-
-/// The standalone images a ui draws, each its own texture and bind group --
-/// unlike the glyph atlas in `super::page`, which is one array they share.
-pub struct GpuTextures {
-    device: Device,
-    queue: Queue,
-    slots: Vec<Option<ImageGpu>>,
-}
-
-struct ImageGpu {
-    /// Kept for `patch`, which needs the texture rather than the view.
-    texture: Texture,
-    group: BindGroup,
-}
-
-impl GpuTextures {
-    pub fn new(device: &Device, queue: &Queue) -> Self {
-        Self {
-            device: device.clone(),
-            queue: queue.clone(),
-            slots: Vec::new(),
-        }
-    }
-
-    pub fn update(&mut self, textures: &mut Textures, layout: &BindGroupLayout, sampler: &Sampler) {
-        for update in textures.updates() {
-            match update {
-                TextureUpdate::Push(image) => {
-                    let image = self.create(image, layout, sampler);
-                    self.slots.push(Some(image));
-                }
-                TextureUpdate::Set(i, image) => {
-                    let image = self.create(image, layout, sampler);
-                    self.slots[i as usize] = Some(image);
-                }
-                TextureUpdate::Patch(i, rect, image) => self.patch(i, rect, image),
-                TextureUpdate::PushFree => self.slots.push(None),
-                TextureUpdate::SetFree => {}
-                TextureUpdate::Free(i) => self.slots[i as usize] = None,
-            }
-        }
-    }
-
-    pub fn group(&self, slot: u32) -> Option<&BindGroup> {
-        self.slots.get(slot as usize)?.as_ref().map(|i| &i.group)
-    }
-
-    fn create(
-        &self,
-        image: &DynamicImage,
-        layout: &BindGroupLayout,
-        sampler: &Sampler,
-    ) -> ImageGpu {
-        let rgba = image.to_rgba8();
-        let (width, height) = rgba.dimensions();
-        let texture = self.device.create_texture_with_data(
-            &self.queue,
-            &TextureDescriptor {
-                label: Some("image"),
-                size: Extent3d {
-                    width,
-                    height,
-                    depth_or_array_layers: 1,
-                },
-                mip_level_count: 1,
-                sample_count: 1,
-                dimension: TextureDimension::D2,
-                format: TextureFormat::Rgba8Unorm,
-                usage: TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST,
-                view_formats: &[],
-            },
-            wgt::TextureDataOrder::MipMajor,
-            rgba.as_bytes(),
-        );
-        let view = texture.create_view(&TextureViewDescriptor::default());
-        let group = sampled_group(&self.device, layout, &view, sampler, "ui image");
-        ImageGpu { texture, group }
-    }
-
-    fn patch(&mut self, i: u32, rect: PatchRect, image: &DynamicImage) {
-        let Some(Some(slot)) = self.slots.get(i as usize) else {
-            return;
-        };
-        let dst = TexelCopyTextureInfo {
-            texture: &slot.texture,
-            mip_level: 0,
-            origin: Origin3d {
-                x: rect.x,
-                y: rect.y,
-                z: 0,
-            },
-            aspect: TextureAspect::All,
-        };
-        match image.as_rgba8() {
-            Some(rgba) => write_region(&self.queue, dst, rgba, rect),
-            // The texture is rgba8, so any other layout has to be converted --
-            // and converting the rectangle is cheaper than the whole image.
-            None => {
-                let sub = image
-                    .view(rect.x, rect.y, rect.width, rect.height)
-                    .to_image();
-                write_region(&self.queue, dst, &sub, PatchRect { x: 0, y: 0, ..rect });
-            }
-        }
-    }
-}
-
-pub fn write_region(queue: &Queue, dst: TexelCopyTextureInfo, src: &RgbaImage, rect: PatchRect) {
-    if rect.width == 0 || rect.height == 0 {
-        return;
-    }
-    let stride = src.width() * 4;
-    queue.write_texture(
-        dst,
-        src.as_bytes(),
-        TexelCopyBufferLayout {
-            offset: (rect.y * stride + rect.x * 4) as u64,
-            bytes_per_row: Some(stride),
-            rows_per_image: Some(rect.height),
-        },
-        Extent3d {
-            width: rect.width,
-            height: rect.height,
-            depth_or_array_layers: 1,
-        },
-    );
-}
-
-/// What a primitive that samples binds: a texture, and the sampler that reads
-/// it.
-pub fn sampled_group(
-    device: &Device,
-    layout: &BindGroupLayout,
-    view: &TextureView,
-    sampler: &Sampler,
-    label: &'static str,
-) -> BindGroup {
-    device.create_bind_group(&BindGroupDescriptor {
-        layout,
-        entries: &[
-            BindGroupEntry {
-                binding: 0,
-                resource: BindingResource::TextureView(view),
-            },
-            BindGroupEntry {
-                binding: 1,
-                resource: BindingResource::Sampler(sampler),
-            },
-        ],
-        label: Some(label),
-    })
-}
-
-/// The layout for one of those. The dimension differs -- the atlas is an
-/// array of pages and an image is not -- and nothing else does.
-pub fn sampled_layout(
-    device: &Device,
-    dimension: TextureViewDimension,
-    label: &'static str,
-) -> BindGroupLayout {
-    device.create_bind_group_layout(&BindGroupLayoutDescriptor {
-        entries: &[
-            BindGroupLayoutEntry {
-                binding: 0,
-                visibility: ShaderStages::FRAGMENT,
-                ty: BindingType::Texture {
-                    sample_type: TextureSampleType::Float { filterable: false },
-                    view_dimension: dimension,
-                    multisampled: false,
-                },
-                count: None,
-            },
-            BindGroupLayoutEntry {
-                binding: 1,
-                visibility: ShaderStages::FRAGMENT,
-                ty: BindingType::Sampler(SamplerBindingType::NonFiltering),
-                count: None,
-            },
-        ],
-        label: Some(label),
-    })
-}
-
-pub fn default_sampler(device: &Device) -> Sampler {
-    device.create_sampler(&SamplerDescriptor::default())
-}

core/src/ui/active.rs

@@ -1,99 +0,0 @@
-use crate::{
-    Declared, LayerId, LayoutHolds, MaskIdx, MoveIdx, PlaceDesc, RegionAlign, RetainedPrimitive,
-    Size, TextureHandle, UiRegion, UiVec2, WidgetId,
-};
-
-/// What is kept of a widget its parent has asked about. `drawn` says whether
-/// it currently draws; one that does not is kept so that a change to it, or
-/// under it, still reaches whoever asked.
-#[derive(Debug)]
-pub struct ActiveData {
-    pub id: WidgetId,
-    /// Where its drawing goes, in its region node's coordinates.
-    pub placement: UiRegion,
-    /// What a fraction declared or reported under this widget is a fraction
-    /// of, as a length of the window.
-    pub rel_base: UiVec2,
-    /// Where its drawing was put, and where it was asked. The two differ
-    /// where a container asks in one place and puts the answer in another --
-    /// a row measures from its cursor and puts the child in its slot. Each
-    /// carries the rel base that ask stated, so asking again from either is
-    /// the same question it was.
-    pub placed: PlaceDesc,
-    pub asked: PlaceDesc,
-    /// The box it was asked in, in the parent's region-node coordinates: the
-    /// box its drawing was made in and the one its contract is about. Its
-    /// drawing is placed elsewhere by re-expression, never by asking again.
-    pub region: UiRegion,
-    /// The measured answer and its dependencies. A hint-only dependency or
-    /// a widget first encountered during placement has no measurement yet.
-    pub answer: Option<Answer>,
-    /// Asked more than once in its parent's last draw -- measured in one box
-    /// and then asked in the one the parent decided. The parent's layout
-    /// rests on the first answer and its drawing on the last, so only the
-    /// parent can ask either again.
-    pub re_asked: bool,
-    /// What the widget reported, in window-unit lengths.
-    pub size: Size,
-    /// The window and region reads that this drawing holds for, and the
-    /// rel base and region it pinned.
-    pub holds: LayoutHolds,
-    pub drawn: bool,
-    pub parent: Option<WidgetId>,
-    /// How far down the tree it was drawn, the root being 1. Carried down a
-    /// draw rather than worked out by walking up, so it is right for every
-    /// widget a frame visits and cannot drift while one is being drawn.
-    pub depth: usize,
-    pub textures: Vec<TextureHandle>,
-    /// Its primitives, each keeping the box it was written in -- in this
-    /// widget's placement coordinates, which is what a move recomposes from.
-    pub primitives: Vec<RetainedPrimitive>,
-    /// An owned mask holds one reference independently of its primitives.
-    pub mask_region: Option<UiRegion>,
-    pub children: Vec<WidgetId>,
-    /// The movable region its primitives are positioned through: its own when
-    /// opted in, otherwise the nearest ancestor's.
-    pub move_idx: MoveIdx,
-    /// The declared lengths whoever drew this widget resolved into its rel base.
-    /// A change to one moves a box this widget cannot fix by drawing again,
-    /// and comparing them is what says so.
-    pub declared: Declared,
-    /// Its alignment when it was last drawn, which a change to the property
-    /// is found against.
-    pub own_align: RegionAlign,
-    /// The movable region whose coordinates its placement is in when this
-    /// widget does not own a region node.
-    pub parent_move: MoveIdx,
-    /// The mask its drawing is clipped to: one it set itself, or the one it
-    /// inherited from whoever drew it.
-    pub mask: MaskIdx,
-    /// That inherited one. The two differ exactly where the widget set a
-    /// mask of its own, which is the one it owns and the one a move rewrites
-    /// -- and the one a redraw of it must not be handed back, since setting
-    /// a mask asserts there is none.
-    pub parent_mask: MaskIdx,
-    pub layer: LayerId,
-}
-
-impl ActiveData {
-    /// What it answered when its parent asked, where it has been asked at
-    /// all. Not `size`, which is what its last drawing reported: a drawing
-    /// re-expressed in the box that answer chose is not a second answer.
-    pub fn measured(&self) -> Option<Size> {
-        self.answer.map(|answer| answer.size)
-    }
-
-    /// Whether it owns a region node rather than sharing the one it was drawn
-    /// under, which is what its two move indices being different says.
-    pub fn is_region_node(&self) -> bool {
-        self.move_idx != self.parent_move
-    }
-}
-
-/// What a widget answered when it was asked: the size it reported, and the
-/// boxes and windows that answer holds for.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Answer {
-    pub size: Size,
-    pub holds: LayoutHolds,
-}

core/src/ui/holds.rs

@@ -1,184 +0,0 @@
-use crate::{Len, Px, REL_SHIFT, fixed::div_toward, fixed::narrow};
-use std::ops::RangeInclusive;
-
-/// The lengths of a box, in pixels, that one drawing of a widget holds for:
-/// give the widget any box in this range and it draws the same thing and
-/// reports the same size. A widget that never reads its box in pixels holds
-/// for every length; one that does holds for the one it read unless it says
-/// otherwise, and a parent holds for whatever keeps every child it asked
-/// about or drew inside its own range.
-///
-/// The ends are lengths on the grid rather than floats with a tolerance
-/// around them: a box offered back at the length a widget reported comes back
-/// as the same number, so a range means what it says. The one place a range
-/// is wider than the length it came from is [`Self::through`], and what it is
-/// wider by is the floor that inverting a fraction undoes.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Holds {
-    pub lo: Px,
-    pub hi: Px,
-}
-
-impl Holds {
-    pub const ANY: Self = Self {
-        lo: Px::MIN,
-        hi: Px::MAX,
-    };
-
-    pub const fn at(len: Px) -> Self {
-        Self { lo: len, hi: len }
-    }
-
-    pub const fn contains(&self, len: Px) -> bool {
-        len.raw() >= self.lo.raw() && len.raw() <= self.hi.raw()
-    }
-
-    /// Every length `other` holds for is one this holds for, so a drawing
-    /// made under this range is still good wherever `other` is.
-    pub const fn covers(self, other: Self) -> bool {
-        self.lo.raw() <= other.lo.raw() && self.hi.raw() >= other.hi.raw()
-    }
-
-    pub const fn and(self, other: Self) -> Self {
-        Self {
-            lo: self.lo.max(other.lo),
-            hi: self.hi.min(other.hi),
-        }
-    }
-
-    /// What a box has to be for a part of it, `len` of the box long, to stay
-    /// in this range: the exact preimage of `px + floor(rel * box)`, which is
-    /// the one way a box in pixels is reached. A part with no relative extent
-    /// is a fixed length -- it was drawn at that length and any box keeps it
-    /// there.
-    ///
-    /// The answer is an interval even where this range is a single length,
-    /// because the multiply on the way in drops to the step below and many
-    /// boxes therefore give one length. That is a floor rather than an
-    /// allowance: inverting it is two divisions and nothing else, and the
-    /// whole of a box maps back to itself.
-    pub const fn through(self, len: Len) -> Self {
-        if self.lo.raw() == Px::MIN.raw() && self.hi.raw() == Px::MAX.raw() {
-            return Self::ANY;
-        }
-        let rel = len.rel.raw() as i64;
-        if rel == 0 {
-            return Self::ANY;
-        }
-        let px = len.px.raw() as i64;
-        // `floor(rel * box) >= lo - px` is `rel * box >= (lo - px) << REL`, and
-        // `floor(rel * box) <= hi - px` is `rel * box < (hi - px + 1) << REL`.
-        let lo = (self.lo.raw() as i64 - px) << REL_SHIFT;
-        let hi = (((self.hi.raw() as i64 - px) + 1) << REL_SHIFT) - 1;
-        // Dividing by a negative fraction turns the ends around, so which
-        // bound each comes from is decided before dividing rather than by
-        // taking the min and max of four divisions.
-        match rel > 0 {
-            true => Self::raws(div_toward(lo, rel, true), div_toward(hi, rel, false)),
-            false => Self::raws(div_toward(hi, rel, true), div_toward(lo, rel, false)),
-        }
-    }
-
-    const fn raws(lo: i64, hi: i64) -> Self {
-        Self {
-            lo: Px::from_raw(narrow(lo)),
-            hi: Px::from_raw(narrow(hi)),
-        }
-    }
-}
-
-impl From<RangeInclusive<Px>> for Holds {
-    fn from(range: RangeInclusive<Px>) -> Self {
-        Self {
-            lo: *range.start(),
-            hi: *range.end(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::Rel;
-
-    #[test]
-    fn an_unrestricted_range_stays_unrestricted_through_any_length() {
-        for rel in [-2.0, -0.5, 0.0, 0.5, 1.0, 2.0] {
-            for px in [-8, 0, 8] {
-                let len = Len::from_parts(Rel::from_f32(rel), Px::from_int(px));
-                assert_eq!(Holds::ANY.through(len), Holds::ANY);
-            }
-        }
-    }
-
-    #[test]
-    fn through_reverses_a_range_for_a_negative_fraction() {
-        // `10 - box / 2` is between 20 and 40 for boxes from -60 to -20.
-        let part = Len::from_parts(Rel::from_f32(-0.5), Px::from_int(10));
-        let holds = Holds::from(Px::from_int(20)..=Px::from_int(40)).through(part);
-        assert!(holds.contains(Px::from_int(-60)) && holds.contains(Px::from_int(-20)));
-        assert!(!holds.contains(Px::from_int(-61)) && !holds.contains(Px::from_int(-19)));
-    }
-
-    /// The case the widening is for: a part that holds only for the length it
-    /// was drawn at has to hold for the box it was drawn in, and a third of a
-    /// box is not a whole number of steps.
-    #[test]
-    fn a_part_maps_back_onto_the_box_it_was_measured_in() {
-        let part = Len::from_parts(Rel::from_f32(1.0 / 3.0), Px::from_int(-146));
-        for box_len in (440..460).map(Px::from_int) {
-            let holds = Holds::at(part.to_px(box_len)).through(part);
-            assert!(holds.contains(box_len), "{box_len:?} left out by {holds:?}");
-        }
-    }
-
-    /// A widget handed the whole of its parent's box, with or without pixels
-    /// taken off it, has no fraction to invert: multiplying by one is exact
-    /// and taking the pixels off again is too, so the box maps back to
-    /// itself. Allowing for anything here compounded a step a level down a
-    /// chain of widgets each taking the whole of its parent.
-    #[test]
-    fn the_whole_of_a_box_maps_back_to_itself() {
-        let at = Px::from_int(956);
-        assert_eq!(Holds::at(at).through(Len::FULL), Holds::at(at));
-        let less_eight = Len::from_parts(Rel::ONE, Px::from_int(-8));
-        assert_eq!(
-            Holds::at(at).through(less_eight),
-            Holds::at(at + Px::from_int(8))
-        );
-    }
-
-    /// The range is the exact preimage at both ends, so a box one step
-    /// outside it really does give a length outside this range. What a wider
-    /// range costs is a drawing reused where it does not hold.
-    #[test]
-    fn a_box_one_step_outside_the_range_is_outside_it() {
-        let part = Len::from_parts(Rel::from_f32(1.0 / 3.0), Px::from_int(-146));
-        let at = Px::from_int(300);
-        let holds = Holds::at(at).through(part);
-        for inside in [holds.lo, holds.hi] {
-            assert_eq!(part.to_px(inside), at, "{inside:?} left out of {holds:?}");
-        }
-        for outside in [holds.lo.next_down(), holds.hi.next_up()] {
-            assert_ne!(part.to_px(outside), at, "{outside:?} admitted by {holds:?}");
-        }
-    }
-
-    /// A truncating multiply only ever drops, so the step it needs allowing
-    /// for on the way in belongs at the top of the range and not the bottom.
-    #[test]
-    fn a_fraction_widens_further_up_than_down() {
-        let half = Len::from_parts(Rel::from_f32(0.5), Px::ZERO);
-        let holds = Holds::at(Px::from_int(100)).through(half);
-        let box_len = Px::from_int(200);
-        assert!(holds.hi - box_len > box_len - holds.lo, "{holds:?}");
-    }
-
-    #[test]
-    fn a_boundary_the_next_step_along_does_not_admit_it() {
-        let boundary = Px::from_int(10);
-        let above = Holds::from(boundary.next_up()..=Px::MAX);
-        assert!(!above.contains(boundary));
-        assert!(above.contains(boundary.next_up()));
-    }
-}

core/src/ui/layout_holds.rs

@@ -1,108 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, Holds, Len, Px, PxVec2, UiRegion, UiVec2};
-
-/// What one evaluation of a widget depends on along one axis: the window
-/// lengths its reads hold for, the pixel lengths of its own box, and the
-/// symbolic lengths of that box and of its rel base where either one is what
-/// it was expressed in.
-///
-/// The symbolic lengths are pins rather than ranges: a container places its
-/// children as lengths of its rel base measured from where its own box starts,
-/// so what it draws turns on that box's length and on nothing about where it
-/// is. A box pin reaches the parent only where the box it pinned is the
-/// parent's own; anywhere else the parent chose that length itself, and a
-/// widget pinned this way is checked when it is re-placed.
-///
-/// A rel base pin says the answer or the drawing is a fraction of the rel base,
-/// which is a different length wherever the rel base is a different one -- at
-/// the same window size, so no range of window pixels can say it. A length
-/// of the rel base that is only pixels is not one: it is that many pixels
-/// whatever the rel base turns out to be.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct AxisHolds {
-    pub window: Holds,
-    pub rel_base: Option<Len>,
-    pub region: Holds,
-    pub region_len: Option<Len>,
-}
-
-impl AxisHolds {
-    pub const ANY: Self = Self {
-        window: Holds::ANY,
-        rel_base: None,
-        region: Holds::ANY,
-        region_len: None,
-    };
-
-    pub fn and(self, other: Self) -> Self {
-        // Two pins of the same length disagreeing would mean one drawing was
-        // a fraction of two different lengths at once.
-        debug_assert!(
-            self.region_len.is_none()
-                || other.region_len.is_none()
-                || self.region_len == other.region_len
-        );
-        debug_assert!(
-            self.rel_base.is_none() || other.rel_base.is_none() || self.rel_base == other.rel_base
-        );
-        Self {
-            window: self.window.and(other.window),
-            rel_base: self.rel_base.or(other.rel_base),
-            region: self.region.and(other.region),
-            region_len: self.region_len.or(other.region_len),
-        }
-    }
-
-    pub fn covers(self, other: Self) -> bool {
-        self.window.covers(other.window)
-            && self.region.covers(other.region)
-            && self
-                .region_len
-                .is_none_or(|len| other.region_len == Some(len))
-            && self.rel_base.is_none_or(|len| other.rel_base == Some(len))
-    }
-
-    /// Whether a widget in a box `len` long, with that rel base, in that
-    /// window, is one this drawing holds for.
-    pub fn contains(self, window: Px, rel_base: Len, len: Len) -> bool {
-        self.window.contains(window)
-            && self.rel_base.is_none_or(|pinned| pinned == rel_base)
-            && self.region.contains(len.to_px(window))
-            && self.region_len.is_none_or(|pinned| pinned == len)
-    }
-}
-
-/// [`AxisHolds`] on both axes. Every question asked of it is asked of one
-/// axis at a time, since a widget that read one length holds for any length
-/// of the other.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct LayoutHolds {
-    pub x: AxisHolds,
-    pub y: AxisHolds,
-}
-
-impl LayoutHolds {
-    pub const ANY: Self = Self {
-        x: AxisHolds::ANY,
-        y: AxisHolds::ANY,
-    };
-
-    pub fn and(self, other: Self) -> Self {
-        Self {
-            x: self.x.and(other.x),
-            y: self.y.and(other.y),
-        }
-    }
-
-    pub fn covers(self, other: Self) -> bool {
-        self.x.covers(other.x) && self.y.covers(other.y)
-    }
-
-    pub fn contains(self, window: PxVec2, rel_base: UiVec2, region: UiRegion) -> bool {
-        Axis::BOTH
-            .into_iter()
-            .all(|axis| self[axis].contains(window[axis], rel_base[axis], region[axis].len()))
-    }
-}
-
-impl_axis_index!(LayoutHolds => AxisHolds);

core/src/ui/mod.rs

@@ -1,149 +0,0 @@
-use crate::{
-    Mask, MoveIdx, MoveOffset, PrimitiveRegistry, TextData, Textures, UiRegion, WeakWidget,
-    WidgetId, Widgets,
-    util::{Arena, Id, TrackedArena},
-};
-
-/// How far the shader will walk a move chain. It bounds a malformed cycle
-/// rather than any real tree; `Moves::resolve` uses the same number so the
-/// two agree on what a deep tree resolves to.
-pub const CHAIN_LIMIT: u32 = 64;
-
-mod active;
-mod holds;
-mod layout_holds;
-mod painter;
-mod place;
-mod render_state;
-
-pub use active::*;
-pub use holds::*;
-pub use layout_holds::*;
-pub use painter::{Painter, PrimitiveLike};
-pub use place::{PlaceDesc, PlaceDescAxis, RetainedPrimitive};
-pub use render_state::*;
-
-#[derive(Default)]
-pub struct UiData {
-    pub widgets: Widgets,
-    /// Every primitive this ui can draw.
-    pub primitives: PrimitiveRegistry,
-    pub textures: Textures,
-    pub text: TextData,
-    pub masks: TrackedArena<Mask, u32>,
-}
-
-/// Where each widget's drawing sits relative to its parent's slot, so moving
-/// a subtree writes one entry rather than every descendant's primitives.
-#[derive(Default)]
-pub struct Moves {
-    arena: Arena<MoveOffset, u32>,
-    pub changed: bool,
-}
-
-impl Moves {
-    pub fn push(&mut self, parent: MoveIdx, region: UiRegion) -> MoveIdx {
-        self.changed = true;
-        MoveIdx::slot(self.arena.push(MoveOffset::new(parent, region)).idx())
-    }
-
-    /// Re-points a slot at a different parent, for a widget drawn somewhere
-    /// else in the tree than it was.
-    pub fn set_parent(&mut self, idx: MoveIdx, parent: MoveIdx) {
-        let entry = self.arena.get_mut(Id::preset(idx.idx() as u32));
-        if entry.parent != parent {
-            entry.parent = parent;
-            self.changed = true;
-        }
-    }
-
-    pub fn remove(&mut self, idx: MoveIdx) {
-        self.changed = true;
-        self.arena.remove(Id::preset(idx.idx() as u32));
-    }
-
-    /// Sets the box a slot's contents are placed within, itself given in the
-    /// coordinates of its parent slot.
-    pub fn set(&mut self, idx: MoveIdx, region: UiRegion) {
-        let entry = self.arena.get_mut(Id::preset(idx.idx() as u32));
-        if entry.region != region {
-            entry.region = region;
-            self.changed = true;
-        }
-    }
-
-    /// The same walk the vertex shader does, in the same `Len` the shader is
-    /// handed, for asking where a drawing will actually land -- hit testing,
-    /// and nothing layout decides on. Layout threads its lengths down the
-    /// draw instead, so no box it compares is composed back up this chain.
-    pub fn resolve(&self, idx: MoveIdx, local: UiRegion) -> UiRegion {
-        let mut region = local;
-        self.walk(idx, |entry| region = region.within(entry));
-        region
-    }
-
-    fn walk(&self, idx: MoveIdx, mut step: impl FnMut(&UiRegion)) {
-        let mut at = idx;
-        for _ in 0..CHAIN_LIMIT {
-            if at == MoveIdx::NONE {
-                return;
-            }
-            let entry = &self.arena[at.idx()];
-            step(&entry.region);
-            at = entry.parent;
-        }
-        debug_assert!(
-            at == MoveIdx::NONE,
-            "a move chain longer than {CHAIN_LIMIT} resolves to the wrong place, \
-             and the shader stops at the same depth"
-        );
-    }
-
-    /// How many slots a region in `idx` is composed through, which is what
-    /// the shader's walk costs per primitive.
-    pub fn depth(&self, idx: MoveIdx) -> usize {
-        let mut depth = 0;
-        let mut at = idx;
-        while at != MoveIdx::NONE && depth < CHAIN_LIMIT as usize {
-            at = self.arena[at.idx()].parent;
-            depth += 1;
-        }
-        depth
-    }
-
-    pub fn entries(&self) -> &[MoveOffset] {
-        &self.arena
-    }
-
-    pub fn clear(&mut self) {
-        self.changed = true;
-        self.arena = Arena::default();
-    }
-}
-
-pub trait UiRsc {
-    fn ui(&self) -> &UiData;
-    fn ui_mut(&mut self) -> &mut UiData;
-
-    #[allow(unused_variables)]
-    fn on_add(&mut self, id: WeakWidget) {}
-    #[allow(unused_variables)]
-    fn on_remove(&mut self, id: WidgetId) {}
-    #[allow(unused_variables)]
-    fn on_draw(&mut self, active: &ActiveData) {}
-    #[allow(unused_variables)]
-    fn on_undraw(&mut self, active: &ActiveData) {}
-
-    fn widgets(&self) -> &Widgets {
-        &self.ui().widgets
-    }
-    fn widgets_mut(&mut self) -> &mut Widgets {
-        &mut self.ui_mut().widgets
-    }
-    fn free(&mut self) {
-        while let Some(id) = self.widgets_mut().free_next() {
-            self.on_remove(id);
-        }
-        self.ui_mut().textures.free();
-    }
-}

core/src/ui/painter.rs

@@ -1,750 +0,0 @@
-#[cfg(feature = "layout-diagnostics")]
-use crate::layout_diagnostics::{self as diag, Counter};
-use crate::{
-    Axis, Declared, Holds, LayoutHolds, LayoutLen, Len, PlaceDesc, Px, PxVec2, RegionAlign, Rel,
-    RenderedText, RetainedPrimitive, Size, StrongWidget, TextAttrs, TextBuffer, TextData,
-    TextureHandle, UiRegion, UiRenderState, UiRsc, UiVec2, Weight, WidgetId, Widgets,
-    render::{
-        GlyphPrimitive, Mask, MaskIdx, MoveIdx, Primitive, PrimitiveInst, PrimitiveKind,
-        TexturePrimitive,
-    },
-    ui::{
-        place::{PlaceSpan, RelBase},
-        render_state::{DrawInfo, Placing},
-    },
-};
-
-/// makes your surfaces look pretty
-pub struct Painter<'a> {
-    pub(super) state: &'a mut UiRenderState,
-    pub(super) rsc: &'a mut dyn UiRsc,
-
-    /// This widget's rel base, per axis: a length of the window, and what a
-    /// fraction it or anything under it declares or reports is a fraction
-    /// of. A length rather than a box, so padding can take from both the
-    /// rel base and the box without either becoming the other.
-    pub(super) rel_base: UiVec2,
-    /// The box this widget was asked in, in its region node's coordinates:
-    /// what it draws in, and what its children's places are parts of.
-    pub(super) region: UiRegion,
-    /// The window in pixels. Frames and boxes become pixels against this one
-    /// unit, regardless of region-node boundaries.
-    pub(super) window: PxVec2,
-    pub(super) mask: MaskIdx,
-    pub(super) textures: Vec<TextureHandle>,
-    pub(super) primitives: Vec<RetainedPrimitive>,
-    pub(super) mask_region: Option<UiRegion>,
-    /// The previous drawing's owned mask, available for this draw to reclaim.
-    pub(super) mask_slot: Option<MaskIdx>,
-    /// Only children whose answers were read constrain this widget's answer.
-    pub(super) answer_under: LayoutHolds,
-    pub(super) children: Vec<WidgetId>,
-    /// The children whose size this widget read while drawing.
-    pub(super) size_deps: Vec<WidgetId>,
-    /// What this draw itself reads, as against what its children's drawings
-    /// hold for: every window and every length of its own region until it
-    /// reads one, then that one unless it says otherwise, and the rel base or
-    /// region length it read symbolically, each of which makes the drawing
-    /// hold for that length alone.
-    pub(super) own: LayoutHolds,
-    /// What each child's drawing depends on. Asking a child again replaces
-    /// its drawing, so it replaces this too rather than narrowing it.
-    pub(super) under: Vec<(WidgetId, LayoutHolds)>,
-    /// The movable region this widget's primitives are positioned through:
-    /// its own when opted in, otherwise the nearest ancestor's.
-    pub(super) move_idx: MoveIdx,
-    pub layer: usize,
-    /// The layer this widget was entered on, which its children's layers are
-    /// counted from however far `layer` has walked.
-    pub(super) own_layer: usize,
-    pub(super) depth: usize,
-    pub(super) id: WidgetId,
-}
-
-impl<'a> Painter<'a> {
-    fn primitive_at<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
-        let kind = self.rsc.ui_mut().primitives.kind::<P>();
-        self.write(kind, primitive, region);
-    }
-
-    /// Takes the kind, for a caller writing many of one primitive.
-    fn write<P: Primitive>(&mut self, kind: PrimitiveKind<P>, primitive: P, region: UiRegion) {
-        self.write_resolved(kind, primitive, region, self.resolve(region));
-    }
-
-    /// A box in this widget's region, composed into its region node's
-    /// coordinates.
-    fn resolve(&self, region: UiRegion) -> UiRegion {
-        region.within(&self.region)
-    }
-
-    fn write_resolved<P: Primitive>(
-        &mut self,
-        kind: PrimitiveKind<P>,
-        primitive: P,
-        region: UiRegion,
-        resolved: UiRegion,
-    ) {
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::PrimitiveWrites);
-        let h = self.state.layers.write(
-            self.layer,
-            PrimitiveInst {
-                kind,
-                id: self.id,
-                primitive,
-                region: resolved,
-                mask_idx: self.mask,
-                move_idx: self.move_idx,
-            },
-        );
-        self.push_primitive(RetainedPrimitive { handle: h, region });
-    }
-
-    fn push_primitive(&mut self, h: RetainedPrimitive) {
-        if self.mask != MaskIdx::NONE {
-            self.rsc.ui_mut().masks.push_ref(self.mask);
-        }
-        self.primitives.push(h);
-    }
-
-    /// Writes a primitive over the whole of this widget's own box.
-    pub fn primitive(&mut self, primitive: impl PrimitiveLike) {
-        let primitive = primitive.into_primitive(self);
-        self.primitive_at(primitive, UiRegion::FULL)
-    }
-
-    /// Writes a primitive in a part of this widget's own box, in that box's
-    /// coordinates.
-    pub fn primitive_within(&mut self, primitive: impl PrimitiveLike, region: UiRegion) {
-        let primitive = primitive.into_primitive(self);
-        self.primitive_at(primitive, region);
-    }
-
-    /// Sets a mask, in this widget's own box's coordinates.
-    pub fn set_mask(&mut self, region: UiRegion) {
-        self.mask_region = Some(region);
-        assert!(self.mask == MaskIdx::NONE);
-        let resolved = self.resolve(region);
-        let move_idx = self.move_idx;
-        let mask = Mask {
-            region: resolved,
-            move_idx,
-        };
-        let masks = &mut self.rsc.ui_mut().masks;
-        self.mask = match self.mask_slot.take() {
-            Some(idx) => {
-                *masks.get_mut(idx) = mask;
-                idx
-            }
-            None => {
-                let idx = masks.push(mask);
-                // The owner keeps the slot alive even with no primitives.
-                masks.push_ref(idx);
-                idx
-            }
-        };
-    }
-
-    /// Draws a widget in the whole of this widget's own box, with the rel
-    /// base forwarded unchanged: what a container that is only a wrapper
-    /// around one child wants.
-    pub fn widget<'s, W: ?Sized>(&'s mut self, id: &'s StrongWidget<W>) -> DrawResult<'s, 'a, W> {
-        self.widget_at(id, UiRegion::FULL)
-    }
-
-    /// Resolves what the place says about the child's rel base into a length,
-    /// where that is this widget's own narrowed the way the region is. An
-    /// axis the region leaves whole is not read at all, so a wrapper that
-    /// only moves its child does not pin its drawing to a rel base.
-    fn resolve_rel_base(&mut self, mut place: PlaceDesc) -> PlaceDesc {
-        for axis in Axis::BOTH {
-            let at = &mut place[axis];
-            let (RelBase::WithRegion, PlaceSpan::Within(span)) = (at.rel_base, at.span) else {
-                continue;
-            };
-            let len = span.len();
-            at.rel_base = match len == Len::FULL {
-                true => RelBase::Inherit,
-                false => RelBase::Len(len.within_len(self.rel_base(axis))),
-            };
-        }
-        place
-    }
-
-    /// Asks a child, saying what its fractions are of and where it is asked.
-    ///
-    /// `place` says where the child goes and what its fractions are of:
-    /// see [`PlaceDesc`]. A `UiRegion` converts into the common case, which
-    /// is a box of this widget's own with the answer placed inside it.
-    ///
-    /// The child draws once, in the region that comes of it, and its answer
-    /// is placed inside that region by re-expressing the drawing. Nothing is
-    /// drawn again in a box an answer chose; a container that puts the
-    /// answer somewhere else says so with [`Self::place_at`].
-    pub fn widget_at<'s, W: ?Sized>(
-        &'s mut self,
-        id: &'s StrongWidget<W>,
-        place: impl Into<PlaceDesc>,
-    ) -> DrawResult<'s, 'a, W> {
-        let place = self.resolve_rel_base(place.into());
-        let region_node = self.rsc.widgets().is_region_node(id.id());
-        let declared = self.declared_lens(id);
-        let align = self.rsc.widgets().alignment(id.id());
-        let (rel_base, region) =
-            place.rel_base_and_region(self.region, self.rel_base, declared, align);
-        #[cfg(feature = "layout-diagnostics")]
-        if region_node {
-            diag::bump(Counter::RegionNodeDraws);
-            diag::region_node(id.id(), self.id, region);
-        }
-        // A child listed twice would be moved twice.
-        let re_asked = self.children.contains(&id.id());
-        if !re_asked {
-            self.children.push(id.id());
-        }
-        let drawn = self.state.draw_inner(
-            id.id(),
-            DrawInfo {
-                layer: self.layer,
-                parent: Some(self.id),
-                depth: self.depth + 1,
-                parent_move: self.move_idx,
-                region_node,
-                mask: self.mask,
-                rel_base,
-                region,
-                placed: place,
-                asked: place,
-                re_asked,
-            },
-            None,
-            self.rsc,
-        );
-        let holds = self.in_parent(drawn.drawing_holds, region, place, declared);
-        let answer_holds = self.in_parent(drawn.answer.holds, region, place, declared);
-        match self.under.iter_mut().find(|(child, _)| *child == id.id()) {
-            Some((_, kept)) => *kept = holds,
-            None => self.under.push((id.id(), holds)),
-        }
-        DrawResult {
-            child: id,
-            painter: self,
-            size: drawn.answer.size,
-            answer_holds,
-        }
-    }
-
-    /// Takes back a child that was drawn only to find out how long it is.
-    /// Its drawing is dropped and it is not one of this widget's children
-    /// this frame; what it answered is still something this widget asked.
-    pub fn undraw<W: ?Sized>(&mut self, id: &StrongWidget<W>) {
-        self.children.retain(|child| *child != id.id());
-        self.under.retain(|(child, _)| *child != id.id());
-        self.state.undraw_rec(id.id(), self.rsc);
-    }
-
-    /// Puts a child in `place` of this widget's box, where that box is the
-    /// answer the child already gave: the drawing is re-expressed there
-    /// rather than made again -- what a row does once it knows every slot,
-    /// having measured each child from its cursor.
-    ///
-    /// A child this draw has not asked about, and one whose rel base this
-    /// narrows, is asked here instead: there is no answer to re-express, or
-    /// the question has changed. So a container that places every child the
-    /// same way says it once, and which of the two happens is this widget's
-    /// business rather than the caller's.
-    pub fn place_at<'s, W: ?Sized>(
-        &'s mut self,
-        id: &'s StrongWidget<W>,
-        place: impl Into<PlaceDesc>,
-    ) -> DrawResult<'s, 'a, W> {
-        let place = self.resolve_rel_base(place.into());
-        let states_rel_base = Axis::BOTH
-            .iter()
-            .any(|&axis| matches!(place[axis].rel_base, RelBase::Len(_)));
-        if states_rel_base || !self.children.contains(&id.id()) {
-            return self.widget_at(id, place);
-        }
-        let at = self.placing();
-        self.state.place_in(id.id(), &at, place, self.rsc);
-        let active = &self.state.active[&id.id()];
-        let size = active.measured().unwrap_or(active.size);
-        DrawResult {
-            child: id,
-            painter: self,
-            size,
-            // Read where it was asked; moving it is not a second answer.
-            answer_holds: LayoutHolds::ANY,
-        }
-    }
-
-    /// This widget as the thing its children are placed within.
-    fn placing(&self) -> Placing {
-        Placing {
-            id: self.id,
-            region: self.region,
-            rel_base: self.rel_base,
-            depth: self.depth,
-            move_idx: self.move_idx,
-            mask: self.mask,
-        }
-    }
-
-    /// What a widget's rules declare its lengths to be, which whoever draws
-    /// it resolves into its rel base. Reading them depends on nothing -- the box
-    /// that comes of them is kept on the child, and `redraw` compares it
-    /// there.
-    fn declared_lens<W: ?Sized>(&self, id: &StrongWidget<W>) -> Declared {
-        self.rsc.widgets().declared_lens(id.id())
-    }
-
-    /// What a child says its length is without being drawn, if it can say,
-    /// as the length its draw would report: a fraction in it is resolved
-    /// against this widget's rel base, which is the rel base a child asked with
-    /// nothing narrowed gets. Asking counts as reading its size.
-    pub fn size_hint<W: ?Sized>(&mut self, id: &StrongWidget<W>, axis: Axis) -> Option<LayoutLen> {
-        let widgets = self.rsc.widgets();
-        // A rule is the answer where there is one: it wins over whatever the
-        // widget would draw, so it has to win over what the widget says too.
-        let hint = widgets.size_rules(id.id())[axis].exact().or_else(|| {
-            widgets
-                .get_dyn(id.id())
-                .and_then(|widget| widget.size_hint(axis))
-        });
-        let rel_base = self.rel_base[axis];
-        let resolved = hint.map(|hint| hint.within_len(rel_base));
-        #[cfg(feature = "layout-diagnostics")]
-        {
-            diag::hint_read(id.id(), self.id, axis, resolved);
-            diag::bump(match resolved {
-                Some(_) => Counter::HintHits,
-                None => Counter::HintMisses,
-            });
-        }
-        if let Some(hint) = hint {
-            self.depend_on(id);
-            // Resolving a fraction against this rel base makes this draw a
-            // function of the rel base's length. The fraction to ask about is
-            // the child's own: resolved against a rel base of pixels, none is
-            // left to see it by.
-            if hint.rel != Rel::ZERO {
-                self.own[axis].rel_base = Some(rel_base);
-            }
-        }
-        resolved
-    }
-
-    fn depend_on<W: ?Sized>(&mut self, child: &StrongWidget<W>) {
-        if !self.size_deps.contains(&child.id()) {
-            self.size_deps.push(child.id());
-        }
-    }
-
-    pub fn render_text<'b>(
-        &mut self,
-        buffer: &'b mut TextBuffer,
-        attrs: &TextAttrs,
-        width: Option<f32>,
-    ) -> &'b RenderedText {
-        #[cfg(feature = "layout-diagnostics")]
-        diag::render_text(self.id, self.rsc.widgets().label(self.id), width);
-        let ui = self.rsc.ui_mut();
-        ui.text.render(buffer, attrs, width)
-    }
-
-    /// Writes glyphs in the selected rel base or region coordinates.
-    // TODO: merge the text methods into the primitive ones.
-    pub fn glyphs(&mut self, text: &RenderedText, origin: UiRegion) {
-        // Glyph offsets and sizes are pixels, which compose additively.
-        // Only the shared origin needs composing through the region.
-        let resolved = self.resolve(origin);
-        let kind = self.rsc.ui_mut().primitives.kind::<GlyphPrimitive>();
-        for glyph in text.glyphs.iter() {
-            let place = |mut region: UiRegion| {
-                region.x.end = region.x.start;
-                region.y.end = region.y.start;
-                let mut region = region.offset(UiVec2::from_px(glyph.offset));
-                let size = PxVec2::new(
-                    Px::from_int(glyph.entry.width as i32),
-                    Px::from_int(glyph.entry.height as i32),
-                );
-                region.x.end = region.x.start.offset(size.x);
-                region.y.end = region.y.start.offset(size.y);
-                region
-            };
-            self.write_resolved(
-                kind,
-                GlyphPrimitive {
-                    uv_min: glyph.entry.uv_min,
-                    uv_max: glyph.entry.uv_max,
-                    layer: glyph.entry.layer,
-                    color: text.color,
-                    flags: glyph.entry.flags(),
-                },
-                place(origin),
-                place(resolved),
-            );
-        }
-    }
-
-    /// The symbolic length of this widget's own box along one axis, in the
-    /// lengths of its rel base that it places its children in. Reading it pins
-    /// the drawing to that length -- and to nothing about where the box
-    /// starts, which is what lets a container move without being drawn
-    /// again. One axis at a time, because a container that divides one axis
-    /// holds for any length of the other.
-    pub fn region_len(&mut self, axis: Axis) -> Len {
-        let len = self.region[axis].len();
-        self.own[axis].region_len = Some(len);
-        len
-    }
-
-    /// This widget's rel base along one axis: what a fraction it or anything
-    /// under it declares or reports is a fraction of. A container reads it
-    /// to hand a length of it down -- padding, which takes its pixels off.
-    /// Reading it pins the drawing to that rel base, the way
-    /// [`Self::region_len`] pins it to the box.
-    pub fn rel_base(&mut self, axis: Axis) -> Len {
-        let len = self.rel_base[axis];
-        self.own[axis].rel_base = Some(len);
-        len
-    }
-
-    /// Where this widget sits in a box longer than the length it takes. A
-    /// widget that positions its own content reads it to place that content
-    /// the way the box around it would have placed the widget.
-    pub fn alignment(&self) -> RegionAlign {
-        self.rsc.widgets().alignment(self.id)
-    }
-
-    /// Whether a rule beside this widget gives its length on `axis` outright,
-    /// which makes whatever it reports for that axis moot. A rule that only
-    /// bounds the length is not one of these: the answer is still the
-    /// widget's to give, and something still has to work it out.
-    ///
-    /// The widget under a rule does not otherwise learn of it -- this is for
-    /// a container deciding whether reading its children across an axis is
-    /// worth anything, since reading one is also what makes its own size
-    /// depend on it.
-    pub fn has_exact_size(&self, axis: Axis) -> bool {
-        self.rsc.widgets().size_rules(self.id)[axis]
-            .exact()
-            .is_some()
-    }
-
-    /// This widget's own box in pixels. Reading it makes the drawing one
-    /// that holds for this box only, until `holds` says how far it goes.
-    pub fn px_size(&mut self) -> PxVec2 {
-        PxVec2::new(self.px_len(Axis::X), self.px_len(Axis::Y))
-    }
-
-    /// One axis of this widget's own box in pixels. Prefer this to
-    /// [`Self::px_size`] when the other axis cannot affect the drawing.
-    pub fn px_len(&mut self, axis: Axis) -> Px {
-        let len = self.region[axis].len();
-        let px = len.to_px(self.window[axis]);
-        let own = &mut self.own[axis].region;
-        if *own == Holds::ANY {
-            *own = Holds::at(px);
-        }
-        px
-    }
-
-    /// The lengths of this widget's own box on `axis` that what it is drawing
-    /// holds for -- the same primitives, in the same fractions and offsets
-    /// of the box, and the same reported size. A widget that read its length
-    /// in pixels holds for that one alone until it says otherwise.
-    pub fn holds(&mut self, axis: Axis, holds: impl Into<Holds>) {
-        let len = self.region[axis].len();
-        let holds = holds.into();
-        debug_assert!(
-            holds.contains(len.to_px(self.window[axis])),
-            "'{}' ({:?}) says its drawing holds for lengths that leave out its own box",
-            self.label(),
-            self.id
-        );
-        self.own[axis].region = holds;
-    }
-
-    /// A window length in pixels, which is what every length in layout is
-    /// measured in. Reading one pins the drawing to this window wherever the
-    /// length is a fraction of it; one that is only pixels is that many
-    /// pixels in any window and pins nothing.
-    pub fn to_px(&mut self, len: Len, axis: Axis) -> Px {
-        let window = self.window[axis];
-        if len.rel != Rel::ZERO {
-            let own = &mut self.own[axis].window;
-            if *own == Holds::ANY {
-                *own = Holds::at(window);
-            }
-        }
-        len.to_px(window)
-    }
-
-    /// The windows this drawing holds for, stated rather than taken: a
-    /// container that branched on a length in pixels says which side of the
-    /// boundary it was on, which is wider than the one window reading that
-    /// length pins, and replaces it.
-    pub fn window_holds(&mut self, axis: Axis, holds: impl Into<Holds>) {
-        let holds = holds.into();
-        debug_assert!(
-            holds.contains(self.window[axis]),
-            "'{}' ({:?}) says its drawing holds for windows that leave out this one",
-            self.label(),
-            self.id
-        );
-        self.own[axis].window = holds;
-    }
-
-    pub fn text_data(&mut self) -> &mut TextData {
-        &mut self.rsc.ui_mut().text
-    }
-
-    pub fn child_layer(&mut self) {
-        self.layer = self.state.layers.child(self.layer);
-    }
-
-    /// The layer this widget's `n`th child draws on, addressed rather than
-    /// walked to. A container that measures one child by drawing it can ask
-    /// on the layer that child will end up on, and then the second ask is a
-    /// reuse rather than a second drawing on another layer.
-    pub fn child_layer_at(&mut self, n: usize) {
-        let mut at = self.state.layers.child(self.own_layer);
-        for _ in 0..n {
-            at = self.state.layers.next(at);
-        }
-        self.layer = at;
-    }
-
-    pub fn next_layer(&mut self) {
-        self.layer = self.state.layers.next(self.layer);
-    }
-
-    pub fn label(&self) -> &str {
-        &self.rsc.widgets().data(self.id).unwrap().label
-    }
-
-    pub fn id(&self) -> &WidgetId {
-        &self.id
-    }
-}
-
-/// A child that has just been drawn. Reading its size records that this
-/// widget's own size depends on it; dropping it without reading draws the
-/// child and leaves the parent independent of what it came to.
-pub struct DrawResult<'p, 'a, W: ?Sized> {
-    painter: &'p mut Painter<'a>,
-    child: &'p StrongWidget<W>,
-    size: Size,
-    answer_holds: LayoutHolds,
-}
-
-impl<W: ?Sized> DrawResult<'_, '_, W> {
-    pub fn size(self) -> Size {
-        #[cfg(feature = "layout-diagnostics")]
-        {
-            diag::bump(Counter::SizeReads);
-            diag::size_read(self.child.id(), self.painter.id, self.size);
-        }
-        self.painter.depend_on(self.child);
-        self.painter.answer_under = self.painter.answer_under.and(self.answer_holds);
-        self.size
-    }
-
-    pub fn len(self, axis: Axis) -> LayoutLen {
-        self.size()[axis]
-    }
-}
-
-/// What `Painter::primitive` takes: a primitive, or something that yields one
-/// and does whatever else drawing it needs.
-pub trait PrimitiveLike {
-    type Primitive: Primitive;
-    fn into_primitive(self, painter: &mut Painter) -> Self::Primitive;
-}
-
-impl<P: Primitive> PrimitiveLike for P {
-    type Primitive = P;
-    fn into_primitive(self, _: &mut Painter) -> P {
-        self
-    }
-}
-
-impl PrimitiveLike for &TextureHandle {
-    type Primitive = TexturePrimitive;
-
-    /// Retains a share of the handle, so the slot the primitive names cannot
-    /// be freed and reused while it is still drawn.
-    fn into_primitive(self, painter: &mut Painter) -> TexturePrimitive {
-        painter.textures.push(self.clone());
-        self.into()
-    }
-}
-
-impl Painter<'_> {
-    /// Moves what a child depends on into this widget's own terms, taking
-    /// only what the child was asked with.
-    ///
-    /// Window ranges are already about the one unit and combine directly.
-    /// A rel base pin becomes this widget's own rel base wherever a length of it
-    /// is what reached the child; where only pixels did, no length of this
-    /// rel base can change the child's and the pin stops here.
-    ///
-    /// A child's validity maps back through the part of this widget's box,
-    /// where the box the child was asked in is that part; a declared length
-    /// places the box inside the part instead, and then only that length
-    /// reaches the child. A narrowed rel base is not one of these: it decides
-    /// what fractions under the child mean and leaves the box the part it
-    /// was given.
-    fn in_parent(
-        &self,
-        holds: LayoutHolds,
-        region: UiRegion,
-        place: PlaceDesc,
-        declared: Declared,
-    ) -> LayoutHolds {
-        let mut result = LayoutHolds::ANY;
-        for axis in Axis::BOTH {
-            let declared = declared[axis];
-            let holds = holds[axis];
-            let at = place[axis];
-            let result = &mut result[axis];
-            // Every read became pixels against the window, so a range on
-            // it is already in this widget's terms.
-            result.window = holds.window;
-            // A length this widget named -- a resolved share, a box a sibling
-            // decided, a box it sized outright, which is its own base -- is
-            // not a length of this widget's rel base, so a pin on it stops
-            // here. So does a declaration in pixels: no length of either base
-            // is in it to see.
-            let reaches = !matches!(at.rel_base, RelBase::Len(_))
-                && declared.is_none_or(|len| len.rel != Rel::ZERO);
-            result.rel_base = holds.rel_base.and(reaches.then(|| self.rel_base[axis]));
-            match (at.span, declared) {
-                // Its box is a part of this widget's own box, in that box's
-                // own lengths, so what it holds for maps back through that
-                // part into a range on this widget's box. A length it pinned
-                // is this widget's length less the part's pixels where the
-                // part is the whole of the box less pixels, which is the one
-                // shape that inverts exactly; any other part pins this
-                // widget's own length.
-                (PlaceSpan::Within(span), None) => {
-                    let part_len = span.len();
-                    result.region = holds.region.through(part_len);
-                    result.region_len = holds.region_len.map(|pinned| match part_len.rel {
-                        Rel::ONE => pinned - Len::from_parts(Rel::ZERO, part_len.px),
-                        _ => self.region[axis].len(),
-                    });
-                }
-                // Its box is a length this widget decided, from its own
-                // rel base or from a sibling's answer: no length of this
-                // widget's box reaches it, so what it holds for is a range
-                // on the window and none of it on that box.
-                _ => {
-                    result.window = result.window.and(holds.region.through(region[axis].len()));
-                }
-            }
-        }
-        result
-    }
-}
-
-impl Widgets {
-    /// What a widget's box is where a rule or its own hint says so outright.
-    pub(super) fn declared_lens(&self, id: WidgetId) -> Declared {
-        let rules = self.size_rules(id);
-        let widget = self.get_dyn(id);
-        Declared::from_axes(|axis| {
-            rules[axis].declared().or_else(|| {
-                // A hint still narrows the box where no rule does, which is
-                // how a widget with a natural pixel size -- an image, a gap
-                // -- gets that size rather than the whole offer. That is the
-                // offer's business rather than a declaration's, and this
-                // falls away once a widget occupies its reported size inside
-                // the box it was offered.
-                widget
-                    .and_then(|widget| widget.size_hint(axis))
-                    .and_then(LayoutLen::declared)
-            })
-        })
-    }
-}
-
-impl LayoutLen {
-    /// Whether what a widget reported along an axis is the whole of the box
-    /// it is in rather than a part to be placed inside it. A share fills,
-    /// because a share is a length only to whoever divides one, and whoever
-    /// did is the one that handed down this box. A declared axis does too:
-    /// the rule already gave the region its length, and the rule's length is
-    /// what the widget reports there. And an axis the parent decided from
-    /// the answer is the answer already.
-    pub(super) fn fills(self, declared: Option<Len>, decided: bool) -> bool {
-        self.leftover != Weight::ZERO || declared.is_some() || decided
-    }
-}
-
-impl PlaceDesc {
-    /// Where a widget's drawing goes inside the part its parent gave it: what
-    /// it reported, on the side of the part its alignment says, and the whole
-    /// part wherever the answer fills it.
-    ///
-    /// The length it reported is a length of its rel base, and the part is one
-    /// too, so this takes one from the other rather than composing it into the
-    /// part. That is what makes a fraction the same fraction wherever the part
-    /// it is placed in sits and however long it is -- the fraction is resolved
-    /// once, here, against the rel base it was reported of.
-    pub(super) fn placement(
-        self,
-        region: UiRegion,
-        size: Size,
-        declared: Declared,
-        align: RegionAlign,
-    ) -> UiRegion {
-        let mut placed = region;
-        for axis in Axis::BOTH {
-            let reported = size[axis];
-            if reported.fills(declared[axis], self[axis].fills) {
-                continue;
-            }
-            placed[axis] = placed[axis].place(reported.without_leftover(), align[axis]);
-        }
-        placed
-    }
-
-    /// The rel base length and the box a child is asked in, in the coordinates the
-    /// widget asking draws in.
-    ///
-    /// `own` is that widget's own box, and `place` what of it the child is
-    /// given, including any rel base it states -- a row's slot, or padding's rel
-    /// base less its pixels. That is a window length, like every other length
-    /// here, since a slot of a row is not a fraction of anything the row can
-    /// name. The child's declaration is a fraction of whichever reached it, and
-    /// is the only one that also places the box: a box the caller decided is
-    /// what `place` names.
-    pub(super) fn rel_base_and_region(
-        self,
-        own: UiRegion,
-        parent_rel_base: UiVec2,
-        declared: Declared,
-        align: RegionAlign,
-    ) -> (UiVec2, UiRegion) {
-        let given = self.of(own, align);
-        let mut rel_base = parent_rel_base;
-        let mut region = given;
-        for axis in Axis::BOTH {
-            let base = match self[axis].rel_base {
-                RelBase::Len(len) => len,
-                RelBase::Inherit | RelBase::WithRegion => parent_rel_base[axis],
-            };
-            let len = declared[axis]
-                .map(|len| len.within_len(base))
-                .unwrap_or(base);
-            rel_base[axis] = len;
-            if declared[axis].is_some() {
-                region[axis] = given[axis].place(len, align[axis]);
-            }
-        }
-        (rel_base, region)
-    }
-}

core/src/ui/place.rs

@@ -1,204 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, AxisAlign, Len, PrimitiveHandle, RegionAlign, UiRegion, UiSpan};
-
-/// How a child's region along one axis comes from the region of the widget
-/// asking, and what its fractions are of.
-///
-/// The three ways of saying a region are the three the geometry already has:
-/// a span composed into the caller's box, a span shifted to where that box
-/// starts, and a length placed in it by alignment. Which one is meant cannot
-/// be read off the numbers, since two of them take the same span and apply
-/// it differently, so it is said here.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct PlaceDescAxis {
-    pub span: PlaceSpan,
-    pub fills: bool,
-    pub rel_base: RelBase,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum PlaceSpan {
-    Within(UiSpan),
-    Shifted(UiSpan),
-    Sized(Len),
-}
-
-/// What a child's fractions are of. [`PlaceSpan::Sized`] is a length the
-/// caller named, which is always its own base, so nothing here constructs one
-/// beside anything but [`Self::Len`].
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum RelBase {
-    /// The caller's own, unchanged.
-    Inherit,
-    /// The caller's own, narrowed the way the region is.
-    WithRegion,
-    /// This length of the window.
-    Len(Len),
-}
-
-impl PlaceDescAxis {
-    /// The whole of the caller's box.
-    pub const WHOLE: Self = UiSpan::FULL.within_desc();
-
-    /// This region is the child's placement: its answer is not placed inside
-    /// it again. A container uses it where it hands back exactly what the
-    /// child asked for -- a row placing a child at the length it reported.
-    pub const fn fills(mut self) -> Self {
-        self.fills = true;
-        self
-    }
-
-    /// This along `axis`, and the whole of the caller's box across it: what
-    /// a container dividing one axis says, since nothing divides the other.
-    /// [`PlaceDesc::from_axis`] says the across one where it is not the
-    /// whole.
-    pub const fn on_axis(self, axis: Axis) -> PlaceDesc {
-        PlaceDesc::from_axis(axis, self, Self::WHOLE)
-    }
-
-    /// What the child's fractions are of, as a length of the window: a
-    /// resolved share, or a box a sibling's answer decided.
-    pub const fn rel_base(mut self, len: Len) -> Self {
-        self.rel_base = RelBase::Len(len);
-        self
-    }
-
-    /// Where it lands in the coordinates `own` is in.
-    pub fn of(self, own: UiSpan, align: AxisAlign) -> UiSpan {
-        match self.span {
-            PlaceSpan::Within(span) => span.within(&own),
-            PlaceSpan::Shifted(mut span) => {
-                span.shift(own.start);
-                span
-            }
-            PlaceSpan::Sized(len) => own.place(len, align),
-        }
-    }
-}
-
-/// Where a child is asked, on both axes. A [`UiRegion`] converts into the
-/// common case: that box of the caller's own, the answer placed inside it.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct PlaceDesc {
-    pub x: PlaceDescAxis,
-    pub y: PlaceDescAxis,
-}
-
-impl PlaceDesc {
-    /// The whole of the caller's box, on both axes.
-    pub const WHOLE: Self = Self::splat(PlaceDescAxis::WHOLE);
-
-    pub const fn new(x: PlaceDescAxis, y: PlaceDescAxis) -> Self {
-        Self { x, y }
-    }
-
-    /// The same on both axes.
-    pub const fn splat(place: PlaceDescAxis) -> Self {
-        Self { x: place, y: place }
-    }
-
-    /// A description per axis, where the two differ and neither is the
-    /// axis a container divides.
-    pub fn from_axes(f: impl Fn(Axis) -> PlaceDescAxis) -> Self {
-        Self::new(f(Axis::X), f(Axis::Y))
-    }
-
-    /// `aligned` on `axis` and `ortho` on the other, which is how a
-    /// container that divides one axis says what it is doing.
-    pub const fn from_axis(axis: Axis, aligned: PlaceDescAxis, ortho: PlaceDescAxis) -> Self {
-        match axis {
-            Axis::X => Self::new(aligned, ortho),
-            Axis::Y => Self::new(ortho, aligned),
-        }
-    }
-
-    /// Both regions are the child's placement. See [`PlaceDescAxis::fills`].
-    pub const fn fills(self) -> Self {
-        Self::new(self.x.fills(), self.y.fills())
-    }
-
-    /// The child's rel base on one axis. See [`PlaceDescAxis::rel_base`].
-    pub const fn rel_base(mut self, axis: Axis, len: Len) -> Self {
-        self[axis] = self[axis].rel_base(len);
-        self
-    }
-
-    /// The box each axis names, in the coordinates `own` is in.
-    pub fn of(self, own: UiRegion, align: RegionAlign) -> UiRegion {
-        UiRegion::new(self.x.of(own.x, align.x), self.y.of(own.y, align.y))
-    }
-}
-
-impl UiSpan {
-    /// This span composed into the caller's own box, so it moves and scales
-    /// with it: [`UiSpan::within`], which is what a container that insets
-    /// one speaks. Taking eleven pixels off the end needs no length, where
-    /// saying the same thing in window lengths would make the container read
-    /// its own box -- and a box chosen from its own answer then feeds back
-    /// into the answer.
-    ///
-    /// The child's rel base is narrowed the same way, so padding takes its
-    /// pixels off both and `rel(1)` under it fills the caller rather than
-    /// overflowing it.
-    pub const fn within_desc(self) -> PlaceDescAxis {
-        PlaceDescAxis {
-            span: PlaceSpan::Within(self),
-            fills: false,
-            rel_base: RelBase::WithRegion,
-        }
-    }
-
-    /// This span shifted to where the caller's own box starts: window
-    /// lengths along a cursor, which is what a container dividing room among
-    /// its children speaks. A child's report is a window length, so the
-    /// cursor that sums those reports is one too, and a moved box re-places
-    /// every child by re-adding its start, exactly.
-    ///
-    /// The child's rel base passes through: how far along the cursor a child
-    /// sits says nothing about what a fraction under it is of. The same span
-    /// says [`Self::within_desc`] as a part of that box instead, and which is
-    /// meant cannot be read off the numbers.
-    pub const fn shifted_desc(self) -> PlaceDescAxis {
-        PlaceDescAxis {
-            span: PlaceSpan::Shifted(self),
-            fills: false,
-            rel_base: RelBase::Inherit,
-        }
-    }
-}
-
-impl Len {
-    /// A box this long, placed in the caller's own by the child's alignment:
-    /// the rule that places an answer, with the length given from above
-    /// rather than reported. What a stack's sizing child decides for the
-    /// rest. It is the child's rel base too.
-    pub const fn as_desc(self) -> PlaceDescAxis {
-        PlaceDescAxis {
-            span: PlaceSpan::Sized(self),
-            fills: false,
-            rel_base: RelBase::Len(self),
-        }
-    }
-}
-
-impl From<UiRegion> for PlaceDesc {
-    fn from(region: UiRegion) -> Self {
-        Self::new(region.x.within_desc(), region.y.within_desc())
-    }
-}
-
-impl From<PlaceDescAxis> for PlaceDesc {
-    fn from(place: PlaceDescAxis) -> Self {
-        Self::splat(place)
-    }
-}
-
-/// A primitive as it was written: its box in the widget's own box's
-/// coordinates, which is what a move of that box re-composes from.
-#[derive(Debug)]
-pub struct RetainedPrimitive {
-    pub handle: PrimitiveHandle,
-    pub region: UiRegion,
-}
-
-impl_axis_index!(PlaceDesc => PlaceDescAxis);

core/src/util/arena.rs

@@ -1,118 +0,0 @@
-use std::ops::Deref;
-
-use crate::util::{Id, IdNum, IdTracker};
-
-pub struct Arena<T, I> {
-    data: Vec<T>,
-    tracker: IdTracker<I>,
-}
-
-impl<T, I: IdNum> Arena<T, I> {
-    pub fn new() -> Self {
-        Self {
-            data: Vec::new(),
-            tracker: IdTracker::default(),
-        }
-    }
-
-    pub fn push(&mut self, value: T) -> Id<I> {
-        let id = self.tracker.next();
-        let i = id.idx();
-        if i == self.data.len() {
-            self.data.push(value);
-        } else {
-            self.data[i] = value;
-        }
-        id
-    }
-
-    pub fn remove(&mut self, id: Id<I>) -> T
-    where
-        T: Copy,
-    {
-        let i = id.idx();
-        self.tracker.free(id);
-        self.data[i]
-    }
-
-    pub(crate) fn get_mut(&mut self, id: Id<I>) -> &mut T {
-        &mut self.data[id.idx()]
-    }
-}
-
-impl<T, I: IdNum> Default for Arena<T, I> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub struct TrackedArena<T, I> {
-    inner: Arena<T, I>,
-    refs: Vec<u32>,
-    pub changed: bool,
-}
-
-impl<T, I: IdNum> TrackedArena<T, I> {
-    pub fn new() -> Self {
-        Self {
-            inner: Arena::default(),
-            refs: Vec::new(),
-            changed: true,
-        }
-    }
-
-    pub fn push(&mut self, value: T) -> Id<I> {
-        self.changed = true;
-        let id = self.inner.push(value);
-        let i = id.idx();
-        if i == self.refs.len() {
-            self.refs.push(0);
-        }
-        id
-    }
-
-    pub fn push_ref(&mut self, i: Id<I>) {
-        self.refs[i.idx()] += 1;
-    }
-
-    pub fn get_mut(&mut self, id: Id<I>) -> &mut T {
-        self.changed = true;
-        self.inner.get_mut(id)
-    }
-
-    pub fn remove(&mut self, id: Id<I>) -> T
-    where
-        T: Copy,
-    {
-        let i = id.idx();
-        self.refs[i] -= 1;
-        if self.refs[i] == 0 {
-            self.changed = true;
-            self.inner.remove(id)
-        } else {
-            self[i]
-        }
-    }
-}
-
-impl<T, I: IdNum> Default for TrackedArena<T, I> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl<T, I> Deref for TrackedArena<T, I> {
-    type Target = Vec<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner.data
-    }
-}
-
-impl<T, I> Deref for Arena<T, I> {
-    type Target = Vec<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.data
-    }
-}

core/src/util/borrow.rs

@@ -1,35 +0,0 @@
-use std::ops::{Deref, DerefMut};
-
-pub struct DynBorrower<'a, T: ?Sized> {
-    data: &'a mut T,
-    borrowed: &'a mut bool,
-}
-
-impl<'a, T: ?Sized> DynBorrower<'a, T> {
-    pub fn new(data: &'a mut T, borrowed: &'a mut bool) -> Self {
-        if *borrowed {
-            panic!("tried to mutably borrow the same thing twice");
-        }
-        Self { data, borrowed }
-    }
-}
-
-impl<T: ?Sized> Drop for DynBorrower<'_, T> {
-    fn drop(&mut self) {
-        *self.borrowed = false;
-    }
-}
-
-impl<T: ?Sized> Deref for DynBorrower<'_, T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        self.data
-    }
-}
-
-impl<T: ?Sized> DerefMut for DynBorrower<'_, T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.data
-    }
-}

core/src/util/change.rs

@@ -1,30 +0,0 @@
-use std::ops::{Deref, DerefMut};
-
-pub struct MutDetect<T> {
-    inner: T,
-    pub changed: bool,
-}
-
-impl<T> Deref for MutDetect<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl<T> DerefMut for MutDetect<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.changed = true;
-        &mut self.inner
-    }
-}
-
-impl<T> From<T> for MutDetect<T> {
-    fn from(inner: T) -> Self {
-        MutDetect {
-            inner,
-            changed: true,
-        }
-    }
-}

core/src/util/id.rs

@@ -1,87 +0,0 @@
-#[repr(C)]
-#[derive(Eq, Hash, PartialEq, Debug, Clone, Copy, bytemuck::Zeroable)]
-pub struct Id<I = u64>(I);
-
-unsafe impl<I: Copy + bytemuck::Zeroable + 'static> bytemuck::Pod for Id<I> {}
-
-pub struct IdTracker<I = u64> {
-    free: Vec<Id<I>>,
-    cur: Id<I>,
-}
-
-impl<I: IdNum> IdTracker<I> {
-    #[allow(clippy::should_implement_trait)]
-    pub fn next(&mut self) -> Id<I> {
-        if let Some(id) = self.free.pop() {
-            return id;
-        }
-        let next = self.cur.next();
-        std::mem::replace(&mut self.cur, next)
-    }
-
-    #[allow(dead_code)]
-    pub fn free(&mut self, id: Id<I>) {
-        self.free.push(id);
-    }
-}
-
-impl<I: IdNum> Id<I> {
-    #[allow(dead_code)]
-    /// for debug purposes; should this be exposed?
-    /// generally you want to use labels with widgets
-    pub(crate) fn raw(id: I) -> Self {
-        Self(id)
-    }
-    pub fn idx(&self) -> usize {
-        self.0.idx()
-    }
-    pub fn next(&self) -> Id<I> {
-        Self(self.0.next())
-    }
-    pub const fn preset(value: I) -> Self {
-        Self(value)
-    }
-}
-
-impl<I: IdNum> Default for IdTracker<I> {
-    fn default() -> Self {
-        Self {
-            free: Vec::new(),
-            cur: Id(I::first()),
-        }
-    }
-}
-
-pub trait IdNum {
-    fn first() -> Self;
-    fn next(&self) -> Self;
-    fn idx(&self) -> usize;
-}
-
-impl IdNum for u64 {
-    fn first() -> Self {
-        0
-    }
-
-    fn next(&self) -> Self {
-        self + 1
-    }
-
-    fn idx(&self) -> usize {
-        *self as usize
-    }
-}
-
-impl IdNum for u32 {
-    fn first() -> Self {
-        0
-    }
-
-    fn next(&self) -> Self {
-        self + 1
-    }
-
-    fn idx(&self) -> usize {
-        *self as usize
-    }
-}

core/src/util/math.rs

@@ -1,123 +0,0 @@
-pub const trait LerpUtil {
-    fn lerp(self, from: Self, to: Self) -> Self;
-}
-
-const impl LerpUtil for f32 {
-    /// linear interpolation
-    /// from * (1.0 - self) + to * self
-    fn lerp(self, from: Self, to: Self) -> Self {
-        from + (to - from) * self
-    }
-}
-
-macro_rules! impl_op {
-    ($T:ident $op:ident $fn:ident $opa:ident $fna:ident; $($field:ident)*) => {
-        #[allow(non_snake_case)]
-        mod ${concat($T, _op_, $fn, _impl)} {
-            use super::*;
-            #[allow(unused_imports)]
-            use std::ops::*;
-            const impl $op for $T {
-                type Output = Self;
-
-                fn $fn(self, rhs: Self) -> Self::Output {
-                    Self {
-                        $($field: self.$field.$fn(rhs.$field),)*
-                    }
-                }
-            }
-            const impl $opa for $T {
-                fn $fna(&mut self, rhs: Self) {
-                    *self = self.$fn(rhs);
-                }
-            }
-            const impl $op<f32> for $T {
-                type Output = Self;
-
-                fn $fn(self, rhs: f32) -> Self::Output {
-                    Self {
-                        $($field: self.$field.$fn(rhs),)*
-                    }
-                }
-            }
-            const impl $op<$T> for f32 {
-                type Output = $T;
-
-                fn $fn(self, rhs: $T) -> Self::Output {
-                    $T {
-                        $($field: self.$fn(rhs.$field),)*
-                    }
-                }
-            }
-            const impl $opa<f32> for $T {
-                fn $fna(&mut self, rhs: f32) {
-                    *self = self.$fn(rhs);
-                }
-            }
-        }
-    };
-    // Without the `f32` operations, for a type whose fields are not all the
-    // same kind of number: there is nothing a bare float means to a fraction
-    // and an offset at once.
-    (same $T:ident $op:ident $fn:ident $opa:ident $fna:ident; $($field:ident)*) => {
-        #[allow(non_snake_case)]
-        mod ${concat($T, _op_, $fn, _same_impl)} {
-            use super::*;
-            #[allow(unused_imports)]
-            use std::ops::*;
-            const impl $op for $T {
-                type Output = Self;
-
-                fn $fn(self, rhs: Self) -> Self::Output {
-                    Self {
-                        $($field: self.$field.$fn(rhs.$field),)*
-                    }
-                }
-            }
-            const impl $opa for $T {
-                fn $fna(&mut self, rhs: Self) {
-                    *self = self.$fn(rhs);
-                }
-            }
-        }
-    };
-    (same $T:ident $op:ident $fn:ident; $($field:ident)*) => {
-        impl_op!(same $T $op $fn ${concat($op,Assign)} ${concat($fn,_assign)}; $($field)*);
-    };
-    ($T:ident $op:ident $fn:ident; $($field:ident)*) => {
-        impl_op!($T $op $fn ${concat($op,Assign)} ${concat($fn,_assign)}; $($field)*);
-    };
-    (impl $op:ident for $T:ident: $fn:ident $($field:ident)*) => {
-        impl_op!($T $op $fn ${concat($op,Assign)} ${concat($fn,_assign)}; $($field)*);
-    };
-}
-
-pub(crate) use impl_op;
-
-/// `Index<Axis>` for a pair, which is how every pair here is read by axis.
-/// The generics clause is given in braces where the type has one.
-macro_rules! impl_axis_index {
-    ($({$($gen:tt)*})? $T:ty => $Out:ty) => {
-        const impl $(<$($gen)*>)? std::ops::Index<crate::Axis> for $T {
-            type Output = $Out;
-
-            fn index(&self, axis: crate::Axis) -> &$Out {
-                match axis {
-                    crate::Axis::X => &self.x,
-                    crate::Axis::Y => &self.y,
-                }
-            }
-        }
-
-        const impl $(<$($gen)*>)? std::ops::IndexMut<crate::Axis> for $T {
-            fn index_mut(&mut self, axis: crate::Axis) -> &mut $Out {
-                match axis {
-                    crate::Axis::X => &mut self.x,
-                    crate::Axis::Y => &mut self.y,
-                }
-            }
-        }
-    };
-}
-
-pub(crate) use impl_axis_index;

core/src/util/mod.rs

@@ -1,24 +0,0 @@
-mod arena;
-mod borrow;
-mod change;
-mod id;
-mod math;
-mod refcount;
-mod slot;
-mod trust;
-mod typemap;
-mod vec2;
-
-pub use arena::*;
-pub use borrow::*;
-pub use change::*;
-pub use id::*;
-pub use math::*;
-pub use refcount::*;
-pub use slot::*;
-pub(crate) use trust::*;
-pub use typemap::*;
-pub use vec2::*;
-
-pub type HashMap<K, V> = fxhash::FxHashMap<K, V>;
-pub type HashSet<K> = fxhash::FxHashSet<K>;

core/src/util/refcount.rs

@@ -1,36 +0,0 @@
-use std::sync::{
-    Arc,
-    atomic::{AtomicU32, Ordering},
-};
-
-#[derive(Debug)]
-pub struct RefCounter(Arc<AtomicU32>);
-
-impl RefCounter {
-    pub fn new() -> Self {
-        Self(Arc::new(0.into()))
-    }
-    pub fn refs(&self) -> u32 {
-        self.0.load(Ordering::Acquire)
-    }
-    pub fn drop(&mut self) -> bool {
-        let refs = self.0.fetch_sub(1, Ordering::Release);
-        refs == 0
-    }
-    pub fn quiet_clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-impl Default for RefCounter {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Clone for RefCounter {
-    fn clone(&self) -> Self {
-        self.0.fetch_add(1, Ordering::Release);
-        Self(self.0.clone())
-    }
-}

core/src/util/slot.rs

@@ -1,69 +0,0 @@
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct SlotId {
-    idx: u32,
-    genr: u32,
-}
-
-pub struct SlotVec<T> {
-    data: Vec<(u32, Option<T>)>,
-    free: Vec<u32>,
-}
-
-impl<T> SlotVec<T> {
-    pub fn new() -> Self {
-        Self {
-            data: Default::default(),
-            free: Default::default(),
-        }
-    }
-
-    pub fn add(&mut self, x: T) -> SlotId {
-        if let Some(idx) = self.free.pop() {
-            let (genr, data) = &mut self.data[idx as usize];
-            *data = Some(x);
-            SlotId { idx, genr: *genr }
-        } else {
-            let idx = self.data.len() as u32;
-            let genr = 0;
-            self.data.push((genr, Some(x)));
-            SlotId { idx, genr }
-        }
-    }
-
-    pub fn free(&mut self, id: SlotId) {
-        let (genr, data) = &mut self.data[id.idx as usize];
-        *genr += 1;
-        *data = None;
-        self.free.push(id.idx);
-    }
-
-    pub fn get(&self, id: SlotId) -> Option<&T> {
-        let slot = &self.data[id.idx as usize];
-        if slot.0 != id.genr {
-            return None;
-        }
-        slot.1.as_ref()
-    }
-
-    pub fn get_mut(&mut self, id: SlotId) -> Option<&mut T> {
-        let slot = &mut self.data[id.idx as usize];
-        if slot.0 != id.genr {
-            return None;
-        }
-        slot.1.as_mut()
-    }
-
-    pub fn len(&self) -> usize {
-        self.data.len() - self.free.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-}
-
-impl<T> Default for SlotVec<T> {
-    fn default() -> Self {
-        Self::new()
-    }
-}

core/src/util/trust.rs

@@ -1,12 +0,0 @@
-#[allow(clippy::missing_safety_doc)]
-pub(crate) unsafe fn forget_mut<'a, T>(x: &mut T) -> &'a mut T {
-    unsafe { std::mem::transmute::<&mut T, &mut T>(x) }
-}
-
-#[allow(clippy::mut_from_ref, clippy::missing_safety_doc)]
-pub(crate) unsafe fn to_mut<T>(x: &T) -> &mut T {
-    #[allow(mutable_transmutes)]
-    unsafe {
-        std::mem::transmute::<&T, &mut T>(x)
-    }
-}

core/src/util/typemap.rs

@@ -1,56 +0,0 @@
-use crate::util::HashMap;
-use std::{
-    any::TypeId,
-    marker::Unsize,
-    ops::{Deref, DerefMut},
-};
-
-pub struct TypeMap<Trait: ?Sized> {
-    map: HashMap<TypeId, Box<Trait>>,
-}
-
-impl<Trait: ?Sized> TypeMap<Trait> {
-    pub fn set_type<T: Unsize<Trait> + 'static>(&mut self, val: T) {
-        self.map
-            .insert(TypeId::of::<T>(), Box::new(val) as Box<Trait>);
-    }
-
-    pub fn type_mut<T: Unsize<Trait> + 'static>(&mut self) -> Option<&mut T> {
-        Some(Self::convert_mut(self.map.get_mut(&TypeId::of::<T>())?))
-    }
-
-    pub fn type_or_default<T: Default + Unsize<Trait> + 'static>(&mut self) -> &mut T {
-        Self::convert_mut(
-            self.map
-                .entry(TypeId::of::<T>())
-                .or_insert(Box::new(T::default()) as Box<Trait>),
-        )
-    }
-
-    fn convert_mut<T: Unsize<Trait>>(entry: &mut Box<Trait>) -> &mut T {
-        // allegedly this is just what Any does...
-        unsafe { &mut *(entry.as_mut() as *mut Trait as *mut T) }
-    }
-}
-
-impl<T: ?Sized> Deref for TypeMap<T> {
-    type Target = HashMap<TypeId, Box<T>>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.map
-    }
-}
-
-impl<T: ?Sized> DerefMut for TypeMap<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.map
-    }
-}
-
-impl<T: ?Sized> Default for TypeMap<T> {
-    fn default() -> Self {
-        Self {
-            map: Default::default(),
-        }
-    }
-}

core/src/util/vec2.rs

@@ -1,94 +0,0 @@
-use crate::util::impl_op;
-use std::{hash::Hash, ops::*};
-
-/// `align(8)` because that is WGSL's alignment for a `vec2<f32>`, so any GPU
-/// struct holding one is laid out the way its shader reads it without having
-/// to say so itself. Those structs still need a manual `unsafe impl Pod`,
-/// since the trailing padding this introduces is what `derive(Pod)` refuses.
-#[repr(C, align(8))]
-#[derive(Clone, Copy, PartialEq, Default, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct Vec2 {
-    pub x: f32,
-    pub y: f32,
-}
-
-impl Eq for Vec2 {}
-
-impl Hash for Vec2 {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        state.write_u32(self.x.to_bits());
-        state.write_u32(self.y.to_bits());
-    }
-}
-
-impl Vec2 {
-    pub const ZERO: Self = Self::new(0.0, 0.0);
-    pub const ONE: Self = Self::new(1.0, 1.0);
-
-    pub const fn new(x: f32, y: f32) -> Self {
-        Self { x, y }
-    }
-
-    pub const fn round(self) -> Self {
-        Self {
-            x: self.x.round(),
-            y: self.y.round(),
-        }
-    }
-
-    pub const fn floor(self) -> Self {
-        Self {
-            x: self.x.floor(),
-            y: self.y.floor(),
-        }
-    }
-
-    pub const fn ceil(self) -> Self {
-        Self {
-            x: self.x.ceil(),
-            y: self.y.ceil(),
-        }
-    }
-
-    pub const fn tuple(&self) -> (f32, f32) {
-        (self.x, self.y)
-    }
-
-    pub const fn with_x(mut self, x: f32) -> Self {
-        self.x = x;
-        self
-    }
-
-    pub const fn with_y(mut self, y: f32) -> Self {
-        self.y = y;
-        self
-    }
-}
-
-// this version looks kinda cool... is it more readable? more annoying to copy and change though
-impl_op!(impl Add for Vec2: add x y);
-impl_op!(Vec2 Sub sub; x y);
-impl_op!(Vec2 Mul mul; x y);
-impl_op!(Vec2 Div div; x y);
-
-impl Neg for Vec2 {
-    type Output = Self;
-
-    fn neg(mut self) -> Self::Output {
-        self.x = -self.x;
-        self.y = -self.y;
-        self
-    }
-}
-
-impl std::fmt::Debug for Vec2 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}
-
-impl std::fmt::Display for Vec2 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}

core/src/widget/data.rs

@@ -1,28 +0,0 @@
-use crate::{RegionAlign, SizeRules, Widget};
-
-pub struct WidgetData {
-    pub widget: Box<dyn Widget>,
-    pub label: String,
-    pub(super) region_node: bool,
-    pub(super) size: SizeRules,
-    pub(super) align: RegionAlign,
-    /// dynamic borrow checking
-    pub borrowed: bool,
-}
-
-impl WidgetData {
-    pub fn new<W: Widget>(widget: W) -> Self {
-        let mut label = std::any::type_name::<W>().to_string();
-        if let (Some(first), Some(last)) = (label.find(":"), label.rfind(":")) {
-            label = label.split_at(first).0.to_string() + "::" + label.split_at(last + 1).1;
-        }
-        Self {
-            widget: Box::new(widget),
-            label,
-            region_node: false,
-            size: SizeRules::default(),
-            align: RegionAlign::default(),
-            borrowed: false,
-        }
-    }
-}

core/src/widget/handle.rs

@@ -1,164 +0,0 @@
-use std::{marker::Unsize, ops::CoerceUnsized, sync::mpsc::Sender};
-
-use crate::{
-    UiRsc, Widget,
-    util::{RefCounter, SlotId},
-};
-
-pub type WidgetId = SlotId;
-
-/// An identifier for a widget that can index a UI or event ctx to get it.
-/// This is a strong handle that does not impl Clone, and when it is dropped,
-/// a signal is sent to the owning UI to clean up the resources.
-///
-/// TODO: ergonomic clones when they get put in rust-analyzer & don't cause ICEs?
-pub struct StrongWidget<W: ?Sized = dyn Widget> {
-    pub(super) id: WidgetId,
-    counter: RefCounter,
-    send: Sender<WidgetId>,
-    ty: *const W,
-}
-
-/// A weak handle to a widget.
-/// Will not keep it alive, but can still be used for indexing like WidgetHandle.
-pub struct WeakWidget<W: ?Sized = dyn Widget> {
-    pub(super) id: WidgetId,
-    #[allow(unused)]
-    ty: *const W,
-}
-
-impl<W: Widget + ?Sized + Unsize<dyn Widget>> StrongWidget<W> {
-    pub fn any(self) -> StrongWidget<dyn Widget> {
-        self
-    }
-}
-
-impl<W: ?Sized> StrongWidget<W> {
-    pub(crate) fn new(id: WidgetId, send: Sender<WidgetId>) -> Self {
-        Self {
-            id,
-            counter: RefCounter::new(),
-            send,
-            ty: null_ptr(),
-        }
-    }
-
-    pub fn id(&self) -> WidgetId {
-        self.id
-    }
-
-    pub fn refs(&self) -> u32 {
-        self.counter.refs()
-    }
-
-    pub fn weak(&self) -> WeakWidget<W> {
-        let Self { ty, id, .. } = *self;
-        WeakWidget { ty, id }
-    }
-}
-
-impl<W: ?Sized> WeakWidget<W> {
-    pub(crate) fn new(id: WidgetId) -> Self {
-        Self { id, ty: null_ptr() }
-    }
-
-    pub fn id(&self) -> WidgetId {
-        self.id
-    }
-
-    #[track_caller]
-    pub fn upgrade(self, ui: &mut impl UiRsc) -> StrongWidget<W> {
-        ui.widgets_mut().upgrade(self)
-    }
-}
-
-impl<W: ?Sized> Drop for StrongWidget<W> {
-    fn drop(&mut self) {
-        if self.counter.drop() {
-            let _ = self.send.send(self.id);
-        }
-    }
-}
-
-pub trait WidgetIdFn<Rsc, W: ?Sized = dyn Widget>: FnOnce(&mut Rsc) -> WeakWidget<W> {}
-impl<Rsc, W: ?Sized, F: FnOnce(&mut Rsc) -> WeakWidget<W>> WidgetIdFn<Rsc, W> for F {}
-
-pub trait IdLike {
-    type Widget: ?Sized;
-    fn id(&self) -> WidgetId;
-}
-
-impl<W: ?Sized> IdLike for &StrongWidget<W> {
-    type Widget = W;
-    fn id(&self) -> WidgetId {
-        self.id
-    }
-}
-
-impl<W: ?Sized> IdLike for StrongWidget<W> {
-    type Widget = W;
-    fn id(&self) -> WidgetId {
-        self.id
-    }
-}
-
-impl<W: ?Sized> IdLike for WeakWidget<W> {
-    type Widget = W;
-    fn id(&self) -> WidgetId {
-        self.id
-    }
-}
-
-impl IdLike for WidgetId {
-    type Widget = dyn Widget;
-    fn id(&self) -> WidgetId {
-        *self
-    }
-}
-
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<StrongWidget<U>> for StrongWidget<T> {}
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<WeakWidget<U>> for WeakWidget<T> {}
-
-impl<W: ?Sized> Clone for WeakWidget<W> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-impl<W: ?Sized> Copy for WeakWidget<W> {}
-impl<W: ?Sized> PartialEq for WeakWidget<W> {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl<W> PartialEq for StrongWidget<W> {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl<W> std::fmt::Debug for StrongWidget<W> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.id.fmt(f)
-    }
-}
-
-impl<'a, W: Widget + 'a, State: UiRsc> FnOnce<(&'a mut State,)> for WeakWidget<W> {
-    type Output = &'a mut W;
-
-    extern "rust-call" fn call_once(self, args: (&'a mut State,)) -> Self::Output {
-        &mut args.0.widgets_mut()[self]
-    }
-}
-
-fn null_ptr<W: ?Sized>() -> *const W {
-    if size_of::<&W>() == size_of::<*const dyn Widget>() {
-        let w: *const dyn Widget = &();
-        unsafe { std::mem::transmute_copy(&w) }
-    } else {
-        unsafe { std::mem::transmute_copy(&[0usize; 1]) }
-    }
-}
-
-unsafe impl<W: ?Sized> Send for WeakWidget<W> {}
-unsafe impl<W: ?Sized> Sync for WeakWidget<W> {}

core/src/widget/like.rs

@@ -1,75 +0,0 @@
-use crate::UiRsc;
-
-use super::*;
-use std::marker::Unsize;
-
-pub trait WidgetLike<Rsc: UiRsc, Tag>: Sized {
-    type Widget: Widget + ?Sized + Unsize<dyn Widget>;
-
-    fn add(self, rsc: &mut Rsc) -> WeakWidget<Self::Widget>;
-
-    fn add_strong(self, rsc: &mut Rsc) -> StrongWidget<Self::Widget> {
-        self.add(rsc).upgrade(rsc)
-    }
-
-    fn with_id<W2>(
-        self,
-        f: impl FnOnce(&mut Rsc, WeakWidget<Self::Widget>) -> WeakWidget<W2>,
-    ) -> impl WidgetIdFn<Rsc, W2> {
-        move |state| {
-            let id = self.add(state);
-            f(state, id)
-        }
-    }
-
-    fn set_root(self, rsc: &mut Rsc, root: &mut impl HasRoot) {
-        let id = self.add_strong(rsc);
-        root.set_root(id);
-    }
-}
-
-pub trait HasRoot {
-    fn set_root(&mut self, root: StrongWidget);
-}
-
-pub trait WidgetArrLike<Rsc, const LEN: usize, Tag> {
-    #[track_caller]
-    fn add(self, state: &mut Rsc) -> WidgetArr<LEN>;
-}
-
-impl<Rsc, const LEN: usize> WidgetArrLike<Rsc, LEN, ArrTag> for WidgetArr<LEN> {
-    fn add(self, _: &mut Rsc) -> WidgetArr<LEN> {
-        self
-    }
-}
-
-// variadic generics please save us
-macro_rules! impl_widget_arr {
-    ($n:expr;$($W:ident)*) => {
-        impl_widget_arr!($n;$($W)*;$(${concat($W,Tag)})*);
-    };
-    ($n:expr;$($W:ident)*;$($Tag:ident)*) => {
-        impl<Rsc: UiRsc, $($W: WidgetLike<Rsc, $Tag>,$Tag,)*> WidgetArrLike<Rsc, $n, ($($Tag,)*)> for ($($W,)*) {
-            fn add(self, rsc: &mut Rsc) -> WidgetArr<$n> {
-                #[allow(non_snake_case)]
-                let ($($W,)*) = self;
-                WidgetArr::new(
-                    [$($W.add(rsc).upgrade(rsc),)*],
-                )
-            }
-        }
-    };
-}
-
-impl_widget_arr!(1;A);
-impl_widget_arr!(2;A B);
-impl_widget_arr!(3;A B C);
-impl_widget_arr!(4;A B C D);
-impl_widget_arr!(5;A B C D E);
-impl_widget_arr!(6;A B C D E F);
-impl_widget_arr!(7;A B C D E F G);
-impl_widget_arr!(8;A B C D E F G H);
-impl_widget_arr!(9;A B C D E F G H I);
-impl_widget_arr!(10;A B C D E F G H I J);
-impl_widget_arr!(11;A B C D E F G H I J K);
-impl_widget_arr!(12;A B C D E F G H I J K L);

core/src/widget/mod.rs

@@ -1,83 +0,0 @@
-use crate::{Axis, LayoutLen, Painter, Size};
-use std::any::Any;
-
-mod data;
-mod handle;
-mod like;
-mod size_rule;
-mod tag;
-mod view;
-mod widgets;
-
-pub use data::*;
-pub use handle::*;
-pub use like::*;
-pub use size_rule::*;
-pub use tag::*;
-pub use view::*;
-pub use widgets::*;
-
-pub trait Widget: Any {
-    /// Draws the widget, and returns what it used of the box it was given.
-    fn draw(&mut self, painter: &mut Painter) -> Size;
-
-    /// An exact length the widget can give without a painter or its children.
-    /// Optional, and saves a draw rather than changing one: a hint that
-    /// disagrees with the eventual draw fails a debug assertion.
-    fn size_hint(&self, _axis: Axis) -> Option<LayoutLen> {
-        None
-    }
-}
-
-impl Widget for () {
-    /// A gap: nothing drawn, at the default length, so a span gives it a share.
-    fn draw(&mut self, _: &mut Painter) -> Size {
-        Size::default()
-    }
-
-    fn size_hint(&self, _axis: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::default())
-    }
-}
-
-impl dyn Widget {
-    pub fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    pub fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-/// A function that returns a widget given a UI.
-/// Useful for defining trait functions on widgets that create a parent widget so that the children
-/// don't need to be IDs yet
-pub trait WidgetFn<State, W: Widget + ?Sized>: FnOnce(&mut State) -> W {}
-impl<State, W: Widget + ?Sized, F: FnOnce(&mut State) -> W> WidgetFn<State, W> for F {}
-
-pub struct WidgetArr<const LEN: usize> {
-    pub arr: [StrongWidget; LEN],
-}
-
-impl<const LEN: usize> WidgetArr<LEN> {
-    pub fn new(arr: [StrongWidget; LEN]) -> Self {
-        Self { arr }
-    }
-}
-
-pub trait WidgetOption<State> {
-    fn get(self, state: &mut State) -> Option<StrongWidget>;
-}
-
-impl<State> WidgetOption<State> for () {
-    fn get(self, _: &mut State) -> Option<StrongWidget> {
-        None
-    }
-}
-
-impl<State, F: FnOnce(&mut State) -> Option<StrongWidget>> WidgetOption<State> for F {
-    fn get(self, state: &mut State) -> Option<StrongWidget> {
-        self(state)
-    }
-}

core/src/widget/size_rule.rs

@@ -1,86 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, LayoutLen, Len};
-
-/// What a widget's length on one axis is, as a rule its parent applies where
-/// it draws it rather than an answer the widget gives about itself.
-///
-/// A rule and a drawn size are not two opinions to reconcile: a rule wins on
-/// the axis it names, and the `Size` returned by `draw` answers only the axes
-/// with no rule. That is what lets a span divide its space around a length
-/// nobody has drawn yet, and it is why a rule lives beside the widget rather
-/// than inside it -- the widget under the rule never has to know about it.
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub enum SizeRule {
-    /// Whatever the widget reports from drawing.
-    #[default]
-    Free,
-    /// This length, whatever the widget reports.
-    Exact(LayoutLen),
-}
-
-impl SizeRule {
-    /// The length this rule gives without the widget being drawn, if it can
-    /// give one.
-    pub fn declared(&self) -> Option<Len> {
-        self.exact().and_then(LayoutLen::declared)
-    }
-
-    /// The length this rule gives outright, whatever the widget reports --
-    /// which makes the widget's answer on that axis moot. A share counts: it
-    /// is a length the widget's parent still has to divide, so it is exact
-    /// here and resolved there, unlike `declared`, which is only the ones
-    /// that give a box directly.
-    pub fn exact(&self) -> Option<LayoutLen> {
-        match self {
-            Self::Free => None,
-            Self::Exact(len) => Some(*len),
-        }
-    }
-}
-
-impl From<LayoutLen> for SizeRule {
-    fn from(len: LayoutLen) -> Self {
-        Self::Exact(len)
-    }
-}
-
-impl From<Option<LayoutLen>> for SizeRule {
-    fn from(len: Option<LayoutLen>) -> Self {
-        len.map_or(Self::Free, Self::Exact)
-    }
-}
-
-/// One rule per axis, which is how a widget carries a length on one axis and
-/// leaves the other to whatever it draws.
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub struct SizeRules {
-    pub x: SizeRule,
-    pub y: SizeRule,
-}
-
-impl_axis_index!(SizeRules => SizeRule);
-
-/// What a widget's box is on each axis where something says so outright,
-/// before it is drawn: a rule beside it, or a hint it gives about itself.
-/// Whoever draws the widget resolves these against its rel base.
-///
-/// A [`Len`] rather than a [`LayoutLen`], because a share can never be one
-/// -- see [`LayoutLen::declared`].
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Declared {
-    pub x: Option<Len>,
-    pub y: Option<Len>,
-}
-
-impl Declared {
-    pub const NONE: Self = Self { x: None, y: None };
-
-    pub fn from_axes(f: impl Fn(Axis) -> Option<Len>) -> Self {
-        Self {
-            x: f(Axis::X),
-            y: f(Axis::Y),
-        }
-    }
-}
-
-impl_axis_index!(Declared => Option<Len>);

core/src/widget/tag.rs

@@ -1,64 +0,0 @@
-use super::*;
-use crate::UiRsc;
-use std::marker::Unsize;
-
-pub struct WidgetTag;
-impl<Rsc: UiRsc, W: Widget> WidgetLike<Rsc, WidgetTag> for W {
-    type Widget = W;
-    fn add(self, rsc: &mut Rsc) -> WeakWidget<W> {
-        let w = rsc.ui_mut().widgets.add_weak(self);
-        rsc.on_add(w);
-        w
-    }
-}
-
-pub struct FnTag;
-impl<Rsc: UiRsc, W: Widget, F: FnOnce(&mut Rsc) -> W> WidgetLike<Rsc, FnTag> for F {
-    type Widget = W;
-    fn add(self, rsc: &mut Rsc) -> WeakWidget<W> {
-        self(rsc).add(rsc)
-    }
-}
-
-pub trait WidgetFnTrait<Rsc> {
-    type Widget: Widget;
-    fn run(self, rsc: &mut Rsc) -> Self::Widget;
-}
-pub struct FnTraitTag;
-impl<Rsc: UiRsc, T: WidgetFnTrait<Rsc>> WidgetLike<Rsc, FnTraitTag> for T {
-    type Widget = T::Widget;
-    #[track_caller]
-    fn add(self, rsc: &mut Rsc) -> WeakWidget<T::Widget> {
-        self.run(rsc).add(rsc)
-    }
-}
-
-pub struct RefTag;
-impl<Rsc: UiRsc, W: ?Sized + Widget + Unsize<dyn Widget>> WidgetLike<Rsc, RefTag>
-    for WeakWidget<W>
-{
-    type Widget = W;
-    fn add(self, _: &mut Rsc) -> WeakWidget<W> {
-        self
-    }
-}
-
-pub struct RefFnTag;
-impl<Rsc: UiRsc, W: ?Sized + Widget + Unsize<dyn Widget>, F: FnOnce(&mut Rsc) -> WeakWidget<W>>
-    WidgetLike<Rsc, RefFnTag> for F
-{
-    type Widget = W;
-    fn add(self, rsc: &mut Rsc) -> WeakWidget<W> {
-        self(rsc)
-    }
-}
-
-pub struct ViewTag;
-impl<Rsc: UiRsc, V: WidgetView> WidgetLike<Rsc, ViewTag> for V {
-    type Widget = V::Widget;
-    fn add(self, _: &mut Rsc) -> WeakWidget<Self::Widget> {
-        self.root()
-    }
-}
-
-pub struct ArrTag;

core/src/widget/view.rs

@@ -1,24 +0,0 @@
-use std::marker::Unsize;
-
-use crate::{IdLike, WeakWidget, Widget};
-
-pub trait WidgetView {
-    type Widget: Widget + ?Sized + Unsize<dyn Widget>;
-    fn root(&self) -> WeakWidget<Self::Widget>;
-}
-
-pub trait HasWidget {
-    type Widget: Widget + ?Sized + Unsize<dyn Widget>;
-}
-
-impl<W: Widget + Unsize<dyn Widget> + ?Sized> HasWidget for WeakWidget<W> {
-    type Widget = W;
-}
-
-impl<WV: WidgetView> IdLike for WV {
-    type Widget = WV::Widget;
-
-    fn id(&self) -> super::WidgetId {
-        self.root().id
-    }
-}

core/src/widget/widgets.rs

@@ -1,211 +0,0 @@
-use std::sync::mpsc::{Receiver, Sender, channel};
-
-use crate::{
-    Axis, AxisAlign, IdLike, RegionAlign, SizeRule, SizeRules, StrongWidget, WeakWidget, Widget,
-    WidgetData, WidgetId,
-    util::{DynBorrower, HashSet, SlotVec, forget_mut, to_mut},
-};
-
-pub struct Widgets {
-    pub needs_redraw: HashSet<WidgetId>,
-    vec: SlotVec<WidgetData>,
-    send: Sender<WidgetId>,
-    recv: Receiver<WidgetId>,
-    pub(crate) waiting: HashSet<WidgetId>,
-}
-
-impl Widgets {
-    pub fn new() -> Self {
-        let (send, recv) = channel();
-        Self {
-            needs_redraw: Default::default(),
-            vec: Default::default(),
-            waiting: Default::default(),
-            send,
-            recv,
-        }
-    }
-
-    pub fn has_updates(&self) -> bool {
-        !self.needs_redraw.is_empty()
-    }
-
-    pub fn get_dyn(&self, id: WidgetId) -> Option<&dyn Widget> {
-        Some(self.vec.get(id)?.widget.as_ref())
-    }
-
-    pub fn get_dyn_mut(&mut self, id: WidgetId) -> Option<&mut dyn Widget> {
-        self.needs_redraw.insert(id);
-        Some(self.vec.get_mut(id)?.widget.as_mut())
-    }
-
-    /// get_dyn but dynamic borrow checking of widgets
-    /// lets you do recursive (tree) operations, like the painter does
-    pub(crate) fn get_dyn_dynamic<'a>(&self, id: WidgetId) -> WidgetWrapper<'a> {
-        // SAFETY: must guarantee no other mutable references to this widget exist
-        // done through the borrow variable
-        let data = unsafe { forget_mut(to_mut(self.vec.get(id).unwrap())) };
-        if data.borrowed {
-            panic!("tried to mutably borrow the same widget twice");
-        }
-        WidgetWrapper::new(data.widget.as_mut(), &mut data.borrowed)
-    }
-
-    pub fn get<I: IdLike>(&self, id: &I) -> Option<&I::Widget>
-    where
-        I::Widget: Sized + Widget,
-    {
-        self.get_dyn(id.id())?.as_any().downcast_ref()
-    }
-
-    pub fn get_mut<I: IdLike>(&mut self, id: &I) -> Option<&mut I::Widget>
-    where
-        I::Widget: Sized + Widget,
-    {
-        self.get_dyn_mut(id.id())?.as_any_mut().downcast_mut()
-    }
-
-    pub fn add_strong<W: Widget>(&mut self, widget: W) -> StrongWidget<W> {
-        let id = self.vec.add(WidgetData::new(widget));
-        StrongWidget::new(id, self.send.clone())
-    }
-
-    pub fn add_weak<W: Widget>(&mut self, widget: W) -> WeakWidget<W> {
-        let id = self.vec.add(WidgetData::new(widget));
-        self.waiting.insert(id);
-        WeakWidget::new(id)
-    }
-
-    #[track_caller]
-    pub fn upgrade<W: ?Sized>(&mut self, rf: WeakWidget<W>) -> StrongWidget<W> {
-        if !self.waiting.remove(&rf.id()) {
-            let label = self.label(rf);
-            let id = rf.id();
-            panic!(
-                "widget '{label}' ({id:?}) was already added\ncannot add a widget twice; consider creating two"
-            )
-        }
-        StrongWidget::new(rf.id(), self.send.clone())
-    }
-
-    pub fn data(&self, id: impl IdLike) -> Option<&WidgetData> {
-        self.vec.get(id.id())
-    }
-
-    pub fn label(&self, id: impl IdLike) -> &String {
-        &self.data(id.id()).unwrap().label
-    }
-
-    /// useful for debugging
-    pub fn set_label(&mut self, id: impl IdLike, label: String) {
-        self.data_mut(id.id()).unwrap().label = label;
-    }
-
-    /// Whether this widget owns a movable retained region.
-    pub fn is_region_node(&self, id: impl IdLike) -> bool {
-        self.data(id).unwrap().region_node
-    }
-
-    /// Chooses whether this widget's retained drawing has one movable region
-    /// of its own. Changing the boundary redraws the subtree once so every
-    /// primitive names the right coordinate space.
-    pub fn set_region_node(&mut self, id: impl IdLike, region_node: bool) {
-        let id = id.id();
-        let data = self.data_mut(id).unwrap();
-        if data.region_node == region_node {
-            return;
-        }
-        data.region_node = region_node;
-        self.needs_redraw.insert(id);
-    }
-
-    /// The length rules whoever draws this widget applies to its box.
-    pub fn size_rules(&self, id: impl IdLike) -> SizeRules {
-        self.data(id).unwrap().size
-    }
-
-    /// Sets one axis's rule. The widget is marked rather than its parent
-    /// because the parent is not known here; `redraw` escalates a changed
-    /// declared length to whoever resolves it.
-    pub fn set_size_rule(&mut self, id: impl IdLike, axis: Axis, rule: SizeRule) {
-        let id = id.id();
-        let data = self.data_mut(id).unwrap();
-        if data.size[axis] == rule {
-            return;
-        }
-        data.size[axis] = rule;
-        self.needs_redraw.insert(id);
-    }
-
-    /// Where this widget sits in a box longer than the length it takes.
-    pub fn alignment(&self, id: impl IdLike) -> RegionAlign {
-        self.data(id).unwrap().align
-    }
-
-    /// Sets one axis's alignment. Which box a widget ends up in is its
-    /// parent's to decide, so this is escalated the way a length rule is.
-    pub fn set_alignment(&mut self, id: impl IdLike, axis: Axis, align: AxisAlign) {
-        let id = id.id();
-        let data = self.data_mut(id).unwrap();
-        if data.align[axis] == align {
-            return;
-        }
-        data.align[axis] = align;
-        self.needs_redraw.insert(id);
-    }
-
-    /// Both axes at once, for a caller holding a pair.
-    pub fn set_size_rules(
-        &mut self,
-        id: impl IdLike,
-        x: impl Into<SizeRule>,
-        y: impl Into<SizeRule>,
-    ) {
-        let id = id.id();
-        self.set_size_rule(id, Axis::X, x.into());
-        self.set_size_rule(id, Axis::Y, y.into());
-    }
-
-    pub fn data_mut(&mut self, id: impl IdLike) -> Option<&mut WidgetData> {
-        self.vec.get_mut(id.id())
-    }
-
-    pub fn free_next(&mut self) -> Option<WidgetId> {
-        let next = self.recv.try_recv().ok()?;
-        self.vec.free(next);
-        Some(next)
-    }
-
-    #[allow(clippy::len_without_is_empty)]
-    pub fn len(&self) -> usize {
-        self.vec.len()
-    }
-}
-
-impl Default for Widgets {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub type WidgetWrapper<'a> = DynBorrower<'a, dyn Widget>;
-
-impl<I: IdLike> std::ops::Index<I> for Widgets
-where
-    I::Widget: Sized + Widget,
-{
-    type Output = I::Widget;
-
-    fn index(&self, id: I) -> &Self::Output {
-        self.get(&id).unwrap()
-    }
-}
-
-impl<I: IdLike> std::ops::IndexMut<I> for Widgets
-where
-    I::Widget: Sized + Widget,
-{
-    fn index_mut(&mut self, id: I) -> &mut Self::Output {
-        self.get_mut(&id).unwrap()
-    }
-}

examples/minimal.rs

@@ -1,17 +0,0 @@
-use iris::prelude::*;
-
-fn main() {
-    DefaultApp::<State>::run();
-}
-
-#[derive(DefaultUiState)]
-struct State {
-    ui_state: DefaultUiState,
-}
-
-impl DefaultAppState for State {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        rect(Color::RED).set_root(rsc, &mut ui_state);
-        Self { ui_state }
-    }
-}

examples/random.rs

@@ -1,31 +0,0 @@
-//! The seeded random tree `tests/generated.rs` checks, drawn so it can be
-//! looked at. `IRIS_SEED` and `IRIS_DEPTH` choose which one.
-
-use iris::prelude::*;
-use iris::random::Edits;
-
-fn env(name: &str, fallback: u64) -> u64 {
-    std::env::var(name)
-        .ok()
-        .and_then(|v| v.parse().ok())
-        .unwrap_or(fallback)
-}
-
-fn main() {
-    DefaultApp::<State>::run();
-}
-
-#[derive(DefaultUiState)]
-struct State {
-    ui_state: DefaultUiState,
-}
-
-impl DefaultAppState for State {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        let seed = env("IRIS_SEED", 1);
-        let depth = env("IRIS_DEPTH", 4) as usize;
-        let (root, _) = iris::random::grow(rsc, seed, depth, &Edits::default());
-        ui_state.set_root(root);
-        Self { ui_state }
-    }
-}

examples/tabs/main.rs

@@ -1,224 +0,0 @@
-use std::{cell::RefCell, rc::Rc};
-use winit::event::WindowEvent;
-
-use iris::prelude::*;
-type ClientRsc = DefaultRsc<Client>;
-
-fn main() {
-    DefaultApp::<Client>::run();
-}
-
-#[derive(DefaultUiState)]
-pub struct Client {
-    ui_state: DefaultUiState,
-    info: WeakWidget<Text>,
-}
-
-impl DefaultAppState for Client {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        let rrect = rect(Color::WHITE).radius(20);
-        let pad_test = (
-            rrect.color(Color::BLUE),
-            (
-                // The square is one widget and the two shares of the row it
-                // sits centred in are another: a length is a property of a
-                // widget, so `.width` here would overwrite the `.sized`.
-                rrect
-                    .color(Color::RED)
-                    .sized((100, 100))
-                    .center()
-                    .wrapper()
-                    .width(leftover(2)),
-                (
-                    rrect.color(Color::ORANGE),
-                    rrect.color(Color::LIME).pad(10.0),
-                )
-                    .span(Dir::RIGHT)
-                    .width(leftover(2)),
-                rrect.color(Color::YELLOW),
-            )
-                .span(Dir::RIGHT)
-                .pad(10)
-                .width(leftover(3)),
-        )
-            .span(Dir::RIGHT)
-            .add(rsc);
-
-        let span_test = (
-            rrect.color(Color::GREEN).width(100),
-            rrect.color(Color::ORANGE),
-            rrect.color(Color::CYAN),
-            rrect.color(Color::BLUE).width(rel(0.5)),
-            rrect.color(Color::MAGENTA).width(100),
-            rrect.color(Color::RED).width(100),
-        )
-            .span(Dir::LEFT)
-            .add(rsc);
-
-        let span_add = Span::empty(Dir::RIGHT).add(rsc);
-
-        let add_button = rect(Color::LIME)
-            .radius(30)
-            .on(CursorSense::click(), move |_, rsc| {
-                let child = image(include_bytes!("assets/sungals.png"))
-                    .center()
-                    .add_strong(rsc);
-                span_add(rsc).push(child);
-            })
-            .sized((150, 150))
-            .align(Align::BOT_RIGHT);
-
-        let del_button = rect(Color::RED)
-            .radius(30)
-            .on(CursorSense::click(), move |_, rsc| {
-                span_add(rsc).pop();
-            })
-            .sized((150, 150))
-            .align(Align::BOT_LEFT);
-
-        let span_add_test = (span_add, add_button, del_button).stack().add(rsc);
-
-        let btext = |content| wtext(content).size(30);
-
-        let text_test = (
-            btext("this is a").align(Align::LEFT),
-            btext("teeeeeeeest").align(Align::RIGHT),
-            btext("okkk\nokkkkkk!").align(Align::LEFT),
-            btext("hmm"),
-            btext("a"),
-            (
-                btext("'").family(Family::Monospace).align(Align::TOP),
-                btext("'").family(Family::Monospace),
-                btext(":gamer mode").family(Family::Monospace),
-                rect(Color::CYAN).sized((10, 10)).center(),
-                rect(Color::RED).sized((100, 100)).center(),
-                rect(Color::PURPLE).sized((50, 50)).align(Align::TOP),
-            )
-                .span(Dir::RIGHT)
-                .center(),
-            wtext("pretty cool right?").size(50),
-        )
-            .span(Dir::DOWN)
-            .add(rsc);
-
-        let texts = Span::empty(Dir::DOWN).gap(10).add(rsc);
-        let msg_area = texts.scrollable().masked().background(rect(Color::SKY));
-        let add_text = wtext("add")
-            .editable(EditMode::MultiLine)
-            .text_align(Align::LEFT)
-            .size(30)
-            .attr::<Selectable>(())
-            .on(Submit, move |ctx, rsc| {
-                let w = ctx.widget;
-                let content = w.edit(rsc).take();
-                let text = wtext(content)
-                    .editable(EditMode::MultiLine)
-                    .size(30)
-                    .text_align(Align::LEFT)
-                    .wrap(true)
-                    .attr::<Selectable>(());
-                let msg_box = text
-                    .background(rect(Color::WHITE.darker(0.5)))
-                    .add_strong(rsc);
-                texts(rsc).push(msg_box);
-            })
-            .add(rsc);
-
-        let text_edit_scroll = (
-            msg_area.height(leftover(1)),
-            (
-                Rect::new(Color::WHITE.darker(0.9)),
-                (
-                    add_text.width(leftover(1)),
-                    Rect::new(Color::GREEN)
-                        .on(CursorSense::click(), move |ctx, rsc: &mut ClientRsc| {
-                            rsc.run_event::<Submit>(add_text, (), ctx.state);
-                        })
-                        .sized((40, 40)),
-                )
-                    .span(Dir::RIGHT)
-                    .pad(10),
-            )
-                .stack()
-                .size(StackSize::Child(1))
-                .layer_offset(1)
-                .align(Align::BOT),
-        )
-            .span(Dir::DOWN)
-            .add(rsc);
-
-        let main = Wrapper::new().add(rsc);
-
-        let vals = Rc::new(RefCell::new((0, Vec::new())));
-        let mut switch_button = |color, to: WeakWidget, label| {
-            let to = to.upgrade(rsc);
-            let vec = &mut vals.borrow_mut().1;
-            let i = vec.len();
-            if vec.is_empty() {
-                vec.push(None);
-                main(rsc).set(to);
-            } else {
-                vec.push(Some(to));
-            }
-            let vals = vals.clone();
-            let rect = rect(color)
-                .on(CursorSense::click(), move |ctx, rsc| {
-                    let (prev, vec) = &mut *vals.borrow_mut();
-                    if let Some(h) = vec[i].take() {
-                        vec[*prev] = main(rsc).replace(h);
-                        *prev = i;
-                    }
-                    ctx.widget(rsc).color = color.darker(0.3);
-                })
-                .on(
-                    CursorSense::HoverStart | CursorSense::unclick(),
-                    move |ctx, rsc| {
-                        ctx.widget(rsc).color = color.brighter(0.2);
-                    },
-                )
-                .on(CursorSense::HoverEnd, move |ctx, rsc| {
-                    ctx.widget(rsc).color = color;
-                });
-            (rect, wtext(label).size(30).text_align(Align::CENTER)).stack()
-        };
-
-        let tabs = (
-            switch_button(Color::RED, pad_test, "pad"),
-            switch_button(Color::GREEN, span_test, "span"),
-            switch_button(Color::BLUE, span_add_test, "image span"),
-            switch_button(Color::MAGENTA, text_test, "text layout"),
-            switch_button(
-                Color::YELLOW.mul_rgb(0.5),
-                text_edit_scroll,
-                "text edit scroll",
-            ),
-        )
-            .span(Dir::RIGHT);
-
-        let info = wtext("").add(rsc);
-        let info_sect = info.pad(10).align(Align::RIGHT);
-
-        ((tabs.height(40), main.pad(10)).span(Dir::DOWN), info_sect)
-            .stack()
-            .set_root(rsc, &mut ui_state);
-
-        Self { ui_state, info }
-    }
-
-    fn window_event(
-        &mut self,
-        _: WindowEvent,
-        rsc: &mut DefaultRsc<Self>,
-        render: &mut UiRenderState,
-    ) {
-        let new = format!(
-            "widgets: {}\nactive: {}\ntextures: {}",
-            rsc.widgets().len(),
-            render.active_widgets(),
-            rsc.ui().textures.count(),
-        );
-        if new != *rsc.widgets()[self.info].content {
-            *rsc.widgets_mut()[self.info].content = new;
-        }
-    }
-}

examples/task.rs

@@ -1,30 +0,0 @@
-use iris::prelude::*;
-use std::time::Duration;
-
-fn main() {
-    DefaultApp::<State>::run();
-}
-
-#[derive(DefaultUiState)]
-struct State {
-    ui_state: DefaultUiState,
-}
-
-impl DefaultAppState for State {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        let rect = rect(Color::RED).add(rsc);
-        rect.task_on(CursorSense::click(), async move |mut ctx| {
-            tokio::time::sleep(Duration::from_secs(1)).await;
-            ctx.update(move |_, rsc| {
-                let rect = rect(rsc);
-                if rect.color == Color::RED {
-                    rect.color = Color::BLUE;
-                } else {
-                    rect.color = Color::RED;
-                }
-            });
-        })
-        .set_root(rsc, &mut ui_state);
-        Self { ui_state }
-    }
-}

examples/text.rs

@@ -1,67 +0,0 @@
-//! Text sizing: wrapped text reads the width it is offered, fixed text does
-//! not, and both report a height their container lays out around.
-
-use iris::prelude::*;
-
-fn main() {
-    DefaultApp::<State>::run();
-}
-
-#[derive(DefaultUiState)]
-struct State {
-    ui_state: DefaultUiState,
-}
-
-const SAMPLE: &str = "Wrapping shapes one source into as many lines as its container \
-    leaves room for, so the height of a paragraph is an answer rather than a setting, and \
-    the same words in a narrower box come back taller. Resize the window and watch the \
-    text below reflow into a different number of lines while nothing about it changes.";
-
-impl DefaultAppState for State {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        let panel = || rect(Color::WHITE.darker(0.85));
-
-        let wrapped = wtext(SAMPLE)
-            .size(28)
-            .wrap(true)
-            .text_align(Align::LEFT)
-            .pad(16)
-            .background(panel());
-
-        // Each one takes the whole width, because `text_align` puts the
-        // glyphs somewhere in the box the text is given and a text that
-        // reports the width of its own glyphs is given exactly that.
-        let label = |text: &str, align| wtext(text).size(24).text_align(align).width(rel(1.0));
-        let aligned = (
-            label("left", Align::LEFT),
-            label("centred", Align::H_CENTER),
-            label("right", Align::RIGHT),
-        )
-            .span(Dir::DOWN)
-            .gap(8)
-            .pad(16)
-            .background(panel());
-
-        // The same words in half the width, which is a different number of
-        // lines and so a different height. A declared width only holds along
-        // a span's own axis, hence the row.
-        let narrow = (
-            wtext(SAMPLE)
-                .size(20)
-                .wrap(true)
-                .pad(16)
-                .background(panel())
-                .align(Align::TOP)
-                .width(rel(0.5)),
-            rect(Color::WHITE.darker(0.95)),
-        )
-            .span(Dir::RIGHT);
-
-        (wrapped, aligned, narrow)
-            .span(Dir::DOWN)
-            .gap(12)
-            .pad(12)
-            .set_root(rsc, &mut ui_state);
-        Self { ui_state }
-    }
-}

examples/view.rs

@@ -1,49 +0,0 @@
-use iris::prelude::*;
-
-fn main() {
-    DefaultApp::<State>::run();
-}
-
-#[derive(DefaultUiState)]
-struct State {
-    ui_state: DefaultUiState,
-}
-
-type Rsc = DefaultRsc<State>;
-
-#[derive(Clone, Copy, WidgetView)]
-struct Test {
-    #[root]
-    root: WeakWidget<Rect>,
-    cur: WeakState<bool>,
-}
-
-impl Test {
-    pub fn new(rsc: &mut Rsc) -> Self {
-        let root = rect(Color::RED).add(rsc);
-        let cur = rsc.create_state(root, false);
-        Self { root, cur }
-    }
-    pub fn toggle(&self, rsc: &mut Rsc) {
-        let cur = &mut rsc[self.cur];
-        *cur = !*cur;
-        if *cur {
-            rsc[self.root].color = Color::BLUE;
-        } else {
-            rsc[self.root].color = Color::RED;
-        }
-    }
-}
-
-impl DefaultAppState for State {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        let test = Test::new(rsc);
-
-        test.on(CursorSense::click(), move |_, rsc| {
-            test.toggle(rsc);
-        })
-        .set_root(rsc, &mut ui_state);
-
-        Self { ui_state }
-    }
-}

macro/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "iris-macro"
-version.workspace = true
-edition.workspace = true
-
-[dependencies]
-proc-macro2 = "1.0.103"
-quote = "1.0.42"
-syn = { version = "2.0.111", features = ["full"] }
-
-[lib]
-proc-macro = true

macro/src/lib.rs

@@ -1,196 +0,0 @@
-extern crate proc_macro;
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{
-    Attribute, Block, Error, GenericParam, Generics, Ident, ItemStruct, ItemTrait, Signature,
-    Token, Type, Visibility,
-    parse::{Parse, ParseStream, Result},
-    parse_macro_input, parse_quote,
-    spanned::Spanned,
-};
-
-struct Input {
-    attrs: Vec<Attribute>,
-    vis: Visibility,
-    name: Ident,
-    generics: Generics,
-    fns: Vec<InputFn>,
-}
-
-struct InputFn {
-    sig: Signature,
-    body: Block,
-}
-
-impl Parse for Input {
-    fn parse(input: ParseStream) -> Result<Self> {
-        let attrs = input.call(Attribute::parse_outer)?;
-        let vis = input.parse()?;
-        input.parse::<Token![trait]>()?;
-        let name = input.parse()?;
-        let generics = input.parse::<Generics>()?;
-        input.parse::<Token![;]>()?;
-        let mut fns = Vec::new();
-        while !input.is_empty() {
-            let sig = input.parse()?;
-            let body = input.parse()?;
-            fns.push(InputFn { sig, body })
-        }
-        if !input.is_empty() {
-            input.error("function expected");
-        }
-        Ok(Input {
-            attrs,
-            vis,
-            name,
-            generics,
-            fns,
-        })
-    }
-}
-
-#[proc_macro]
-pub fn widget_trait(input: TokenStream) -> TokenStream {
-    let Input {
-        attrs,
-        vis,
-        name,
-        mut generics,
-        fns,
-    } = parse_macro_input!(input as Input);
-
-    let sigs: Vec<_> = fns.iter().map(|f| f.sig.clone()).collect();
-    let impls: Vec<_> = fns
-        .iter()
-        .map(|InputFn { sig, body }| quote! { #sig #body })
-        .collect();
-
-    let Some(GenericParam::Type(state)) = generics.params.first() else {
-        return Error::new(name.span(), "expected state generic parameter")
-            .into_compile_error()
-            .into();
-    };
-
-    let state = &state.ident;
-
-    generics
-        .params
-        .push(parse_quote!(WL: WidgetLike<#state, Tag>));
-    generics.params.push(parse_quote!(Tag));
-
-    let mut trai: ItemTrait = parse_quote!(
-        #vis trait #name #generics {
-            #(#sigs;)*
-        }
-    );
-
-    trai.attrs = attrs;
-
-    quote! {
-        #trai
-
-        impl #generics #name<Rsc, WL, Tag> for WL {
-            #(#impls)*
-        }
-    }
-    .into()
-}
-
-#[proc_macro_derive(DefaultUiState, attributes(default_ui_state))]
-pub fn derive_default_ui_state(input: TokenStream) -> TokenStream {
-    let mut output = proc_macro2::TokenStream::new();
-
-    let state: ItemStruct = parse_macro_input!(input);
-
-    let mut found_attr = false;
-    let mut state_field = None;
-    for field in &state.fields {
-        if !found_attr
-            && let Type::Path(path) = &field.ty
-            && path.path.is_ident("DefaultUiState")
-        {
-            state_field = Some(field);
-        }
-        let Some(attr) = field
-            .attrs
-            .iter()
-            .find(|a| a.path().is_ident("default_ui_state"))
-        else {
-            continue;
-        };
-        if found_attr {
-            output.extend(
-                Error::new(
-                    attr.span(),
-                    "cannot have more than one default_ui_state attribute",
-                )
-                .into_compile_error(),
-            );
-            continue;
-        }
-        found_attr = true;
-        state_field = Some(field);
-    }
-    let Some(field) = state_field else {
-        output.extend(
-            Error::new(state.ident.span(), "no DefaultUiState field found").into_compile_error(),
-        );
-        return output.into();
-    };
-    let sname = &state.ident;
-    let fname = field.ident.as_ref().unwrap();
-    output.extend(quote! {
-        impl iris::default::HasDefaultUiState for #sname {
-            fn default_state(&self) -> &iris::default::DefaultUiState {
-                &self.#fname
-            }
-            fn default_state_mut(&mut self) -> &mut iris::default::DefaultUiState {
-                &mut self.#fname
-            }
-        }
-    });
-    output.into()
-}
-
-#[proc_macro_derive(WidgetView, attributes(root))]
-pub fn derive_widget_view(input: TokenStream) -> TokenStream {
-    let mut output = proc_macro2::TokenStream::new();
-
-    let state: ItemStruct = parse_macro_input!(input);
-
-    let mut found_attr = false;
-    let mut state_field = None;
-    for field in &state.fields {
-        let Some(attr) = field.attrs.iter().find(|a| a.path().is_ident("root")) else {
-            continue;
-        };
-        if found_attr {
-            output.extend(
-                Error::new(attr.span(), "cannot have more than one root widget")
-                    .into_compile_error(),
-            );
-            continue;
-        }
-        found_attr = true;
-        state_field = Some(field);
-    }
-    let Some(field) = state_field else {
-        output.extend(
-            Error::new(state.ident.span(), "no root widget field found (#[root])")
-                .into_compile_error(),
-        );
-        return output.into();
-    };
-    let sname = &state.ident;
-    let fname = field.ident.as_ref().unwrap();
-    let fty = &field.ty;
-    output.extend(quote! {
-        impl iris::core::WidgetView for #sname {
-            type Widget = <#fty as iris::core::HasWidget>::Widget;
-            fn root(&self) -> #fty {
-                self.#fname
-            }
-        }
-    });
-    output.into()
-}

readme.md

@@ -1,31 +0,0 @@
-# iris
-
-My experimental attempt at a rust ui library (also my first ui library).
-
-It's currently designed around using retained data structures (widgets), rather than diffing generated trees from data like xilem or iced. This is an experiment and I'm not sure if it's a good idea or not.
-
-Examples are in `examples`, eg. `cargo run --example tabs`.
-
-Goals, in general order:
-1. does what I want it to (text, images, video, animations)
-2. very easy to use ignoring ergonomic ref counting
-3. reasonably fast / efficient (a lot faster than electron, save battery life, try to beat iced and xilem)
-
-## dev details
-
-not targeting web rn cause wanna use actual nice gpu features & entire point of this is to make desktop apps / not need a web browser
-
-general ideas trynna use rn / experiment with:
-- retained mode
-- specifically designed around wgpu so there's no translation
-- postfix functions for most things to prevent unreadable indentation (going very well)
-- events can be done directly where you draw the widgets
-- almost no macros in user code & actual LSP typechecking (variadic generics if you can hear me please save us)
-- relative anchor + absolute offset coord system (+ "rest" / leftover during widget layout)
-- single threaded ui & pass context around to make non async usage straightforward (pretty unsure about this)
-- widgets store outside of the actual rendering so they can be moved around and swapped easily (unsure about this but seems to work good for now)
-
-under heavy initial development so not gonna try to explain status, maybe check TODO for that;
-sizable chance it gets a rewrite once I know everything I need and what seems to work best
-
-it's called iris because it's the structure around what you actually want to display and colorful

rig-input/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "rig-input"
-version.workspace = true
-edition.workspace = true
-
-# Replays `.touch` recordings through Wayland's virtual-pointer protocol;
-# headless sway has no input devices for coordinate-driving tools to move.
-[[bin]]
-name = "replay-touch"
-path = "src/main.rs"
-
-[dependencies]
-# Share the harness parser so both ways of replaying read a file the same.
-iris = { path = ".." }
-wayland-client = { workspace = true }
-wayland-protocols-wlr = { workspace = true }

rig-input/src/main.rs

@@ -1,141 +0,0 @@
-use iris::harness::{TouchAction, TouchScript};
-use std::time::Duration;
-use wayland_client::protocol::wl_pointer::ButtonState;
-use wayland_client::protocol::{wl_registry, wl_seat};
-use wayland_client::{Connection, Dispatch, QueueHandle, delegate_noop};
-use wayland_protocols_wlr::virtual_pointer::v1::client::{
-    zwlr_virtual_pointer_manager_v1::ZwlrVirtualPointerManagerV1,
-    zwlr_virtual_pointer_v1::ZwlrVirtualPointerV1,
-};
-
-const BTN_LEFT: u32 = 0x110;
-
-const SETTLE: Duration = Duration::from_millis(200);
-
-#[derive(Default)]
-struct Globals {
-    seat: Option<wl_seat::WlSeat>,
-    manager: Option<ZwlrVirtualPointerManagerV1>,
-}
-
-impl Dispatch<wl_registry::WlRegistry, ()> for Globals {
-    fn event(
-        state: &mut Self,
-        registry: &wl_registry::WlRegistry,
-        event: wl_registry::Event,
-        _: &(),
-        _: &Connection,
-        qh: &QueueHandle<Self>,
-    ) {
-        let wl_registry::Event::Global {
-            name,
-            interface,
-            version,
-        } = event
-        else {
-            return;
-        };
-        match interface.as_str() {
-            "wl_seat" => {
-                state.seat = Some(registry.bind(name, version.min(7), qh, ()));
-            }
-            "zwlr_virtual_pointer_manager_v1" => {
-                state.manager = Some(registry.bind(name, version.min(2), qh, ()));
-            }
-            _ => {}
-        }
-    }
-}
-
-delegate_noop!(Globals: ignore wl_seat::WlSeat);
-delegate_noop!(Globals: ZwlrVirtualPointerManagerV1);
-delegate_noop!(Globals: ZwlrVirtualPointerV1);
-
-fn main() {
-    let args: Vec<String> = std::env::args().skip(1).collect();
-    let [width, height, path] = args.as_slice() else {
-        eprintln!("usage: replay-touch WIDTH HEIGHT FILE");
-        std::process::exit(2);
-    };
-    let (width, height) = (parse(width, "WIDTH"), parse(height, "HEIGHT"));
-    let text = std::fs::read_to_string(path)
-        .unwrap_or_else(|e| fail(&format!("could not read {path}: {e}")));
-    let script = TouchScript::parse(&text).unwrap_or_else(|e| fail(&e));
-
-    let conn = Connection::connect_to_env().unwrap_or_else(|e| {
-        fail(&format!(
-            "no wayland display ({e}); is WAYLAND_DISPLAY set?"
-        ))
-    });
-    let mut queue = conn.new_event_queue();
-    let qh = queue.handle();
-    let display = conn.display();
-    display.get_registry(&qh, ());
-    let mut globals = Globals::default();
-    queue
-        .roundtrip(&mut globals)
-        .unwrap_or_else(|e| fail(&format!("wayland roundtrip failed: {e}")));
-
-    let manager = globals.manager.as_ref().unwrap_or_else(|| {
-        fail(
-            "this compositor does not offer zwlr_virtual_pointer_manager_v1, so a pointer cannot \
-             be synthesised; sway and every wlroots compositor do",
-        )
-    });
-    let pointer = manager.create_virtual_pointer(globals.seat.as_ref(), &qh, ());
-
-    // Put the pointer where the gesture starts and let the compositor
-    // settle before anything is pressed. Without this the press is
-    // dropped: sway has just learned about this pointer, and a button
-    // sent in the same breath as the motion that first puts it over a
-    // window arrives before there is a focused surface to send it to --
-    // winit sees `CursorEntered`, the moves and the *release*, never the
-    // press, so the gesture reads as a hover and nothing scrolls. Found
-    // by printing winit's own events; the settle is what fixed it.
-    if let Some(first) = script.samples.first() {
-        pointer.motion_absolute(0, first.pos.x as u32, first.pos.y as u32, width, height);
-        pointer.frame();
-        conn.flush()
-            .unwrap_or_else(|e| fail(&format!("flush: {e}")));
-        std::thread::sleep(SETTLE);
-    }
-
-    let mut previous = 0;
-    for sample in &script.samples {
-        std::thread::sleep(Duration::from_millis(sample.t_ms - previous));
-        previous = sample.t_ms;
-        let t = sample.t_ms as u32;
-        pointer.motion_absolute(t, sample.pos.x as u32, sample.pos.y as u32, width, height);
-        pointer.frame();
-        // The button goes in a frame of its own, *after* the motion has
-        // been committed. Sent in the same frame as the motion that
-        // first puts the pointer over the window, sway drops it: the
-        // client sees `CursorEntered` and the moves but never a
-        // `MouseInput { state: Pressed }`, so the whole gesture reads as
-        // a hover and nothing scrolls. Found exactly that way, by
-        // printing winit's events.
-        let state = match sample.action {
-            TouchAction::Down => Some(ButtonState::Pressed),
-            TouchAction::Up => Some(ButtonState::Released),
-            TouchAction::Move => None,
-        };
-        if let Some(state) = state {
-            pointer.button(t, BTN_LEFT, state);
-            pointer.frame();
-        }
-        conn.flush()
-            .unwrap_or_else(|e| fail(&format!("flush: {e}")));
-    }
-    pointer.destroy();
-    conn.flush().ok();
-}
-
-fn parse(text: &str, what: &str) -> u32 {
-    text.parse()
-        .unwrap_or_else(|_| fail(&format!("{what} is not a whole number: {text:?}")))
-}
-
-fn fail(message: &str) -> ! {
-    eprintln!("replay-touch: {message}");
-    std::process::exit(1);
-}

rust-toolchain.toml

@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly"
-components = ["clippy", "rustfmt"]

scripts/headless.conf

@@ -1,14 +0,0 @@
-# The compositor `scripts/run-headless.sh` starts, so that an example has a
-# surface where there is no display. Nothing here is meant to be looked at
-# directly; `grim` is.
-#
-# No Xwayland: winit talks Wayland natively, so an X server is a second thing
-# to go wrong for no gain.
-xwayland disable
-
-# The default output, overridden per run by `--mode`. Larger than the window
-# an example opens, so nothing is scaled or clipped.
-output HEADLESS-1 mode 1920x1200@60Hz
-
-default_border none
-focus_follows_mouse no

scripts/run-headless.sh

@@ -1,182 +0,0 @@
-#!/bin/sh
-# Run an iris example on a machine with no display.
-#
-#   ./scripts/run-headless.sh tabs
-#   ./scripts/run-headless.sh tabs --shot /tmp/tabs.png --seconds 4
-#   ./scripts/run-headless.sh tabs --replay taps.touch --shot /tmp/tabs.png
-#   ./scripts/run-headless.sh app --dir ../elsewhere --mode 1080x2424@120Hz
-#
-# `--dir DIR` names the workspace to build in, defaulting to this one, so a
-# project that depends on iris can be run through the same rig. `--bin` runs a
-# crate binary rather than an example, and takes its own argv from
-# `$RUN_HEADLESS_ARGS`, word-split on purpose.
-#
-# `--mode` sets the output, for running something at a size other than a
-# desktop's -- a phone's, say. Set every run rather than only when it changes:
-# the compositor is reused between runs, so a default-shaped run after a
-# custom one would otherwise inherit the other's output and quietly screenshot
-# the wrong size.
-#
-# `--resize WxH@Hz` changes the output under the app once it is up, then
-# screenshots. A resize is its own case: what it has to match is a cold start
-# at that size, byte for byte, and nothing in `cargo test` can see it.
-#
-# `--replay FILE` drives a `.touch` recording into the window through
-# `replay-touch`, which reads it with the same parser `iris::harness` uses. A
-# recording is `<ms> down|move|up <x> <y>` in the output's own pixels. With
-# `--shot` it also writes `<shot>-before.png` from just before the gesture,
-# since "it moved" is a claim about two pictures.
-#
-# What it supplies is a compositor for winit to open a surface on: a headless
-# sway, and `grim` to screenshot it. Sway gets its own socket and runtime
-# directory rather than joining whatever else is running, because it tiles --
-# adding a window to someone else's compositor resizes theirs.
-set -eu
-
-need() {
-    command -v "$1" >/dev/null 2>&1 || {
-        echo "run-headless: $1 is not installed ($2)" >&2
-        exit 127
-    }
-}
-need sway "the compositor an example opens its window on"
-need swaymsg "sway's control socket"
-
-scripts=$(cd "$(dirname "$0")" && pwd)
-root=$(cd "$scripts/.." && pwd)
-workdir="$root"
-cd "$root"
-run="${XDG_RUNTIME_DIR:-/tmp}/iris-headless"
-seconds=3
-shot=""
-replay=""
-resize=""
-example=""
-kind=example
-mode=1920x1200@60Hz
-
-
-while [ $# -gt 0 ]; do
-    case "$1" in
-        --shot) shot=$2; shift 2 ;;
-        --seconds) seconds=$2; shift 2 ;;
-        --bin) kind=bin; shift ;;
-        --mode) mode=$2; shift 2 ;;
-        --resize) resize=$2; shift 2 ;;
-        --replay) replay=$2; shift 2 ;;
-        --dir) workdir=$(cd "$2" && pwd); shift 2 ;;
-        --) shift; break ;;
-        *) example=$1; shift ;;
-    esac
-done
-[ -n "$example" ] || { echo "usage: $0 NAME [--bin] [--dir DIR] [--mode WxH@Hz] [--resize WxH@Hz] [--replay TOUCH] [--shot PNG] [--seconds N] [-- cargo args]" >&2; exit 2; }
-[ -z "$replay" ] || [ -f "$replay" ] || { echo "run-headless: no touch script at $replay" >&2; exit 2; }
-[ -z "$shot" ] || need grim "the screenshot --shot writes"
-
-mkdir -p "$run"
-export SWAYSOCK="$run/sway.sock"
-
-# Named rather than left to sway's pid-based default, so a second run reuses
-# this compositor instead of starting another beside it.
-if ! swaymsg -t get_version >/dev/null 2>&1; then
-    rm -f "$SWAYSOCK"
-    WLR_BACKENDS=headless WLR_LIBINPUT_NO_DEVICES=1 LIBSEAT_BACKEND=noop \
-        setsid sway -c "$scripts/headless.conf" >"$run/sway.log" 2>&1 &
-    i=0
-    while [ $i -lt 20 ]; do
-        swaymsg -t get_version >/dev/null 2>&1 && break
-        i=$((i + 1)); sleep 0.5
-    done
-    swaymsg -t get_version >/dev/null 2>&1 || {
-        echo "run-headless: compositor did not start; see $run/sway.log" >&2
-        exit 1
-    }
-fi
-
-rm -f "$run/display"
-swaymsg exec -- "sh -c 'printf %s \"\$WAYLAND_DISPLAY\" > $run/display'" >/dev/null
-i=0
-while [ $i -lt 20 ]; do
-    [ -s "$run/display" ] && break
-    i=$((i + 1)); sleep 0.5
-done
-[ -s "$run/display" ] || { echo "run-headless: could not read WAYLAND_DISPLAY" >&2; exit 1; }
-WAYLAND_DISPLAY=$(cat "$run/display")
-export WAYLAND_DISPLAY
-
-echo "run-headless: $WAYLAND_DISPLAY (sway $(swaymsg -t get_version --raw | sed -n 's/.*"human_readable":"\([^"]*\)".*/\1/p'))" >&2
-
-swaymsg output HEADLESS-1 mode "$mode" >/dev/null
-# The extent `replay-touch` positions against, so a script's coordinates
-# are the output's own pixels.
-out_w=${mode%x*}
-out_h=${mode#*x}; out_h=${out_h%@*}
-
-# Built before the app starts, so a compile error is not reported as a
-# window that failed to move.
-[ -z "$replay" ] || (cd "$root" && cargo build --bin replay-touch -p rig-input) >&2
-
-cd "$workdir"
-if [ "$kind" = bin ]; then
-    cargo build --bin "$example" "$@" >&2
-    bin="$workdir/target/debug/$example"
-else
-    cargo build --example "$example" "$@" >&2
-    bin="$workdir/target/debug/examples/$example"
-fi
-
-# Deliberately word-split: this is the binary's own argv, not a single path.
-# shellcheck disable=SC2086
-"$bin" ${RUN_HEADLESS_ARGS:-} >"$run/$example.log" 2>&1 &
-pid=$!
-trap 'kill "$pid" 2>/dev/null || true' EXIT INT TERM
-
-# Wait for the window to be mapped rather than for a number of seconds. A
-# fixed sleep took an all-black screenshot the first time this ran, when sway
-# had started in the same invocation and had not composited its output yet --
-# which is indistinguishable from an app that draws nothing.
-i=0
-while [ $i -lt 40 ]; do
-    kill -0 "$pid" 2>/dev/null || break
-    swaymsg -t get_tree --raw 2>/dev/null | grep -q "\"pid\":$pid," && break
-    i=$((i + 1)); sleep 0.25
-done
-
-i=0
-while [ $i -lt "$((seconds * 2))" ]; do
-    kill -0 "$pid" 2>/dev/null || break
-    i=$((i + 1)); sleep 0.5
-done
-
-if [ -n "$resize" ] && kill -0 "$pid" 2>/dev/null; then
-    swaymsg output HEADLESS-1 mode "$resize" >/dev/null
-    echo "run-headless: resized to $resize" >&2
-    sleep 2
-fi
-
-if [ -n "$replay" ] && kill -0 "$pid" 2>/dev/null; then
-    if [ -n "$shot" ]; then
-        grim "${shot%.png}-before.png"
-        echo "run-headless: wrote ${shot%.png}-before.png (before the gesture)" >&2
-    fi
-    "$root/target/debug/replay-touch" "$out_w" "$out_h" "$replay"
-    # A fling outlives the finger: the gesture's own last sample is not
-    # when the list stops. Long enough for Android's spline to settle
-    # (`FlingCalculator::duration` tops out around a second and a half).
-    sleep 2
-fi
-
-if kill -0 "$pid" 2>/dev/null; then
-    [ -n "$shot" ] && grim "$shot" && echo "run-headless: wrote $shot" >&2
-    kill "$pid" 2>/dev/null || true
-    wait "$pid" 2>/dev/null || true
-    status=0
-else
-    wait "$pid" 2>/dev/null || status=$?
-    echo "run-headless: $example exited early (status ${status:-0})" >&2
-    status=${status:-1}
-fi
-
-echo "--- $example output ---" >&2
-cat "$run/$example.log" >&2
-exit "$status"

src/base/mod.rs

@@ -0,0 +1,167 @@
+use std::ops::Range;
+
+use crate::{
+    primitive::{Axis, Painter, RoundedRectData, UIRegion},
+    ToId, UIColor, Widget, WidgetArrLike, WidgetFn, WidgetId, WidgetIdLikeTuple, WidgetLike,
+    WidgetLikeTuple,
+};
+
+#[derive(Clone, Copy)]
+pub struct RoundedRect {
+    pub color: UIColor,
+    pub radius: f32,
+    pub thickness: f32,
+    pub inner_radius: f32,
+}
+
+impl RoundedRect {
+    pub fn color(mut self, color: UIColor) -> Self {
+        self.color = color;
+        self
+    }
+}
+
+impl Widget for RoundedRect {
+    fn draw(&self, painter: &mut Painter) {
+        painter.write(RoundedRectData {
+            color: self.color,
+            radius: self.radius,
+            thickness: self.thickness,
+            inner_radius: self.inner_radius,
+        });
+    }
+}
+
+pub struct Span {
+    pub elements: Vec<(Range<f32>, WidgetId)>,
+    pub axis: Axis,
+}
+
+impl Widget for Span {
+    fn draw(&self, painter: &mut Painter) {
+        for (span, child) in &self.elements {
+            let mut sub_region = UIRegion::full();
+            let view = sub_region.axis_mut(self.axis);
+            *view.top_left.anchor = span.start;
+            *view.bot_right.anchor = span.end;
+            painter.draw_within(child, sub_region);
+        }
+    }
+}
+
+impl Span {
+    pub fn proportioned<const LEN: usize>(
+        axis: Axis,
+        ratios: [impl UINum; LEN],
+        elements: [WidgetId; LEN],
+    ) -> Self {
+        let ratios = ratios.map(|r| r.to_f32());
+        let total: f32 = ratios.iter().sum();
+        let mut start = 0.0;
+        Self {
+            elements: elements
+                .into_iter()
+                .zip(ratios)
+                .map(|(e, r)| {
+                    let end = start + r / total;
+                    let res = (start..end, e);
+                    start = end;
+                    res
+                })
+                .collect(),
+            axis,
+        }
+    }
+}
+
+pub struct Regioned {
+    region: UIRegion,
+    inner: WidgetId,
+}
+
+impl Widget for Regioned {
+    fn draw(&self, painter: &mut Painter) {
+        painter.region.select(&self.region);
+        painter.draw(&self.inner);
+    }
+}
+
+pub struct Padding {
+    left: f32,
+    right: f32,
+    top: f32,
+    bottom: f32,
+}
+
+impl Padding {
+    pub fn uniform(amt: f32) -> Self {
+        Self {
+            left: amt,
+            right: amt,
+            top: amt,
+            bottom: amt,
+        }
+    }
+    pub fn region(&self) -> UIRegion {
+        let mut region = UIRegion::full();
+        region.top_left.offset.x += self.left;
+        region.top_left.offset.y += self.top;
+        region.bot_right.offset.x -= self.right;
+        region.bot_right.offset.y -= self.bottom;
+        region
+    }
+}
+
+impl<T: UINum> From<T> for Padding {
+    fn from(amt: T) -> Self {
+        Self::uniform(amt.to_f32())
+    }
+}
+
+pub trait WidgetUtil {
+    fn pad(self, padding: impl Into<Padding>) -> impl WidgetLike<Widget = Regioned>;
+}
+
+impl<W: WidgetLike> WidgetUtil for W {
+    fn pad(self, padding: impl Into<Padding>) -> impl WidgetLike<Widget = Regioned> {
+        WidgetFn(|ui| Regioned {
+            region: padding.into().region(),
+            inner: self.add(ui).erase_type(),
+        })
+    }
+}
+
+pub trait WidgetArrUtil<const LEN: usize> {
+    fn span(self, axis: Axis, ratios: [impl UINum; LEN]) -> impl WidgetLike<Widget = Span>;
+}
+
+impl<const LEN: usize, Wa: WidgetArrLike<LEN>> WidgetArrUtil<LEN> for Wa
+where
+    <Wa::Ws as WidgetLikeTuple<LEN>>::Wrap<ToId>: WidgetIdLikeTuple<LEN>,
+{
+    fn span(self, axis: Axis, ratios: [impl UINum; LEN]) -> impl WidgetLike<Widget = Span> {
+        WidgetFn(move |ui| Span::proportioned(axis, ratios, self.ui(ui).erase_types()))
+    }
+}
+
+pub trait UINum {
+    fn to_f32(self) -> f32;
+}
+
+impl UINum for f32 {
+    fn to_f32(self) -> f32 {
+        self
+    }
+}
+
+impl UINum for u32 {
+    fn to_f32(self) -> f32 {
+        self as f32
+    }
+}
+
+impl UINum for i32 {
+    fn to_f32(self) -> f32 {
+        self as f32
+    }
+}

src/default/app.rs

@@ -1,60 +0,0 @@
-use winit::{
-    application::ApplicationHandler,
-    event::WindowEvent,
-    event_loop::{ActiveEventLoop, EventLoop, EventLoopProxy},
-    window::WindowId,
-};
-
-pub trait AppState {
-    type Event: 'static;
-    fn new(event_loop: &ActiveEventLoop, proxy: EventLoopProxy<Self::Event>) -> Self;
-    fn window_event(&mut self, event: WindowEvent, event_loop: &ActiveEventLoop);
-    fn event(&mut self, event: Self::Event, event_loop: &ActiveEventLoop);
-    fn exit(&mut self);
-
-    fn run()
-    where
-        Self: Sized,
-    {
-        App::<Self>::run();
-    }
-}
-
-pub struct App<State: AppState> {
-    state: Option<State>,
-    proxy: EventLoopProxy<State::Event>,
-}
-
-impl<State: AppState> App<State> {
-    pub fn run() {
-        let event_loop = EventLoop::with_user_event().build().unwrap();
-        let proxy = event_loop.create_proxy();
-        event_loop
-            .run_app(&mut App::<State> { state: None, proxy })
-            .unwrap();
-    }
-}
-
-impl<State: AppState> ApplicationHandler<State::Event> for App<State> {
-    fn resumed(&mut self, event_loop: &ActiveEventLoop) {
-        if self.state.is_none() {
-            let state = State::new(event_loop, self.proxy.clone());
-            self.state = Some(state);
-        }
-    }
-
-    fn window_event(&mut self, event_loop: &ActiveEventLoop, _id: WindowId, event: WindowEvent) {
-        let state = self.state.as_mut().unwrap();
-        state.window_event(event, event_loop);
-    }
-
-    fn user_event(&mut self, event_loop: &ActiveEventLoop, event: State::Event) {
-        let state = self.state.as_mut().unwrap();
-        state.event(event, event_loop);
-    }
-
-    fn exiting(&mut self, _: &ActiveEventLoop) {
-        let state = self.state.as_mut().unwrap();
-        state.exit();
-    }
-}

src/default/attr.rs

@@ -1,80 +0,0 @@
-use crate::prelude::*;
-use std::time::{Duration, Instant};
-use winit::dpi::{LogicalPosition, LogicalSize};
-
-pub struct Selector;
-
-impl<Rsc: HasEvents, W: Widget + 'static> WidgetAttr<Rsc, W> for Selector
-where
-    Rsc::State: HasDefaultUiState,
-{
-    type Input = WeakWidget<TextEdit>;
-
-    fn run(rsc: &mut Rsc, container: WeakWidget<W>, id: Self::Input) {
-        rsc.register_event(container, CursorSense::click_or_drag(), move |ctx, rsc| {
-            let region = ctx.data.render.window_region(&id).unwrap();
-            let id_pos = region.top_left;
-            let container_pos = ctx.data.render.window_region(&container).unwrap().top_left;
-            // The pointer arrives from the platform in floats; everything
-            // it is compared against is on the grid.
-            let pos = (PxVec2::from_f32(ctx.data.pos) + container_pos - id_pos).to_f32();
-            let size = region.size().to_f32();
-            select(
-                rsc,
-                ctx.data.render,
-                ctx.state,
-                id,
-                pos,
-                size,
-                ctx.data.sense.is_dragging(),
-            );
-        });
-    }
-}
-
-pub struct Selectable;
-
-impl<Rsc: HasEvents> WidgetAttr<Rsc, TextEdit> for Selectable
-where
-    Rsc::State: HasDefaultUiState,
-{
-    type Input = ();
-
-    fn run(rsc: &mut Rsc, id: WeakWidget<TextEdit>, _: Self::Input) {
-        rsc.register_event(id, CursorSense::click_or_drag(), move |ctx, rsc| {
-            select(
-                rsc,
-                ctx.data.render,
-                ctx.state,
-                id,
-                ctx.data.pos,
-                ctx.data.size,
-                ctx.data.sense.is_dragging(),
-            );
-        });
-    }
-}
-
-fn select(
-    rsc: &mut impl UiRsc,
-    render: &UiRenderState,
-    state: &mut impl HasDefaultUiState,
-    id: WeakWidget<TextEdit>,
-    pos: Vec2,
-    size: Vec2,
-    dragging: bool,
-) {
-    let state = state.default_state_mut();
-    let now = Instant::now();
-    let recent = (now - state.last_click) < Duration::from_millis(300);
-    state.last_click = now;
-    id.edit(rsc).select(pos, size, dragging, recent);
-    if let Some(region) = render.window_region(&id) {
-        state.window.set_ime_allowed(true);
-        state.window.set_ime_cursor_area(
-            LogicalPosition::<f32>::from(region.top_left.to_f32().tuple()),
-            LogicalSize::<f32>::from(region.size().to_f32().tuple()),
-        );
-    }
-    state.focus = Some(id);
-}

src/default/event.rs

@@ -1,9 +0,0 @@
-use iris_core::Event;
-
-#[derive(Eq, PartialEq, Hash, Clone)]
-pub struct Submit;
-impl Event for Submit {}
-
-#[derive(Eq, PartialEq, Hash, Clone)]
-pub struct Edited;
-impl Event for Edited {}

src/default/input.rs

@@ -1,78 +0,0 @@
-use crate::prelude::*;
-use winit::{
-    event::{MouseButton, MouseScrollDelta, WindowEvent},
-    keyboard::{Key, NamedKey},
-};
-
-#[derive(Default)]
-pub struct Input {
-    cursor: CursorState,
-    pub modifiers: Modifiers,
-}
-
-impl Input {
-    pub fn event(&mut self, event: &WindowEvent) -> bool {
-        match event {
-            WindowEvent::CursorMoved { position, .. } => {
-                self.cursor.pos = Vec2::new(position.x as f32, position.y as f32);
-                self.cursor.exists = true;
-            }
-            WindowEvent::MouseInput { state, button, .. } => {
-                let buttons = &mut self.cursor.buttons;
-                let pressed = state.is_pressed();
-                match button {
-                    MouseButton::Left => buttons.left.update(pressed),
-                    MouseButton::Right => buttons.right.update(pressed),
-                    MouseButton::Middle => buttons.middle.update(pressed),
-                    _ => (),
-                }
-            }
-            WindowEvent::MouseWheel { delta, .. } => {
-                let mut delta = match *delta {
-                    MouseScrollDelta::LineDelta(x, y) => Vec2::new(x, y),
-                    MouseScrollDelta::PixelDelta(pos) => Vec2::new(pos.x as f32, pos.y as f32),
-                };
-                if delta.x == 0.0 && self.modifiers.shift {
-                    delta.x = delta.y;
-                    delta.y = 0.0;
-                }
-                self.cursor.scroll_delta = delta;
-            }
-            WindowEvent::CursorLeft { .. } => {
-                self.cursor.exists = false;
-                self.modifiers.clear();
-            }
-            WindowEvent::KeyboardInput { event, .. } => {
-                if let Key::Named(named) = event.logical_key {
-                    let pressed = event.state.is_pressed();
-                    match named {
-                        NamedKey::Control => {
-                            self.modifiers.control = pressed;
-                        }
-                        NamedKey::Shift => {
-                            self.modifiers.shift = pressed;
-                        }
-                        _ => (),
-                    }
-                }
-            }
-            _ => return false,
-        }
-        true
-    }
-
-    pub fn end_frame(&mut self) {
-        self.cursor.end_frame();
-    }
-}
-
-impl DefaultUiState {
-    pub fn window_size(&self) -> Vec2 {
-        let size = self.renderer.window().inner_size();
-        (size.width, size.height).into()
-    }
-
-    pub fn cursor_state(&self) -> &CursorState {
-        &self.input.cursor
-    }
-}

src/default/mod.rs

@@ -1,367 +0,0 @@
-use crate::prelude::*;
-use arboard::Clipboard;
-use std::{marker::PhantomData, sync::Arc, time::Instant};
-use winit::{
-    event::{Ime, WindowEvent},
-    event_loop::{ActiveEventLoop, EventLoopProxy},
-    window::{Window, WindowAttributes},
-};
-
-mod app;
-mod attr;
-mod event;
-mod input;
-mod render;
-mod sense;
-mod state;
-mod task;
-
-pub use app::*;
-pub use attr::*;
-pub use event::*;
-pub use input::*;
-pub use render::*;
-pub use sense::*;
-pub use state::*;
-pub use task::*;
-
-/// Sends an application's own events to its event loop. It wraps the proxy
-/// rather than being one because task updates travel the same way: what an
-/// application sends is its `Event`, not the loop's whole message type.
-pub struct Proxy<State: DefaultAppState>(EventLoopProxy<DefaultEvent<State>>);
-
-impl<State: DefaultAppState> Clone for Proxy<State> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-impl<State: DefaultAppState> Proxy<State> {
-    pub fn send_event(&self, event: State::Event) {
-        let _ = self.0.send_event(DefaultEvent::User(event));
-    }
-}
-
-/// What the event loop carries: the application's own events, and the
-/// updates tasks send back to the ui thread.
-pub enum DefaultEvent<State: DefaultAppState> {
-    User(State::Event),
-    Update(Box<dyn TaskUpdate<DefaultRsc<State>>>),
-}
-
-impl<State: DefaultAppState> TaskQueue<DefaultRsc<State>> for Proxy<State> {
-    fn send(&self, update: Box<dyn TaskUpdate<DefaultRsc<State>>>) {
-        let _ = self.0.send_event(DefaultEvent::Update(update));
-    }
-}
-
-pub struct DefaultUiState {
-    pub root: Option<StrongWidget>,
-    pub renderer: UiRenderer,
-    pub input: Input,
-    pub focus: Option<WeakWidget<TextEdit>>,
-    pub clipboard: Clipboard,
-    pub window: Arc<Window>,
-    pub ime: usize,
-    pub last_click: Instant,
-}
-
-impl HasRoot for DefaultUiState {
-    fn set_root(&mut self, root: StrongWidget) {
-        self.root = Some(root);
-    }
-}
-
-impl DefaultUiState {
-    pub fn new(window: impl Into<Arc<Window>>) -> Self {
-        let window = window.into();
-        Self {
-            root: None,
-            renderer: UiRenderer::new(window.clone()),
-            window,
-            input: Input::default(),
-            clipboard: Clipboard::new().unwrap(),
-            ime: 0,
-            last_click: Instant::now(),
-            focus: None,
-        }
-    }
-}
-
-pub trait HasDefaultUiState: Sized + 'static {
-    fn default_state(&self) -> &DefaultUiState;
-    fn default_state_mut(&mut self) -> &mut DefaultUiState;
-}
-
-pub trait DefaultAppState: HasDefaultUiState {
-    type Event: Send = ();
-    fn new(ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, proxy: Proxy<Self>) -> Self;
-    #[allow(unused_variables)]
-    fn event(
-        &mut self,
-        event: Self::Event,
-        rsc: &mut DefaultRsc<Self>,
-        render: &mut UiRenderState,
-    ) {
-    }
-    #[allow(unused_variables)]
-    fn exit(&mut self, rsc: &mut DefaultRsc<Self>, render: &mut UiRenderState) {}
-    #[allow(unused_variables)]
-    fn window_event(
-        &mut self,
-        event: WindowEvent,
-        rsc: &mut DefaultRsc<Self>,
-        render: &mut UiRenderState,
-    ) {
-    }
-    fn window_attributes() -> WindowAttributes {
-        Default::default()
-    }
-}
-
-pub struct DefaultRsc<State: 'static> {
-    pub ui: UiData,
-    pub events: EventManager<Self>,
-    pub tasks: Tasks<Self>,
-    pub state: WidgetState,
-    _state: PhantomData<State>,
-}
-
-impl<State> DefaultRsc<State> {
-    pub fn init(queue: Arc<dyn TaskQueue<Self>>) -> Self {
-        Self {
-            ui: Default::default(),
-            events: Default::default(),
-            tasks: Tasks::init(queue),
-            state: Default::default(),
-            _state: Default::default(),
-        }
-    }
-
-    pub fn create_state<T: 'static>(&mut self, id: impl IdLike, data: T) -> WeakState<T> {
-        self.state.add(id.id(), data)
-    }
-}
-
-impl<State> UiRsc for DefaultRsc<State> {
-    fn ui(&self) -> &UiData {
-        &self.ui
-    }
-
-    fn ui_mut(&mut self) -> &mut UiData {
-        &mut self.ui
-    }
-
-    fn on_draw(&mut self, active: &ActiveData) {
-        self.events.draw(active);
-    }
-
-    fn on_undraw(&mut self, active: &ActiveData) {
-        self.events.undraw(active);
-    }
-
-    fn on_remove(&mut self, id: WidgetId) {
-        self.events.remove(id);
-        self.state.remove(id);
-    }
-}
-
-impl<State: 'static> HasState for DefaultRsc<State> {
-    type State = State;
-}
-
-impl<State: 'static> HasEvents for DefaultRsc<State> {
-    fn events(&self) -> &EventManager<Self> {
-        &self.events
-    }
-
-    fn events_mut(&mut self) -> &mut EventManager<Self> {
-        &mut self.events
-    }
-}
-
-impl<State: 'static> HasTasks for DefaultRsc<State> {
-    fn tasks_mut(&mut self) -> &mut Tasks<Self> {
-        &mut self.tasks
-    }
-}
-
-impl<State: 'static> HasWidgetState for DefaultRsc<State> {
-    fn widget_state(&self) -> &WidgetState {
-        &self.state
-    }
-
-    fn widget_state_mut(&mut self) -> &mut WidgetState {
-        &mut self.state
-    }
-}
-
-pub struct DefaultApp<State: DefaultAppState> {
-    rsc: DefaultRsc<State>,
-    render: UiRenderState,
-    state: State,
-}
-
-impl<State: DefaultAppState> AppState for DefaultApp<State> {
-    type Event = DefaultEvent<State>;
-
-    fn new(event_loop: &ActiveEventLoop, proxy: EventLoopProxy<Self::Event>) -> Self {
-        let window = event_loop
-            .create_window(State::window_attributes())
-            .unwrap();
-        let default_state = DefaultUiState::new(window);
-        let mut rsc = DefaultRsc::init(Arc::new(Proxy(proxy.clone())));
-        let state = State::new(default_state, &mut rsc, Proxy(proxy));
-        let render = UiRenderState::new();
-        Self { rsc, state, render }
-    }
-
-    fn event(&mut self, event: Self::Event, _: &ActiveEventLoop) {
-        match event {
-            DefaultEvent::User(event) => self.state.event(event, &mut self.rsc, &mut self.render),
-            DefaultEvent::Update(update) => update(&mut self.state, &mut self.rsc),
-        }
-        self.request_redraw_if_needed();
-    }
-
-    fn window_event(&mut self, event: WindowEvent, event_loop: &ActiveEventLoop) {
-        let Self { rsc, render, state } = self;
-
-        let ui_state = state.default_state_mut();
-        let input_changed = ui_state.input.event(&event);
-        let cursor_state = ui_state.cursor_state().clone();
-        let old = ui_state.focus;
-        if cursor_state.buttons.left.is_start() {
-            ui_state.focus = None;
-        }
-        if input_changed {
-            render.run_sensors(rsc, state, cursor_state);
-        }
-        let ui_state = state.default_state_mut();
-        if old != ui_state.focus
-            && let Some(old) = old
-        {
-            old.edit(rsc).deselect();
-        }
-        match &event {
-            WindowEvent::CloseRequested => event_loop.exit(),
-            WindowEvent::RedrawRequested => {
-                render.update(&ui_state.root, rsc);
-                ui_state.renderer.update(&mut rsc.ui, render);
-                ui_state.renderer.draw();
-            }
-            WindowEvent::Resized(size) => {
-                render.resize((size.width, size.height), rsc.widgets_mut());
-                ui_state.renderer.resize(size)
-            }
-            WindowEvent::KeyboardInput { event, .. } => {
-                if let Some(sel) = ui_state.focus
-                    && event.state.is_pressed()
-                {
-                    let mut text = sel.edit(rsc);
-                    match text.apply_event(event, &ui_state.input.modifiers) {
-                        TextInputResult::Unfocus => {
-                            ui_state.focus = None;
-                            ui_state.window.set_ime_allowed(false);
-                        }
-                        TextInputResult::Submit => {
-                            rsc.run_event::<Submit>(sel, (), state);
-                        }
-                        TextInputResult::Paste => {
-                            if let Ok(t) = ui_state.clipboard.get_text() {
-                                text.insert(&t);
-                            }
-                            rsc.run_event::<Edited>(sel, (), state);
-                        }
-                        TextInputResult::Copy(text) => {
-                            if let Err(err) = ui_state.clipboard.set_text(text) {
-                                eprintln!("failed to copy text to clipboard: {err}")
-                            }
-                        }
-                        TextInputResult::Used => {
-                            rsc.run_event::<Edited>(sel, (), state);
-                        }
-                        TextInputResult::Unused => {}
-                    }
-                }
-            }
-            WindowEvent::Ime(ime) => {
-                if let Some(sel) = ui_state.focus {
-                    let mut text = sel.edit(rsc);
-                    match ime {
-                        Ime::Enabled | Ime::Disabled => (),
-                        Ime::Preedit(content, _pos) => {
-                            // TODO: highlight once that's real
-                            text.replace(ui_state.ime, content);
-                            ui_state.ime = content.chars().count();
-                        }
-                        Ime::Commit(content) => {
-                            text.insert(content);
-                        }
-                    }
-                }
-            }
-            _ => (),
-        }
-        state.window_event(event, rsc, render);
-        self.request_redraw_if_needed();
-        self.state.default_state_mut().input.end_frame();
-    }
-
-    fn exit(&mut self) {
-        self.state.exit(&mut self.rsc, &mut self.render);
-    }
-}
-
-impl<State: DefaultAppState> DefaultApp<State> {
-    fn request_redraw_if_needed(&mut self) {
-        let ui_state = self.state.default_state_mut();
-        if self.render.needs_redraw(&ui_state.root, self.rsc.widgets()) {
-            ui_state.renderer.window().request_redraw();
-        }
-    }
-}
-
-pub trait RscIdx<Rsc> {
-    type Output;
-    fn get(self, rsc: &Rsc) -> &Self::Output;
-    fn get_mut(self, rsc: &mut Rsc) -> &mut Self::Output;
-}
-
-impl<State: 'static, I: RscIdx<DefaultRsc<State>>> std::ops::Index<I> for DefaultRsc<State> {
-    type Output = I::Output;
-
-    fn index(&self, index: I) -> &Self::Output {
-        index.get(self)
-    }
-}
-
-impl<State: 'static, I: RscIdx<DefaultRsc<State>>> std::ops::IndexMut<I> for DefaultRsc<State> {
-    fn index_mut(&mut self, index: I) -> &mut Self::Output {
-        index.get_mut(self)
-    }
-}
-
-impl<W: Widget, Rsc: UiRsc> RscIdx<Rsc> for WeakWidget<W> {
-    type Output = W;
-
-    fn get(self, rsc: &Rsc) -> &Self::Output {
-        &rsc.ui().widgets[self]
-    }
-
-    fn get_mut(self, rsc: &mut Rsc) -> &mut Self::Output {
-        &mut rsc.ui_mut().widgets[self]
-    }
-}
-
-impl<T: 'static, Rsc: HasWidgetState> RscIdx<Rsc> for WeakState<T> {
-    type Output = T;
-
-    fn get(self, rsc: &Rsc) -> &Self::Output {
-        rsc.widget_state().get(self)
-    }
-
-    fn get_mut(self, rsc: &mut Rsc) -> &mut Self::Output {
-        rsc.widget_state_mut().get_mut(self)
-    }
-}

src/default/render.rs

@@ -1,152 +0,0 @@
-use iris_core::{UiData, UiRenderNode, UiRenderState};
-use pollster::FutureExt;
-use std::sync::Arc;
-use wgpu::*;
-use winit::{dpi::PhysicalSize, window::Window};
-
-pub const CLEAR_COLOR: Color = Color::BLACK;
-
-pub struct UiRenderer {
-    window: Arc<Window>,
-    surface: Surface<'static>,
-    device: Device,
-    queue: Queue,
-    config: SurfaceConfiguration,
-    encoder: CommandEncoder,
-    pub ui: UiRenderNode,
-}
-
-impl UiRenderer {
-    pub fn update(&mut self, ui: &mut UiData, render: &mut UiRenderState) {
-        self.ui.update(&self.device, &self.queue, ui, render);
-    }
-
-    pub fn draw(&mut self) {
-        let output = match self.surface.get_current_texture() {
-            CurrentSurfaceTexture::Success(texture) => texture,
-            CurrentSurfaceTexture::Suboptimal(texture) => {
-                self.surface.configure(&self.device, &self.config);
-                texture
-            }
-            CurrentSurfaceTexture::Outdated | CurrentSurfaceTexture::Lost => {
-                self.surface.configure(&self.device, &self.config);
-                return;
-            }
-            CurrentSurfaceTexture::Timeout
-            | CurrentSurfaceTexture::Occluded
-            | CurrentSurfaceTexture::Validation => return,
-        };
-        let view = output
-            .texture
-            .create_view(&TextureViewDescriptor::default());
-
-        let mut encoder = std::mem::replace(&mut self.encoder, Self::create_encoder(&self.device));
-        {
-            let render_pass = &mut encoder.begin_render_pass(&RenderPassDescriptor {
-                color_attachments: &[Some(RenderPassColorAttachment {
-                    view: &view,
-                    resolve_target: None,
-                    ops: Operations {
-                        load: LoadOp::Clear(CLEAR_COLOR),
-                        store: StoreOp::Store,
-                    },
-                    depth_slice: None,
-                })],
-                ..Default::default()
-            });
-            self.ui.draw(render_pass);
-        }
-
-        self.queue.submit(std::iter::once(encoder.finish()));
-        self.window.pre_present_notify();
-        self.queue.present(output);
-    }
-
-    pub fn resize(&mut self, size: &PhysicalSize<u32>) {
-        self.config.width = size.width;
-        self.config.height = size.height;
-        self.surface.configure(&self.device, &self.config);
-        self.ui.resize((size.width, size.height), &self.queue);
-    }
-
-    fn create_encoder(device: &Device) -> CommandEncoder {
-        device.create_command_encoder(&CommandEncoderDescriptor {
-            label: Some("Render Encoder"),
-        })
-    }
-
-    pub fn new(window: Arc<Window>) -> Self {
-        let size = window.inner_size();
-
-        let instance = Instance::new(InstanceDescriptor {
-            backends: Backends::PRIMARY,
-            display: Some(Box::new(window.clone())),
-            ..InstanceDescriptor::new_without_display_handle()
-        });
-
-        let surface = instance
-            .create_surface(window.clone())
-            .expect("Could not create window surface!");
-
-        let adapter = instance
-            .request_adapter(&RequestAdapterOptions {
-                power_preference: PowerPreference::default(),
-                compatible_surface: Some(&surface),
-                force_fallback_adapter: false,
-                apply_limit_buckets: false,
-            })
-            .block_on()
-            .expect("Could not get adapter!");
-
-        let (device, queue) = adapter
-            .request_device(&DeviceDescriptor {
-                required_limits: Limits {
-                    max_buffer_size: 1 << 30,
-                    ..Default::default()
-                },
-                ..Default::default()
-            })
-            .block_on()
-            .expect("Could not get device!");
-
-        let surface_caps = surface.get_capabilities(&adapter);
-        let surface_format = surface_caps
-            .formats
-            .iter()
-            .copied()
-            .find(|f| f.is_srgb())
-            .unwrap_or(surface_caps.formats[0]);
-
-        let config = SurfaceConfiguration {
-            usage: TextureUsages::RENDER_ATTACHMENT,
-            format: surface_format,
-            color_space: SurfaceColorSpace::Auto,
-            width: size.width,
-            height: size.height,
-            present_mode: PresentMode::AutoVsync,
-            alpha_mode: surface_caps.alpha_modes[0],
-            desired_maximum_frame_latency: 2,
-            view_formats: vec![],
-        };
-
-        surface.configure(&device, &config);
-
-        let encoder = Self::create_encoder(&device);
-
-        let ui = UiRenderNode::new(&device, &config);
-
-        Self {
-            surface,
-            device,
-            queue,
-            config,
-            encoder,
-            ui,
-            window,
-        }
-    }
-
-    pub fn window(&self) -> &Window {
-        self.window.as_ref()
-    }
-}

src/default/sense.rs

@@ -1,376 +0,0 @@
-use crate::prelude::*;
-use std::{
-    ops::{BitOr, Deref, DerefMut},
-    rc::Rc,
-};
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum CursorButton {
-    Left,
-    Right,
-    Middle,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum CursorSense {
-    PressStart(CursorButton),
-    Pressing(CursorButton),
-    PressEnd(CursorButton),
-    HoverStart,
-    Hovering,
-    HoverEnd,
-    Scroll,
-}
-
-#[derive(Clone)]
-pub struct CursorSenses(Vec<CursorSense>);
-
-impl Event for CursorSenses {
-    type Data<'a> = CursorData<'a>;
-    type Global = Hovered;
-    fn should_run<'a>(&self, data: &Self::Data<'a>) -> Option<Self::Data<'a>> {
-        if let Some(sense) = should_run(self, &data.cursor, data.hover) {
-            let mut data = data.clone();
-            data.sense = sense;
-            Some(data)
-        } else {
-            None
-        }
-    }
-
-    /// A press or a scroll is used up by whatever answered it, so it stops
-    /// there. Hovering is not: a cursor resting somewhere goes on resting.
-    fn consumes(&self, data: &Self::Data<'_>) -> bool {
-        !data.sense.position_only()
-    }
-}
-
-/// Who the cursor was inside, before and after an input. The difference is
-/// whose hover has ended -- including a widget a higher layer has covered,
-/// which the walk stops before reaching.
-///
-/// Two buffers that swap rather than one rebuilt, so an input allocates
-/// nothing once they have grown.
-#[derive(Default)]
-pub struct Hovered {
-    was: Vec<WidgetId>,
-    now: Vec<WidgetId>,
-}
-
-impl CursorSense {
-    pub fn click() -> Self {
-        Self::PressStart(CursorButton::Left)
-    }
-    pub fn click_or_drag() -> CursorSenses {
-        Self::click() | Self::Pressing(CursorButton::Left)
-    }
-    pub fn unclick() -> Self {
-        Self::PressEnd(CursorButton::Left)
-    }
-    pub fn is_dragging(&self) -> bool {
-        matches!(self, CursorSense::Pressing(CursorButton::Left))
-    }
-
-    /// False if the sense is a button or a scroll, true if it is only about
-    /// where the cursor is.
-    fn position_only(&self) -> bool {
-        matches!(self, Self::HoverStart | Self::Hovering | Self::HoverEnd)
-    }
-}
-
-#[derive(Default, Clone)]
-pub struct CursorState {
-    pub pos: Vec2,
-    pub exists: bool,
-    pub buttons: CursorButtons,
-    pub scroll_delta: Vec2,
-}
-
-#[derive(Default, Clone)]
-pub struct CursorButtons {
-    pub left: ActivationState,
-    pub middle: ActivationState,
-    pub right: ActivationState,
-}
-
-impl CursorButtons {
-    pub fn select(&self, button: &CursorButton) -> &ActivationState {
-        match button {
-            CursorButton::Left => &self.left,
-            CursorButton::Right => &self.right,
-            CursorButton::Middle => &self.middle,
-        }
-    }
-
-    pub fn end_frame(&mut self) {
-        self.left.end_frame();
-        self.middle.end_frame();
-        self.right.end_frame();
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (CursorButton, &ActivationState)> {
-        [
-            CursorButton::Left,
-            CursorButton::Middle,
-            CursorButton::Right,
-        ]
-        .into_iter()
-        .map(|b| (b, self.select(&b)))
-    }
-}
-
-impl CursorState {
-    /// True if the cursor is only reporting where it is: no button and no
-    /// scroll this frame.
-    pub fn position_only(&self) -> bool {
-        self.scroll_delta == Vec2::ZERO && self.buttons.iter().all(|(_, state)| state.is_off())
-    }
-
-    pub fn end_frame(&mut self) {
-        self.buttons.end_frame();
-        self.scroll_delta = Vec2::ZERO;
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-pub enum ActivationState {
-    Start,
-    On,
-    End,
-    #[default]
-    Off,
-}
-
-/// this and other similar stuff has a generic
-/// because I kind of want to make CursorModule generic
-/// or basically have some way to have custom senses
-/// that depend on active widget positions
-/// but I'm not sure how or if worth it
-pub struct Sensor<Ctx: HasEvents, Data> {
-    pub senses: CursorSenses,
-    pub f: Rc<dyn EventFn<Ctx, Data>>,
-}
-
-pub type SenseShape = UiRegion;
-
-#[derive(Clone)]
-pub struct CursorData<'a> {
-    /// where this widget was hit
-    pub pos: Vec2,
-    pub size: Vec2,
-    pub scroll_delta: Vec2,
-    pub hover: ActivationState,
-    pub cursor: CursorState,
-    /// the first sense that triggered this
-    pub sense: CursorSense,
-    pub render: &'a UiRenderState,
-}
-
-pub trait SensorUi {
-    fn run_sensors<Rsc: HasEvents>(
-        &self,
-        rsc: &mut Rsc,
-        state: &mut Rsc::State,
-        cursor: CursorState,
-    );
-}
-
-impl SensorUi for UiRenderState {
-    fn run_sensors<Rsc: HasEvents>(
-        &self,
-        rsc: &mut Rsc,
-        state: &mut Rsc::State,
-        cursor: CursorState,
-    ) {
-        // in order to remove this take, need to store active list in UiRenderState somehow
-        // this would probably be done through a generic parameter that adds yet another rsc /
-        // state like thing, but local to render state, and is passed to UiRsc events so you can
-        // update it there?
-        let active = std::mem::take(&mut rsc.events_mut().get_type::<CursorSense>().active);
-        let mut hovered = std::mem::take(&mut rsc.events_mut().get_type::<CursorSense>().global);
-        hovered.now.clear();
-        let position_only = cursor.position_only();
-        let region_of = |id| self.window_region(&id);
-
-        for layer in self.layers.indices().rev() {
-            let mut consumed = false;
-            for id in active.get(&layer).into_flat_iter().map(|(id, _)| *id) {
-                let Some(region) = region_of(id) else {
-                    continue;
-                };
-                if !cursor.exists || !region.contains(PxVec2::from_f32(cursor.pos)) {
-                    continue;
-                }
-                hovered.now.push(id);
-                let hover = match hovered.was.contains(&id) {
-                    true => ActivationState::On,
-                    false => ActivationState::Start,
-                };
-                // A press or a scroll stops where something answered it, so a
-                // button over a list does not swallow the list's scrolling.
-                consumed |= deliver(self, rsc, state, id, hover, &cursor, region);
-                // A cursor doing neither stops at whatever it is over, so
-                // hovering does not reach through.
-                consumed |= position_only;
-            }
-            // Applied after the layer, never during it: senses on one layer do
-            // not block each other.
-            if consumed {
-                break;
-            }
-        }
-
-        // Whatever the cursor was inside and is not now, whether it left or a
-        // layer above took the input before the walk reached it. A widget that
-        // stopped being drawn has no region to report and is simply dropped.
-        for &id in &hovered.was {
-            if !hovered.now.contains(&id)
-                && let Some(region) = region_of(id)
-            {
-                deliver(self, rsc, state, id, ActivationState::End, &cursor, region);
-            }
-        }
-        std::mem::swap(&mut hovered.was, &mut hovered.now);
-
-        let senses = rsc.events_mut().get_type::<CursorSense>();
-        senses.active = active;
-        senses.global = hovered;
-    }
-}
-
-/// Runs one widget's cursor senses, and says whether they used up the input.
-fn deliver<Rsc: HasEvents>(
-    render: &UiRenderState,
-    rsc: &mut Rsc,
-    state: &mut Rsc::State,
-    id: WidgetId,
-    hover: ActivationState,
-    cursor: &CursorState,
-    region: PixelRegion,
-) -> bool {
-    let data = CursorData {
-        pos: cursor.pos - region.top_left.to_f32(),
-        size: region.size().to_f32(),
-        scroll_delta: cursor.scroll_delta,
-        hover,
-        cursor: cursor.clone(),
-        // this does not have any meaning;
-        // might wanna set up Event to have a prepare stage
-        sense: CursorSense::Hovering,
-        render,
-    };
-    rsc.run_event::<CursorSense>(id, data, state)
-}
-
-pub fn should_run(
-    senses: &CursorSenses,
-    cursor: &CursorState,
-    hover: ActivationState,
-) -> Option<CursorSense> {
-    for sense in senses.iter() {
-        // A widget the cursor is no longer inside senses only its position:
-        // the press that ended its hover landed on something else.
-        if !hover.is_on() && !sense.position_only() {
-            continue;
-        }
-        if match sense {
-            CursorSense::PressStart(button) => cursor.buttons.select(button).is_start(),
-            CursorSense::Pressing(button) => cursor.buttons.select(button).is_on(),
-            CursorSense::PressEnd(button) => cursor.buttons.select(button).is_end(),
-            CursorSense::HoverStart => hover.is_start(),
-            CursorSense::Hovering => hover.is_on(),
-            CursorSense::HoverEnd => hover.is_end(),
-            CursorSense::Scroll => cursor.scroll_delta != Vec2::ZERO,
-        } {
-            return Some(*sense);
-        }
-    }
-    None
-}
-
-impl ActivationState {
-    pub fn is_start(&self) -> bool {
-        *self == Self::Start
-    }
-    pub fn is_on(&self) -> bool {
-        *self == Self::Start || *self == Self::On
-    }
-    pub fn is_end(&self) -> bool {
-        *self == Self::End
-    }
-    pub fn is_off(&self) -> bool {
-        *self == Self::End || *self == Self::Off
-    }
-    pub fn update(&mut self, on: bool) {
-        *self = match *self {
-            Self::Start => match on {
-                true => Self::On,
-                false => Self::End,
-            },
-            Self::On => match on {
-                true => Self::On,
-                false => Self::End,
-            },
-            Self::End => match on {
-                true => Self::Start,
-                false => Self::Off,
-            },
-            Self::Off => match on {
-                true => Self::Start,
-                false => Self::Off,
-            },
-        }
-    }
-
-    pub fn end_frame(&mut self) {
-        match self {
-            Self::Start => *self = Self::On,
-            Self::End => *self = Self::Off,
-            _ => (),
-        }
-    }
-}
-
-impl EventLike for CursorSense {
-    type Event = CursorSenses;
-    fn into_event(self) -> Self::Event {
-        self.into()
-    }
-}
-
-impl Deref for CursorSenses {
-    type Target = Vec<CursorSense>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for CursorSenses {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl From<CursorSense> for CursorSenses {
-    fn from(val: CursorSense) -> Self {
-        CursorSenses(vec![val])
-    }
-}
-
-impl BitOr for CursorSense {
-    type Output = CursorSenses;
-
-    fn bitor(self, rhs: Self) -> Self::Output {
-        CursorSenses(vec![self, rhs])
-    }
-}
-
-impl BitOr<CursorSense> for CursorSenses {
-    type Output = Self;
-
-    fn bitor(mut self, rhs: CursorSense) -> Self::Output {
-        self.0.push(rhs);
-        self
-    }
-}

src/default/state.rs

@@ -1,75 +0,0 @@
-use iris_core::{
-    WidgetId,
-    util::{HashMap, HashSet},
-};
-use std::{
-    any::{Any, TypeId},
-    marker::PhantomData,
-};
-
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
-struct Key {
-    id: WidgetId,
-    ty: TypeId,
-    i: usize,
-}
-
-#[derive(Default)]
-pub struct WidgetState {
-    widgets: HashMap<WidgetId, HashSet<(TypeId, usize)>>,
-    counts: HashMap<(WidgetId, TypeId), usize>,
-    map: HashMap<Key, Box<dyn Any>>,
-}
-
-impl WidgetState {
-    pub fn new() -> Self {
-        Self::default()
-    }
-    pub fn add<T: 'static>(&mut self, id: WidgetId, data: T) -> WeakState<T> {
-        let ty = TypeId::of::<T>();
-        let count = self.counts.entry((id, ty)).or_default();
-        let i = *count;
-        let key = Key { ty, i, id };
-        self.map.insert(key, Box::new(data));
-        self.widgets.entry(id).or_default().insert((ty, i));
-        *count += 1;
-        WeakState {
-            key,
-            _pd: PhantomData,
-        }
-    }
-    pub fn remove(&mut self, id: WidgetId) {
-        for &(ty, i) in self.widgets.get(&id).into_iter().flatten() {
-            self.map.remove(&Key { id, ty, i });
-        }
-    }
-    pub fn get<T: 'static>(&self, state: WeakState<T>) -> &T {
-        self.map.get(&state.key).unwrap().downcast_ref().unwrap()
-    }
-    pub fn get_mut<T: 'static>(&mut self, state: WeakState<T>) -> &mut T {
-        self.map
-            .get_mut(&state.key)
-            .unwrap()
-            .downcast_mut()
-            .unwrap()
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct WeakState<T> {
-    key: Key,
-    _pd: PhantomData<T>,
-}
-
-pub trait HasWidgetState {
-    fn widget_state(&self) -> &WidgetState;
-    fn widget_state_mut(&mut self) -> &mut WidgetState;
-}
-
-impl<'a, T: 'static> FnOnce<(&'a mut WidgetState,)> for WeakState<T> {
-    type Output = &'a mut T;
-
-    extern "rust-call" fn call_once(self, (state,): (&'a mut WidgetState,)) -> Self::Output {
-        state.get_mut(self)
-    }
-}

src/default/task.rs

@@ -1,64 +0,0 @@
-use iris_core::HasState;
-use std::{pin::Pin, sync::Arc};
-use tokio::{
-    runtime::Runtime,
-    sync::mpsc::{
-        UnboundedReceiver as AsyncReceiver, UnboundedSender as AsyncSender,
-        unbounded_channel as async_channel,
-    },
-};
-
-pub trait TaskUpdate<Rsc: HasState>: FnOnce(&mut Rsc::State, &mut Rsc) + Send {}
-impl<F: FnOnce(&mut Rsc::State, &mut Rsc) + Send, Rsc: HasState> TaskUpdate<Rsc> for F {}
-
-/// Hands an update from a task to the thread that owns the ui. Delivery and
-/// waking are one act: a host posts the update as a message its loop already
-/// carries, so nothing has to wake the loop separately, or claim a redraw to
-/// be looked at.
-pub trait TaskQueue<Rsc: HasState>: Send + Sync + 'static {
-    fn send(&self, update: Box<dyn TaskUpdate<Rsc>>);
-}
-
-pub struct Tasks<Rsc: HasState> {
-    start: AsyncSender<BoxTask>,
-    queue: Arc<dyn TaskQueue<Rsc>>,
-}
-
-pub struct TaskCtx<Rsc: HasState> {
-    queue: Arc<dyn TaskQueue<Rsc>>,
-}
-
-impl<Rsc: HasState> TaskCtx<Rsc> {
-    pub fn update(&mut self, f: impl TaskUpdate<Rsc> + 'static) {
-        self.queue.send(Box::new(f));
-    }
-}
-
-type BoxTask = Pin<Box<dyn Future<Output = ()> + Send>>;
-
-impl<Rsc: HasState> Tasks<Rsc> {
-    pub fn init(queue: Arc<dyn TaskQueue<Rsc>>) -> Self {
-        let (start, start_recv) = async_channel();
-        std::thread::spawn(|| {
-            let rt = Runtime::new().unwrap();
-            rt.block_on(listen(start_recv))
-        });
-        Self { start, queue }
-    }
-
-    pub fn spawn<F: AsyncFnOnce(TaskCtx<Rsc>) + 'static + std::marker::Send>(&mut self, task: F)
-    where
-        F::CallOnceFuture: Send,
-    {
-        let queue = self.queue.clone();
-        let _ = self.start.send(Box::pin(async move {
-            task(TaskCtx { queue }).await;
-        }));
-    }
-}
-
-async fn listen(mut recv: AsyncReceiver<BoxTask>) {
-    while let Some(task) = recv.recv().await {
-        tokio::spawn(task);
-    }
-}

src/event.rs

@@ -1,87 +0,0 @@
-use iris_core::*;
-use iris_macro::*;
-use std::sync::Arc;
-
-use crate::default::{TaskCtx, TaskUpdate, Tasks};
-
-pub trait Eventable<Rsc: HasEvents, Tag>: WidgetLike<Rsc, Tag> {
-    fn on<E: EventLike>(
-        self,
-        event: E,
-        f: impl for<'a> WidgetEventFn<Rsc, <E::Event as Event>::Data<'a>, Self::Widget>,
-    ) -> impl WidgetIdFn<Rsc, Self::Widget> {
-        move |rsc| {
-            let id = self.add(rsc);
-            rsc.register_event(id, event.into_event(), move |ctx, rsc| {
-                f(
-                    EventIdCtx {
-                        widget: id,
-                        state: ctx.state,
-                        data: ctx.data,
-                    },
-                    rsc,
-                );
-            });
-            id
-        }
-    }
-}
-impl<WL: WidgetLike<Rsc, Tag>, Rsc: HasEvents, Tag> Eventable<Rsc, Tag> for WL {}
-
-widget_trait! {
-    pub trait TaskEventable<Rsc: HasEvents + HasTasks>;
-    fn task_on<'a, E: EventLike, F: AsyncWidgetEventFn<Rsc, WL::Widget>>(
-        self,
-        event: E,
-        f: F,
-    ) -> impl WidgetIdFn<Rsc, WL::Widget>
-        where <E::Event as Event>::Data<'a>: Send,
-        for<'b> F::CallRefFuture<'b>: Send,
-    {
-        let f = Arc::new(f);
-        move |rsc| {
-            let id = self.add(rsc);
-            rsc.register_event(id, event.into_event(), move |_, rsc| {
-                let f = f.clone();
-                rsc.tasks_mut().spawn(async move |task| {
-                    f(AsyncEventIdCtx {
-                        widget: id,
-                        task,
-                    }).await;
-                });
-            });
-            id
-        }
-    }
-}
-
-pub trait HasTasks: Sized + HasState + HasEvents {
-    fn tasks_mut(&mut self) -> &mut Tasks<Self>;
-
-    fn spawn_task<F: AsyncFnOnce(TaskCtx<Self>) + 'static + std::marker::Send>(&mut self, task: F)
-    where
-        F::CallOnceFuture: Send,
-    {
-        self.tasks_mut().spawn(task);
-    }
-}
-
-pub trait AsyncWidgetEventFn<Rsc: HasEvents, W: ?Sized>:
-    AsyncFn(AsyncEventIdCtx<Rsc, W>) + Send + Sync + 'static
-{
-}
-impl<Rsc: HasEvents, F: AsyncFn(AsyncEventIdCtx<Rsc, W>) + Send + Sync + 'static, W: ?Sized>
-    AsyncWidgetEventFn<Rsc, W> for F
-{
-}
-
-pub struct AsyncEventIdCtx<Rsc: HasEvents, W: ?Sized> {
-    pub widget: WeakWidget<W>,
-    task: TaskCtx<Rsc>,
-}
-
-impl<Rsc: HasEvents, W: ?Sized> AsyncEventIdCtx<Rsc, W> {
-    pub fn update(&mut self, f: impl TaskUpdate<Rsc> + 'static) {
-        self.task.update(f);
-    }
-}

src/harness.rs

@@ -1,333 +0,0 @@
-//! A ui with no window: build a tree, run frames, move a pointer, and read
-//! back where widgets landed.
-//!
-//! It does not draw. A claim about pixels still needs a real surface.
-
-use crate::prelude::*;
-use std::{
-    sync::{
-        Arc,
-        mpsc::{Receiver, SyncSender, sync_channel},
-    },
-    time::Duration,
-};
-
-/// There is no loop here to post to, so updates queue until the test asks
-/// for them.
-struct Queue(SyncSender<Box<dyn TaskUpdate<DefaultRsc<HarnessState>>>>);
-
-impl TaskQueue<DefaultRsc<HarnessState>> for Queue {
-    fn send(&self, update: Box<dyn TaskUpdate<DefaultRsc<HarnessState>>>) {
-        let _ = self.0.send(update);
-    }
-}
-
-/// `assert_eq!` for where a frame put a widget, written as its two corners.
-#[macro_export]
-macro_rules! assert_corners {
-    ($harness:expr, $id:expr, ($x0:expr, $y0:expr), ($x1:expr, $y1:expr)) => {
-        assert_eq!(
-            $harness.region(&$id).expect("widget drew nothing"),
-            $crate::core::PixelRegion {
-                top_left: $crate::core::PxVec2::new(
-                    $crate::core::Px::from_f32($x0 as f32),
-                    $crate::core::Px::from_f32($y0 as f32),
-                ),
-                bot_right: $crate::core::PxVec2::new(
-                    $crate::core::Px::from_f32($x1 as f32),
-                    $crate::core::Px::from_f32($y1 as f32),
-                ),
-            }
-        );
-    };
-}
-pub use crate::assert_corners;
-
-/// One replayed pointer sample, cut down to what a window delivers: where the
-/// pointer is, and whether the button changed.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum TouchAction {
-    Down,
-    Move,
-    Up,
-}
-
-impl TouchAction {
-    fn parse(word: &str) -> Option<Self> {
-        match word {
-            "down" => Some(Self::Down),
-            "move" => Some(Self::Move),
-            "up" => Some(Self::Up),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct TouchSample {
-    pub t_ms: u64,
-    pub action: TouchAction,
-    pub pos: Vec2,
-}
-
-/// A recorded gesture, in the output's own pixels: `<ms> down|move|up <x> <y>`
-/// a line, `#` to end of line ignored.
-///
-/// One parser for both ways of replaying a recording -- into a harness, and
-/// into a real window -- so the two cannot read the same file differently.
-pub struct TouchScript {
-    pub samples: Vec<TouchSample>,
-}
-
-impl TouchScript {
-    pub fn parse(text: &str) -> Result<Self, String> {
-        let mut samples: Vec<TouchSample> = Vec::new();
-        for (i, line) in text.lines().enumerate() {
-            let line = line.split('#').next().unwrap_or("").trim();
-            if line.is_empty() {
-                continue;
-            }
-            let at = |what: &str| format!("touch script line {}: {what}: {line:?}", i + 1);
-            let mut words = line.split_whitespace();
-            let (Some(t), Some(action), Some(x), Some(y), None) = (
-                words.next(),
-                words.next(),
-                words.next(),
-                words.next(),
-                words.next(),
-            ) else {
-                return Err(at("expected `t_ms action x y`"));
-            };
-            let t_ms: u64 = t.parse().map_err(|_| at("t_ms is not a whole number"))?;
-            let action =
-                TouchAction::parse(action).ok_or_else(|| at("action is not down/move/up"))?;
-            let x: f32 = x.parse().map_err(|_| at("x is not a number"))?;
-            let y: f32 = y.parse().map_err(|_| at("y is not a number"))?;
-            if let Some(last) = samples.last()
-                && t_ms < last.t_ms
-            {
-                return Err(at("samples must be in time order"));
-            }
-            samples.push(TouchSample {
-                t_ms,
-                action,
-                pos: Vec2::new(x, y),
-            });
-        }
-        Ok(Self { samples })
-    }
-}
-
-#[derive(Default)]
-pub struct HarnessState {
-    pub root: Option<StrongWidget>,
-}
-
-impl HasRoot for HarnessState {
-    fn set_root(&mut self, root: StrongWidget) {
-        self.root = Some(root);
-    }
-}
-
-pub struct Harness {
-    pub rsc: DefaultRsc<HarnessState>,
-    pub render: UiRenderState,
-    pub state: HarnessState,
-    updates: Receiver<Box<dyn TaskUpdate<DefaultRsc<HarnessState>>>>,
-    cursor: CursorState,
-}
-
-impl Harness {
-    /// `size` is the output in physical pixels.
-    pub fn new(size: impl Into<Vec2>) -> Self {
-        // A `TaskQueue` must be `Sync`, which `mpsc::Sender` is not; the
-        // bound that comes with `SyncSender` is far past anything a test
-        // leaves unread.
-        let (send, updates) = sync_channel(1024);
-        let mut rsc = DefaultRsc::init(Arc::new(Queue(send)));
-        let mut render = UiRenderState::new();
-        render.resize(size, rsc.widgets_mut());
-        Self {
-            rsc,
-            render,
-            state: HarnessState::default(),
-            updates,
-            cursor: CursorState::default(),
-        }
-    }
-
-    pub fn size(&self) -> Vec2 {
-        self.render.output_size().to_f32()
-    }
-
-    pub fn resize(&mut self, size: impl Into<Vec2>) {
-        self.render.resize(size, self.rsc.widgets_mut());
-    }
-
-    /// Changes a length rule after the fact, the way `.width()` sets one.
-    pub fn set_len(&mut self, id: impl IdLike, axis: Axis, len: impl Into<LayoutLen>) {
-        self.rsc
-            .widgets_mut()
-            .set_size_rule(id, axis, SizeRule::Exact(len.into()));
-    }
-
-    /// Sets the root and lays it out, so a pointer event has something to hit.
-    pub fn set_root<T>(&mut self, widget: impl WidgetLike<DefaultRsc<HarnessState>, T>) {
-        widget.set_root(&mut self.rsc, &mut self.state);
-        self.frame();
-    }
-
-    pub fn needs_redraw(&self) -> bool {
-        self.render
-            .needs_redraw(&self.state.root, self.rsc.widgets())
-    }
-
-    pub fn apply_updates(&mut self) -> usize {
-        let mut applied = 0;
-        while let Ok(update) = self.updates.try_recv() {
-            update(&mut self.state, &mut self.rsc);
-            applied += 1;
-        }
-        applied
-    }
-
-    /// Waits for a task's first update, then applies everything waiting.
-    /// False if none arrived in time.
-    #[must_use]
-    pub fn await_update(&mut self, timeout: Duration) -> bool {
-        let Ok(update) = self.updates.recv_timeout(timeout) else {
-            return false;
-        };
-        update(&mut self.state, &mut self.rsc);
-        self.apply_updates();
-        true
-    }
-
-    /// Lays the tree out and builds its primitives.
-    pub fn frame(&mut self) {
-        self.apply_updates();
-        self.render.update(&self.state.root, &mut self.rsc);
-    }
-
-    /// Where the last frame put a widget, or `None` if it drew nothing.
-    pub fn region(&self, id: &impl IdLike) -> Option<PixelRegion> {
-        self.render.window_region(id)
-    }
-
-    pub fn move_to(&mut self, pos: impl Into<Vec2>) {
-        self.cursor.pos = pos.into();
-        self.cursor.exists = true;
-        self.sense();
-    }
-
-    pub fn leave(&mut self) {
-        self.cursor.exists = false;
-        self.sense();
-    }
-
-    pub fn press(&mut self, button: CursorButton) {
-        self.button(button).update(true);
-        self.sense();
-    }
-
-    pub fn release(&mut self, button: CursorButton) {
-        self.button(button).update(false);
-        self.sense();
-    }
-
-    /// A wheel carries no position, so this goes wherever the cursor was last
-    /// moved to -- nowhere, until it has been moved.
-    pub fn scroll(&mut self, delta: impl Into<Vec2>) {
-        self.cursor.scroll_delta = delta.into();
-        self.sense();
-    }
-
-    pub fn click(&mut self, pos: impl Into<Vec2>) {
-        self.move_to(pos);
-        self.press(CursorButton::Left);
-        self.release(CursorButton::Left);
-    }
-
-    /// Drives a recorded gesture through the harness.
-    pub fn replay(&mut self, script: &TouchScript) {
-        for sample in &script.samples {
-            match sample.action {
-                TouchAction::Down => {
-                    self.move_to(sample.pos);
-                    self.press(CursorButton::Left);
-                }
-                TouchAction::Move => self.move_to(sample.pos),
-                TouchAction::Up => {
-                    self.move_to(sample.pos);
-                    self.release(CursorButton::Left);
-                }
-            }
-        }
-    }
-
-    fn button(&mut self, button: CursorButton) -> &mut ActivationState {
-        let buttons = &mut self.cursor.buttons;
-        match button {
-            CursorButton::Left => &mut buttons.left,
-            CursorButton::Middle => &mut buttons.middle,
-            CursorButton::Right => &mut buttons.right,
-        }
-    }
-
-    /// Dispatches against the layout of the last frame, which is what a
-    /// window delivers input against too.
-    fn sense(&mut self) {
-        let cursor = self.cursor.clone();
-        self.render
-            .run_sensors(&mut self.rsc, &mut self.state, cursor);
-        self.cursor.end_frame();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn parse(text: &str) -> Result<Vec<(u64, TouchAction, f32, f32)>, String> {
-        Ok(TouchScript::parse(text)?
-            .samples
-            .iter()
-            .map(|s| (s.t_ms, s.action, s.pos.x, s.pos.y))
-            .collect())
-    }
-
-    #[test]
-    fn a_recording_is_time_action_and_a_point() {
-        assert_eq!(
-            parse("0 down 10 20\n16 move 10.5 24\n32 up 10.5 24").unwrap(),
-            [
-                (0, TouchAction::Down, 10.0, 20.0),
-                (16, TouchAction::Move, 10.5, 24.0),
-                (32, TouchAction::Up, 10.5, 24.0),
-            ]
-        );
-    }
-
-    #[test]
-    fn blank_lines_and_comments_are_not_samples() {
-        assert_eq!(
-            parse("# a flick\n\n 0 down 1 2   # the finger lands\n\n").unwrap(),
-            [(0, TouchAction::Down, 1.0, 2.0)]
-        );
-    }
-
-    #[test]
-    fn a_recording_that_goes_backwards_is_rejected() {
-        // Replay waits out the gap between samples, so time running backwards
-        // would silently become no wait at all.
-        let err = parse("16 down 1 2\n0 up 1 2").unwrap_err();
-        assert!(err.contains("time order"), "{err}");
-    }
-
-    #[test]
-    fn a_line_that_is_not_a_sample_says_which_line() {
-        let err = parse("0 down 1 2\n16 wiggle 1 2").unwrap_err();
-        assert!(err.contains("line 2"), "{err}");
-        assert!(err.contains("down/move/up"), "{err}");
-    }
-}

src/layout/mod.rs

@@ -0,0 +1,8 @@
+mod ui;
+mod widget;
+
+pub use ui::*;
+pub use widget::*;
+
+use crate::primitive::Color;
+pub type UIColor = Color<u8>;

src/layout/ui.rs

@@ -0,0 +1,101 @@
+use crate::{
+    primitive::{Painter, Primitives},
+    util::{IDTracker, ID},
+    HashMap, Widget, WidgetId, WidgetLike, WidgetRef,
+};
+use std::{
+    any::{Any, TypeId},
+    cell::RefCell,
+    rc::Rc,
+};
+
+pub struct UI {
+    ids: IDTracker,
+    base: Option<WidgetId>,
+    pub widgets: Widgets,
+}
+
+pub struct Widgets(HashMap<ID, Box<dyn Widget>>);
+
+#[derive(Clone)]
+pub struct UIBuilder {
+    ui: Rc<RefCell<UI>>,
+}
+
+impl From<UI> for UIBuilder {
+    fn from(ui: UI) -> Self {
+        UIBuilder {
+            ui: Rc::new(RefCell::new(ui)),
+        }
+    }
+}
+
+impl UIBuilder {
+    pub fn add<W: Widget>(&mut self, w: W) -> WidgetRef<W> {
+        WidgetRef::new(self.clone(), (self.push(w),))
+    }
+
+    pub fn push<W: Widget>(&mut self, w: W) -> WidgetId<W> {
+        let mut ui = self.ui.borrow_mut();
+        let id = ui.ids.next();
+        ui.widgets.insert(id.duplicate(), w);
+        WidgetId::new(id, TypeId::of::<W>())
+    }
+
+    pub fn finish<W: WidgetLike>(mut self, base: W) -> UI {
+        let base = base.add(&mut self).erase_type();
+        let mut ui = Rc::into_inner(self.ui).unwrap().into_inner();
+        ui.base = Some(base);
+        ui
+    }
+}
+
+impl UI {
+    pub fn build() -> UIBuilder {
+        Self::empty().into()
+    }
+
+    pub fn empty() -> Self {
+        Self {
+            ids: IDTracker::new(),
+            base: None,
+            widgets: Widgets::new(),
+        }
+    }
+
+    pub fn to_primitives(&self) -> Primitives {
+        let mut painter = Painter::new(&self.widgets);
+        if let Some(base) = &self.base {
+            painter.draw(base);
+        }
+        painter.finish()
+    }
+}
+
+impl Widgets {
+    fn new() -> Self {
+        Self(HashMap::new())
+    }
+
+    pub fn get(&self, id: &WidgetId) -> &dyn Widget {
+        self.0.get(&id.id).unwrap().as_ref()
+    }
+
+    pub fn get_mut<W: Widget>(&mut self, id: &WidgetId<W>) -> Option<&mut W> {
+        self.0.get_mut(&id.id).unwrap().as_any_mut().downcast_mut()
+    }
+
+    pub fn insert(&mut self, id: ID, widget: impl Widget) {
+        self.0.insert(id, Box::new(widget));
+    }
+
+    pub fn insert_any(&mut self, id: ID, widget: Box<dyn Widget>) {
+        self.0.insert(id, widget);
+    }
+}
+
+impl dyn Widget {
+    pub fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}

src/layout/widget.rs

@@ -0,0 +1,178 @@
+use std::{
+    any::{Any, TypeId},
+    marker::PhantomData,
+};
+
+use crate::{
+    primitive::Painter,
+    util::{impl_tuple, ID},
+    UIBuilder,
+};
+
+pub trait Widget: 'static + Any {
+    fn draw(&self, painter: &mut Painter);
+}
+
+impl<W: Widget> Widget for (W,) {
+    fn draw(&self, painter: &mut Painter) {
+        self.0.draw(painter);
+    }
+}
+
+#[derive(Eq, Hash, PartialEq, Debug)]
+pub struct WidgetId<W = ()> {
+    pub(super) ty: TypeId,
+    pub(super) id: ID,
+    _pd: PhantomData<W>,
+}
+
+// TODO: temp
+impl<W: Widget> Clone for WidgetId<W> {
+    fn clone(&self) -> Self {
+        Self {
+            ty: self.ty,
+            id: self.id.duplicate(),
+            _pd: self._pd,
+        }
+    }
+}
+
+impl<W> WidgetId<W> {
+    pub(super) fn new(id: ID, ty: TypeId) -> Self {
+        Self {
+            ty,
+            id,
+            _pd: PhantomData,
+        }
+    }
+    pub fn erase_type(self) -> WidgetId<()> {
+        self.cast_type()
+    }
+
+    fn cast_type<W2>(self) -> WidgetId<W2> {
+        WidgetId {
+            ty: self.ty,
+            id: self.id,
+            _pd: PhantomData,
+        }
+    }
+}
+
+pub trait WidgetLike {
+    type Widget: Widget;
+    fn add(self, ui: &mut UIBuilder) -> WidgetId<Self::Widget>;
+}
+
+/// wouldn't be needed if negative trait bounds & disjoint impls existed
+pub struct WidgetFn<F: FnOnce(&mut UIBuilder) -> W, W>(pub F);
+
+impl<W: Widget, F: FnOnce(&mut UIBuilder) -> W> WidgetLike for WidgetFn<F, W> {
+    type Widget = W;
+    fn add(self, ui: &mut UIBuilder) -> WidgetId<W> {
+        let w = (self.0)(ui);
+        ui.add(w).to_id()
+    }
+}
+
+impl<W: Widget> WidgetLike for W {
+    type Widget = W;
+    fn add(self, ui: &mut UIBuilder) -> WidgetId<W> {
+        ui.add(self).to_id()
+    }
+}
+
+impl<W: Widget> WidgetLike for WidgetId<W> {
+    type Widget = W;
+    fn add(self, _: &mut UIBuilder) -> WidgetId<W> {
+        self
+    }
+}
+
+impl<W: Widget> WidgetLike for WidgetArr<1, (W,)> {
+    type Widget = W;
+    fn add(self, _: &mut UIBuilder) -> WidgetId<W> {
+        self.arr.0
+    }
+}
+
+pub struct WidgetArr<const LEN: usize, Ws: WidgetLikeTuple<LEN>> {
+    pub ui: UIBuilder,
+    pub arr: Ws::Wrap<ToId>,
+}
+
+impl<const LEN: usize, Ws: WidgetLikeTuple<LEN>> WidgetArr<LEN, Ws>
+where
+    Ws::Wrap<ToId>: WidgetIdLikeTuple<LEN>,
+{
+    pub fn new(ui: UIBuilder, arr: Ws::Wrap<ToId>) -> Self {
+        Self { ui, arr }
+    }
+    pub fn erase_types(self) -> [WidgetId; LEN] {
+        self.arr.map::<EraseId>(&mut ())
+    }
+}
+
+pub type WidgetRef<W> = WidgetArr<1, (W,)>;
+
+impl<W: WidgetLike> WidgetRef<W> {
+    pub fn handle(&self) -> WidgetId<W::Widget> {
+        self.arr.0.clone()
+    }
+    pub fn to_id(self) -> WidgetId<W::Widget> {
+        self.arr.0
+    }
+}
+
+pub trait WidgetArrLike<const LEN: usize> {
+    type Ws: WidgetLikeTuple<LEN>;
+    fn ui(self, ui: &mut UIBuilder) -> WidgetArr<LEN, Self::Ws>;
+}
+
+impl<const LEN: usize, Ws: WidgetLikeTuple<LEN>> WidgetArrLike<LEN> for WidgetArr<LEN, Ws> {
+    type Ws = Ws;
+    fn ui(self, _: &mut UIBuilder) -> WidgetArr<LEN, Ws> {
+        self
+    }
+}
+
+impl_tuple!(Widget);
+impl_tuple!(WidgetLike);
+impl_tuple!(WidgetIdLike);
+
+pub trait WidgetIdLike {
+    fn erase_type(self) -> WidgetId;
+}
+
+impl<W> WidgetIdLike for WidgetId<W> {
+    fn erase_type(self) -> WidgetId {
+        self.erase_type()
+    }
+}
+
+pub struct ToId;
+impl WidgetLikeWrapper for ToId {
+    type Wrap<T: WidgetLike> = WidgetId<T::Widget>;
+    type Ctx = UIBuilder;
+    fn wrap<T: WidgetLike>(t: T, ctx: &mut Self::Ctx) -> Self::Wrap<T> {
+        t.add(ctx)
+    }
+}
+
+struct EraseId;
+impl WidgetIdLikeMapper for EraseId {
+    type Map = WidgetId<()>;
+    type Ctx = ();
+    fn map<Id: WidgetIdLike>(t: Id, _: &mut Self::Ctx) -> Self::Map {
+        t.erase_type()
+    }
+}
+
+impl<T: WidgetLikeTuple<LEN>, const LEN: usize> WidgetArrLike<LEN> for T
+where
+    T::Wrap<ToId>: WidgetIdLikeTuple<LEN>,
+{
+    type Ws = T;
+    fn ui(self, ui: &mut UIBuilder) -> WidgetArr<LEN, T> {
+        WidgetArr::new(ui.clone(), self.wrap::<ToId>(ui))
+    }
+}

src/lib.rs

@@ -1,27 +1,16 @@
-#![feature(unboxed_closures)]
-#![feature(fn_traits)]
-#![feature(associated_type_defaults)]
-#![feature(unsize)]
-#![feature(option_into_flat_iter)]
-#![feature(async_fn_traits)]
+#![feature(macro_metavar_expr_concat)]
+#![feature(const_ops)]
+#![feature(const_trait_impl)]
+#![feature(const_from)]
+#![feature(trait_alias)]
 
-pub mod default;
-pub mod event;
-pub mod harness;
-pub mod random;
-pub mod widget;
+mod layout;
+mod render;
+mod util;
+mod base;
 
-pub use iris_core as core;
-pub use iris_macro as macros;
+pub use layout::*;
+pub use render::*;
+pub use base::*;
 
-pub mod prelude {
-    use super::*;
-    pub use default::*;
-    pub use event::*;
-    pub use iris_core::*;
-    pub use iris_macro::*;
-    pub use widget::*;
-
-    pub use iris_core::util::Vec2;
-    pub use len_fns::*;
-}
+pub type HashMap<K, V> = std::collections::HashMap<K, V>;

src/main.rs

@@ -0,0 +1,5 @@
+mod testing;
+
+fn main() {
+    testing::main();
+}

src/random.rs

@@ -1,931 +0,0 @@
-//! A seeded random widget tree, for tests and for looking at.
-//!
-//! One seed is one tree, on any machine and after any upgrade, so a test can
-//! grow the same tree twice and a failing seed is reproduced by its number.
-//! `examples/random.rs` draws one; `tests/generated.rs` checks that laying one
-//! out again lands where growing it from scratch would.
-
-use crate::prelude::*;
-use std::collections::HashMap;
-
-/// The declared lengths of one widget carrying a size rule, by axis.
-pub type Lens = [Option<LayoutLen>; 2];
-
-/// Where one widget carrying an alignment sits, by axis. `None` uses the
-/// centered default.
-pub type Aligns = [Option<AxisAlign>; 2];
-
-/// What a test changes between two trees grown from the same seed, so the
-/// warm one can be mutated and the cold one grown that way to begin with.
-#[derive(Default)]
-pub struct Edits {
-    /// Declared sizes, by the order the rules were put on.
-    pub sizes: HashMap<usize, Lens>,
-    /// Which children a span has, by the order the spans were made.
-    pub spans: HashMap<usize, SpanEdit>,
-    /// Alignments, by the order they were put on.
-    pub aligns: HashMap<usize, Aligns>,
-    /// Which widgets own a movable region, by the order they were offered
-    /// one. Region nodes change what a move writes and how deep a primitive's
-    /// chain is, so a tree that never grows one leaves both untested.
-    pub nodes: HashMap<usize, bool>,
-    /// Whether a [`Branch`] takes the side it would take at any measurement,
-    /// rather than the side the one it made says. The oracle wants the
-    /// measured side -- that is the whole point of a branch, and how a widget
-    /// believing a measurement a cold start would not have given it becomes a
-    /// different tree. A rig measuring cost wants this instead: a fixture
-    /// whose shape moves with the thing being measured cannot be compared
-    /// with itself across a change to it, and seed 1 at depth 8 went from 88
-    /// drawn widgets and 2,298 primitive writes a frame to 115 and 8,209
-    /// across fixed point, which is three and a half times the work behind a
-    /// number read as three and a half times the cost.
-    pub fixed_branches: bool,
-}
-
-#[derive(Default, Clone)]
-pub struct SpanEdit {
-    /// Children to leave out, by index among the ones grown.
-    pub detach: Vec<usize>,
-    /// How many of the span's spares are in it, appended in order.
-    pub attach: usize,
-}
-
-/// xorshift64, written out rather than taken from a crate so that a seed
-/// keeps meaning the same tree.
-pub struct Rng(u64);
-
-impl Rng {
-    pub fn new(seed: u64) -> Self {
-        Self(seed | 1)
-    }
-
-    pub fn bits(&mut self) -> u64 {
-        self.0 ^= self.0 << 13;
-        self.0 ^= self.0 >> 7;
-        self.0 ^= self.0 << 17;
-        self.0
-    }
-
-    pub fn below(&mut self, n: usize) -> usize {
-        (self.bits() % n as u64) as usize
-    }
-
-    pub fn chance(&mut self) -> bool {
-        self.bits() & 1 == 0
-    }
-}
-
-const COLORS: [UiColor; 6] = [
-    UiColor::RED,
-    UiColor::GREEN,
-    UiColor::BLUE,
-    UiColor::YELLOW,
-    UiColor::CYAN,
-    UiColor::MAGENTA,
-];
-
-/// Leaves grown beside every span, for a test to put into it.
-const SPARES: usize = 3;
-
-const WORDS: &str = "Wrapping shapes one source into as many lines as the box \
-    leaves room for, so a paragraph's height is an answer and not a setting.";
-
-/// What growing a tree gives back: every widget in creation order, so two
-/// trees from one seed line up index for index, and the declared sizes, which
-/// are what a test changes to watch the change propagate.
-#[derive(Default)]
-pub struct Tree {
-    pub ids: Vec<WidgetId>,
-    pub sized: Vec<WidgetId>,
-    pub aligned: Vec<WidgetId>,
-    pub nodes: Vec<WidgetId>,
-    pub spans: Vec<Spanned>,
-    pub scrolls: Vec<WeakWidget<Scroll>>,
-}
-
-/// Branches on a child's measured length. Comparing boxes catches a widget
-/// that moved; this catches one that believed a measurement a cold start
-/// would not have given it, by turning that into a different tree. Its own
-/// configuration never changes, so which side draws is a property of the
-/// layout alone.
-pub struct Branch {
-    pub probe: StrongWidget,
-    pub wide: StrongWidget,
-    pub narrow: StrongWidget,
-    pub threshold: f32,
-}
-
-impl Widget for Branch {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        let cut = Len::from_parts(Rel::ZERO, Px::from_int(40));
-        let top = UiSpan::new(Len::ZERO, cut).shifted_desc();
-        let measured = painter
-            .widget_at(&self.probe, top.on_axis(Axis::Y))
-            .len(Axis::X);
-        let len = measured.apply_leftover();
-        let px = painter.to_px(len, Axis::X);
-        // The range it actually branched on, said the way a container says
-        // one: pinning the window instead would redraw this widget on every
-        // resize, which is a fixture that never exercises reuse.
-        let threshold = Px::from_f32(self.threshold);
-        let holds = match px > threshold {
-            true => Holds::from(threshold + Px::STEP..=Px::MAX),
-            false => Holds::from(Px::MIN..=threshold),
-        };
-        painter.window_holds(Axis::X, holds.through(len));
-
-        let below = UiSpan::new(cut, painter.region_len(Axis::Y)).shifted_desc();
-        let place = below.on_axis(Axis::Y);
-        match px > threshold {
-            true => painter.widget_at(&self.wide, place),
-            false => painter.widget_at(&self.narrow, place),
-        };
-        Size::LEFTOVER
-    }
-
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::LEFTOVER)
-    }
-}
-
-pub struct Spanned {
-    pub id: WeakWidget<Span>,
-    /// Everything made for this span that it does not hold -- spares never
-    /// attached and children detached alike. A widget belongs to one parent,
-    /// and one that belongs to nobody still has to be held here: dropping
-    /// the last share of it frees its id for the next widget to be given,
-    /// which puts two trees out of step.
-    pub spares: Vec<StrongWidget>,
-    /// How many children it was grown with, before any edit.
-    pub grown: usize,
-}
-
-/// A tree described rather than built: [`plan`] turns a seed into one of
-/// these and [`build`] turns it into widgets, where growing did both at once.
-///
-/// The split is what makes a counterexample readable. A failing seed used to
-/// be the entire record of one, because a grower that makes widgets as it
-/// draws leaves nothing to take apart -- a shrinker could only grow its own
-/// trees and hope to meet the same shape, which in practice it does not. A
-/// plan is reduced by [`Plan::smaller`] and built again, so any seed that
-/// fails can be cut down until what is left is small enough to read.
-#[derive(Clone, Debug, PartialEq)]
-pub struct Plan {
-    pub kind: Kind,
-    /// The declared size this widget carries. Whoever grows a widget offers
-    /// it one and the offer is taken or declined; a second offer to the same
-    /// widget is dropped, because two rules on one widget would settle in the
-    /// order they were applied rather than in grow order.
-    pub size: Option<Lens>,
-    /// The alignment it carries, under the same one-offer rule.
-    pub align: Option<Aligns>,
-    /// Whether it was offered a movable region of its own and what it
-    /// answered. `Some(false)` is an offer declined, which still uses up the
-    /// one offer, where `None` is an offer never made.
-    pub region_node: Option<bool>,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum Kind {
-    /// Wrapped and unwrapped text, because only one of them reads the width
-    /// it is given and so only one has to be drawn again for a new one.
-    Wrapped,
-    OneLine,
-    Rect {
-        color: usize,
-        alpha: u8,
-    },
-    /// Scrolling reads the pixel length of its box, which nothing else here
-    /// does, and gives its child a box longer than its own.
-    Scroll {
-        axis: Axis,
-        inner: Box<Plan>,
-    },
-    /// All three sides are grown either way, so a tree that draws one has the
-    /// same ids as a tree that draws another.
-    Branch {
-        probe: Box<Plan>,
-        wide: Box<Plan>,
-        narrow: Box<Plan>,
-        threshold: f32,
-    },
-    /// Each side its own, since a padding that is the same all round hides
-    /// anything that treats one edge differently from another.
-    Pad {
-        padding: [i32; 4],
-        inner: Box<Plan>,
-    },
-    Stack {
-        children: Vec<Plan>,
-    },
-    Span {
-        dir: usize,
-        gap: i32,
-        /// Grown for this span, in the order they are made.
-        children: Vec<Plan>,
-        /// Grown beside it whether or not they end up in it, so the widget
-        /// after them has the same id in a tree that leaves them out as in
-        /// one that puts them in.
-        spares: Vec<Plan>,
-        /// Which of `children` then `spares` are actually in the span, and
-        /// in what order -- kept apart from the two lists above so that a
-        /// tree which detaches, attaches or reorders its children still
-        /// makes the same widgets in the same order, and two builds line up
-        /// index for index. Anything not named here is built and held
-        /// rather than dropped, since freeing an id hands it to the next
-        /// widget and puts two trees out of step.
-        order: Vec<usize>,
-    },
-}
-
-impl Plan {
-    /// A widget carrying nothing anybody has offered it yet.
-    fn bare(kind: Kind) -> Self {
-        Self {
-            kind,
-            size: None,
-            align: None,
-            region_node: None,
-        }
-    }
-
-    /// How many widgets building it makes, spares and detached children
-    /// included, since those are made either way.
-    pub fn size(&self) -> usize {
-        1 + match &self.kind {
-            Kind::Scroll { inner, .. } | Kind::Pad { inner, .. } => inner.size(),
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                ..
-            } => probe.size() + wide.size() + narrow.size(),
-            Kind::Stack { children } => children.iter().map(Plan::size).sum(),
-            Kind::Span {
-                children, spares, ..
-            } => children.iter().chain(spares).map(Plan::size).sum(),
-            _ => 0,
-        }
-    }
-
-    /// The trees to try instead of this one when reducing a counterexample,
-    /// biggest cut first: a shrinker takes the first that still fails, so
-    /// offering "this subtree alone" before "this subtree with one child
-    /// fewer" is what gets from six hundred widgets to six rather than to
-    /// five hundred and ninety.
-    ///
-    /// Every one of these is a tree the generator could have grown, so a
-    /// reduced plan is a counterexample in its own right rather than a
-    /// special case only the shrinker can make.
-    pub fn smaller(&self) -> Vec<Plan> {
-        let mut out = Vec::new();
-        // Standing in for the whole of it, which is the largest cut there is.
-        for kid in self.kids() {
-            out.push(kid.clone());
-        }
-        // Then what it carries, which costs nothing to put back if it was
-        // not the thing that mattered.
-        for dropped in [
-            self.region_node.map(|_| Plan {
-                region_node: None,
-                ..self.clone()
-            }),
-            self.align.map(|_| Plan {
-                align: None,
-                ..self.clone()
-            }),
-            self.size.map(|_| Plan {
-                size: None,
-                ..self.clone()
-            }),
-        ]
-        .into_iter()
-        .flatten()
-        {
-            out.push(dropped);
-        }
-        out.extend(self.kind.smaller().into_iter().map(|kind| Plan {
-            kind,
-            ..self.clone()
-        }));
-        out
-    }
-
-    /// Visits every widget in the order [`build`] makes them, so a count
-    /// kept by the visitor indexes the same widget as the matching [`Tree`]
-    /// vector does.
-    pub fn walk_mut(&mut self, at: &mut impl FnMut(&mut Plan)) {
-        match &mut self.kind {
-            Kind::Scroll { inner, .. } | Kind::Pad { inner, .. } => inner.walk_mut(at),
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                ..
-            } => {
-                probe.walk_mut(at);
-                wide.walk_mut(at);
-                narrow.walk_mut(at);
-            }
-            Kind::Stack { children } => {
-                for child in children {
-                    child.walk_mut(at);
-                }
-            }
-            Kind::Span {
-                children, spares, ..
-            } => {
-                for child in children.iter_mut().chain(spares) {
-                    child.walk_mut(at);
-                }
-            }
-            _ => {}
-        }
-        at(self);
-    }
-
-    /// The same tree with `edits` applied, by the indices the generator would
-    /// have used for them.
-    ///
-    /// [`plan`] resolves edits while drawing, which needs a seed. A scenario
-    /// needs them applied to a tree that already exists -- one it has built,
-    /// and one a shrinker may already have cut down, where no seed grows it
-    /// any more. Both routes take the same [`Edits`], so a case written
-    /// against one reads the same against the other.
-    pub fn edited(&self, edits: &Edits) -> Plan {
-        let mut out = self.clone();
-        let (mut sized, mut aligned, mut nodes, mut spans) = (0, 0, 0, 0);
-        out.walk_mut(&mut |plan| {
-            if let Kind::Span {
-                children,
-                spares,
-                order,
-                ..
-            } = &mut plan.kind
-            {
-                if let Some(edit) = edits.spans.get(&spans) {
-                    *order = span_edited(order, children.len(), spares.len(), edit);
-                }
-                spans += 1;
-            }
-            if let Kind::Branch { threshold, .. } = &mut plan.kind
-                && edits.fixed_branches
-            {
-                *threshold = f32::MIN;
-            }
-            if plan.size.is_some() {
-                if let Some(lens) = edits.sizes.get(&sized) {
-                    plan.size = Some(*lens);
-                }
-                sized += 1;
-            }
-            if plan.align.is_some() {
-                if let Some(align) = edits.aligns.get(&aligned) {
-                    plan.align = Some(*align);
-                }
-                aligned += 1;
-            }
-            if plan.region_node.is_some() {
-                if let Some(take) = edits.nodes.get(&nodes) {
-                    plan.region_node = Some(*take);
-                }
-                nodes += 1;
-            }
-        });
-        out
-    }
-
-    fn kids(&self) -> Vec<&Plan> {
-        match &self.kind {
-            Kind::Scroll { inner, .. } | Kind::Pad { inner, .. } => vec![inner],
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                ..
-            } => vec![probe, wide, narrow],
-            Kind::Stack { children } => children.iter().collect(),
-            Kind::Span { children, .. } => children.iter().collect(),
-            _ => Vec::new(),
-        }
-    }
-}
-
-impl Kind {
-    /// Simplifications of the shape alone, leaving what the widget carries to
-    /// [`Plan::smaller`]. Replacing a node with one of its children is there
-    /// rather than here, since it answers with a whole `Plan`.
-    fn smaller(&self) -> Vec<Kind> {
-        let mut out = Vec::new();
-        /// One child reduced at a time, rebuilt into the same shape. Every
-        /// answer has the same number of children as it was given, so it is
-        /// for the shapes whose child count is part of what they are.
-        fn reduced(kids: &[Plan], rebuild: &dyn Fn(Vec<Plan>) -> Kind) -> Vec<Kind> {
-            let mut out = Vec::new();
-            for (i, kid) in kids.iter().enumerate() {
-                for small in kid.smaller() {
-                    let mut next = kids.to_vec();
-                    next[i] = small;
-                    out.push(rebuild(next));
-                }
-            }
-            out
-        }
-
-        /// One child dropped, then [`reduced`]. For the shapes that hold any
-        /// number of children, where dropping one is the cut that matters.
-        fn each(kids: &[Plan], rebuild: &dyn Fn(Vec<Plan>) -> Kind) -> Vec<Kind> {
-            let mut out = Vec::new();
-            for i in 0..kids.len() {
-                if kids.len() > 1 {
-                    let mut less = kids.to_vec();
-                    less.remove(i);
-                    out.push(rebuild(less));
-                }
-            }
-            out.extend(reduced(kids, rebuild));
-            out
-        }
-        match self {
-            // The one leaf that reads the width it is given, then the one
-            // that does not, then the one that measures nothing at all.
-            Kind::Wrapped => out.push(Kind::OneLine),
-            Kind::OneLine => out.push(Kind::Rect {
-                color: 0,
-                alpha: 255,
-            }),
-            Kind::Rect { .. } => {}
-            Kind::Scroll { axis, inner } => {
-                let axis = *axis;
-                out.extend(each(std::slice::from_ref(inner), &|mut k| Kind::Scroll {
-                    axis,
-                    inner: Box::new(k.remove(0)),
-                }));
-            }
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                threshold,
-            } => {
-                let threshold = *threshold;
-                // All three sides stay: a branch is the widget that draws
-                // one of two on a measurement, and one with a side missing
-                // is a different widget rather than a smaller one. Dropping
-                // the branch for a side is offered by `Plan::smaller`.
-                let sides = [(**probe).clone(), (**wide).clone(), (**narrow).clone()];
-                out.extend(reduced(&sides, &|k| Kind::Branch {
-                    probe: Box::new(k[0].clone()),
-                    wide: Box::new(k[1].clone()),
-                    narrow: Box::new(k[2].clone()),
-                    threshold,
-                }));
-            }
-            Kind::Pad { padding, inner } => {
-                let padding = *padding;
-                if padding != [0; 4] {
-                    out.push(Kind::Pad {
-                        padding: [0; 4],
-                        inner: inner.clone(),
-                    });
-                }
-                out.extend(each(std::slice::from_ref(inner), &|mut k| Kind::Pad {
-                    padding,
-                    inner: Box::new(k.remove(0)),
-                }));
-            }
-            Kind::Stack { children } => {
-                out.extend(each(children, &|children| Kind::Stack { children }))
-            }
-            Kind::Span {
-                dir,
-                gap,
-                children,
-                spares,
-                order,
-            } => {
-                let (dir, gap, n) = (*dir, *gap, children.len());
-                let span = |children: Vec<Plan>, spares: Vec<Plan>, order: Vec<usize>| Kind::Span {
-                    dir,
-                    gap,
-                    children,
-                    spares,
-                    order,
-                };
-                let identity: Vec<usize> = (0..n).collect();
-                // An order the generator did not choose is part of the tree,
-                // so take that off before taking the tree apart.
-                if *order != identity {
-                    out.push(span(children.clone(), spares.clone(), identity));
-                }
-                // Spares exist to be attached; with none attached they are
-                // widgets the span never holds.
-                if !spares.is_empty() && order.iter().all(|&i| i < n) {
-                    out.push(span(children.clone(), Vec::new(), order.clone()));
-                }
-                if gap != 0 {
-                    out.push(Kind::Span {
-                        dir,
-                        gap: 0,
-                        children: children.clone(),
-                        spares: spares.clone(),
-                        order: order.clone(),
-                    });
-                }
-                for k in 0..n {
-                    if n > 1 {
-                        let mut less = children.clone();
-                        less.remove(k);
-                        // Everything after it shifts down, spares included,
-                        // since they are indexed past the children.
-                        let order = order
-                            .iter()
-                            .filter(|&&i| i != k)
-                            .map(|&i| if i > k { i - 1 } else { i })
-                            .collect();
-                        out.push(span(less, spares.clone(), order));
-                    }
-                }
-                for (i, kid) in children.iter().enumerate() {
-                    for small in kid.smaller() {
-                        let mut next = children.clone();
-                        next[i] = small;
-                        out.push(span(next, spares.clone(), order.clone()));
-                    }
-                }
-            }
-        }
-        out
-    }
-}
-
-/// A [`SpanEdit`] applied to the order a span already holds its children in.
-///
-/// `detach` names positions in that order and `attach` takes from the front
-/// of what the span is not holding, both of which is what a test changing a
-/// live span does -- so an edit means the same thing said to a tree and said
-/// to the plan it was built from. On a span nobody has edited the order is
-/// the children in the order they were grown, and this is then "leave these
-/// out and put that many spares on the end".
-fn span_edited(order: &[usize], children: usize, spares: usize, edit: &SpanEdit) -> Vec<usize> {
-    let mut detach = edit.detach.clone();
-    detach.sort_unstable();
-    detach.dedup();
-    let mut next: Vec<usize> = order
-        .iter()
-        .enumerate()
-        .filter(|(at, _)| !detach.contains(at))
-        .map(|(_, &which)| which)
-        .collect();
-    // What the span is not holding, in the order it hands them back: what it
-    // was already not holding first, in the order the widgets were made, and
-    // what this edit takes out after that, highest position first. A child
-    // just detached goes to the back rather than straight back in, which is
-    // what makes detaching one and attaching one a trade.
-    let mut free: Vec<usize> = (0..children + spares)
-        .filter(|i| !order.contains(i))
-        .collect();
-    free.extend(detach.iter().rev().filter_map(|&at| order.get(at).copied()));
-    next.extend(free.into_iter().take(edit.attach));
-    next
-}
-
-/// Plans the tree `seed` describes, `edits` replacing what it would otherwise
-/// have given the widgets that carry them.
-///
-/// The edits are resolved here rather than at build time, so that a plan is
-/// the whole of what a tree is and building one has nothing left to decide.
-pub fn plan(seed: u64, depth: usize, edits: &Edits) -> Plan {
-    let mut sow = Sow {
-        rng: Rng::new(seed),
-        edits,
-        sized: 0,
-        aligned: 0,
-        nodes: 0,
-        spans: 0,
-    };
-    sow.node(depth)
-}
-
-/// Grows the tree `seed` describes, `edits` replacing the declared sizes it
-/// would otherwise have given those wrappers.
-pub fn grow<Rsc: UiRsc + 'static>(
-    rsc: &mut Rsc,
-    seed: u64,
-    depth: usize,
-    edits: &Edits,
-) -> (StrongWidget, Tree) {
-    build(rsc, &plan(seed, depth, edits))
-}
-
-/// Draws a plan out of the random stream. Every draw happens in the order it
-/// always has and before the decision it feeds, including the decisions that
-/// are then dropped, because a seed has to keep meaning the same tree.
-struct Sow<'a> {
-    rng: Rng,
-    edits: &'a Edits,
-    sized: usize,
-    aligned: usize,
-    nodes: usize,
-    spans: usize,
-}
-
-impl Sow<'_> {
-    fn leaf(&mut self) -> Plan {
-        Plan::bare(match self.rng.below(4) {
-            0 => Kind::Wrapped,
-            1 => Kind::OneLine,
-            _ => {
-                let color = self.rng.below(COLORS.len());
-                let alpha = (self.rng.below(5) * 63) as u8;
-                Kind::Rect { color, alpha }
-            }
-        })
-    }
-
-    fn len(&mut self) -> Option<LayoutLen> {
-        match self.rng.below(4) {
-            0 => Some(LayoutLen::px(20.0 + self.rng.below(180) as f32)),
-            1 => Some(LayoutLen::LEFTOVER),
-            _ => None,
-        }
-    }
-
-    fn align(&mut self) -> Aligns {
-        let axis = |s: &mut Self| match s.rng.below(4) {
-            0 => None,
-            1 => Some(AxisAlign::NEG),
-            2 => Some(AxisAlign::CENTER),
-            _ => Some(AxisAlign::POS),
-        };
-        let (x, y) = (axis(self), axis(self));
-        // Aligning on neither axis leaves the branch unexercised.
-        match x.is_none() && y.is_none() {
-            true => [Some(AxisAlign::CENTER), y],
-            false => [x, y],
-        }
-    }
-
-    /// A declared size over half the tree, kept where a test can change it.
-    fn sized(&mut self, inner: &mut Plan) {
-        let take = self.rng.chance();
-        let lens = [self.len(), self.len()];
-        if !take || inner.size.is_some() {
-            return;
-        }
-        let idx = self.sized;
-        self.sized += 1;
-        inner.size = Some(self.edits.sizes.get(&idx).copied().unwrap_or(lens));
-    }
-
-    /// An alignment over some of the tree, kept where a test can change it.
-    fn aligned(&mut self, inner: &mut Plan) {
-        let align = self.align();
-        if inner.align.is_some() {
-            return;
-        }
-        let idx = self.aligned;
-        self.aligned += 1;
-        inner.align = Some(self.edits.aligns.get(&idx).copied().unwrap_or(align));
-    }
-
-    /// A movable region of its own over some of the tree. What it changes is
-    /// how a move is written and how long a primitive's chain is, neither of
-    /// which any other branch here varies.
-    fn noded(&mut self, inner: &mut Plan) {
-        let take = self.rng.below(4) == 0;
-        if inner.region_node.is_some() {
-            return;
-        }
-        let idx = self.nodes;
-        self.nodes += 1;
-        inner.region_node = Some(self.edits.nodes.get(&idx).copied().unwrap_or(take));
-    }
-
-    fn offered(&mut self, inner: &mut Plan) {
-        self.sized(inner);
-        self.noded(inner);
-    }
-
-    fn node(&mut self, depth: usize) -> Plan {
-        if depth == 0 {
-            return self.leaf();
-        }
-        let positioned = self.rng.below(6);
-        if positioned == 0 {
-            let mut inner = self.node(depth - 1);
-            self.offered(&mut inner);
-            let axis = if self.rng.chance() { Axis::X } else { Axis::Y };
-            return Plan::bare(Kind::Scroll {
-                axis,
-                inner: Box::new(inner),
-            });
-        }
-        if positioned == 2 {
-            let probe = self.node(depth - 1);
-            let wide = self.node(depth - 1);
-            let narrow = self.node(depth - 1);
-            // Drawn either way, so the side a fixed branch takes is still a
-            // side the generator chose -- and it consumes the same randomness
-            // as a measured one, so the two grow the same ids.
-            let measured = self.rng.below(500) as f32;
-            let threshold = match self.edits.fixed_branches {
-                true => f32::MIN,
-                false => measured,
-            };
-            return Plan::bare(Kind::Branch {
-                probe: Box::new(probe),
-                wide: Box::new(wide),
-                narrow: Box::new(narrow),
-                threshold,
-            });
-        }
-        if positioned == 1 {
-            // Carries an alignment and makes no widget of its own, so the
-            // plan for it is the child it aligned.
-            let mut inner = self.node(depth - 1);
-            self.offered(&mut inner);
-            self.aligned(&mut inner);
-            return inner;
-        }
-        if self.rng.below(4) == 0 {
-            let mut inner = self.node(depth - 1);
-            self.offered(&mut inner);
-            let side = |s: &mut Self| s.rng.below(24) as i32;
-            let padding = [side(self), side(self), side(self), side(self)];
-            return Plan::bare(Kind::Pad {
-                padding,
-                inner: Box::new(inner),
-            });
-        }
-        let grown = 2 + self.rng.below(3);
-        let mut children = Vec::with_capacity(grown);
-        for _ in 0..grown {
-            let mut child = self.node(depth - 1);
-            self.offered(&mut child);
-            children.push(child);
-        }
-        if self.rng.chance() {
-            return Plan::bare(Kind::Stack { children });
-        }
-        let spares: Vec<Plan> = (0..SPARES).map(|_| self.leaf()).collect();
-        let idx = self.spans;
-        self.spans += 1;
-        let edit = self.edits.spans.get(&idx).cloned().unwrap_or_default();
-        let dir = self.rng.below(4);
-        // A row takes the height it is given rather than its tallest child,
-        // which is a rule beside it. Derived from an existing choice and
-        // consuming no randomness: a seed must keep growing the same tree
-        // when the generator gains another configuration.
-        let gap = self.rng.below(3) as i32 * 4;
-        let grown: Vec<usize> = (0..children.len()).collect();
-        let order = span_edited(&grown, children.len(), spares.len(), &edit);
-        Plan::bare(Kind::Span {
-            dir,
-            gap,
-            children,
-            spares,
-            order,
-        })
-    }
-}
-
-/// Builds a plan's widgets in the order it describes them, so two builds of
-/// one plan line up index for index and their boxes can be compared.
-pub fn build<Rsc: UiRsc + 'static>(rsc: &mut Rsc, plan: &Plan) -> (StrongWidget, Tree) {
-    let mut build = Build {
-        rsc,
-        tree: Tree::default(),
-    };
-    let root = build.node(plan);
-    (root, build.tree)
-}
-
-struct Build<'a, Rsc> {
-    rsc: &'a mut Rsc,
-    tree: Tree,
-}
-
-impl<Rsc: UiRsc + 'static> Build<'_, Rsc> {
-    fn node(&mut self, plan: &Plan) -> StrongWidget {
-        let built = self.kind(&plan.kind);
-        let id = built.id();
-        if let Some(lens) = plan.size {
-            self.rsc
-                .ui_mut()
-                .widgets
-                .set_size_rules(id, lens[0], lens[1]);
-            self.tree.sized.push(id);
-        }
-        if let Some(align) = plan.align {
-            let widgets = &mut self.rsc.ui_mut().widgets;
-            for (axis, align) in [Axis::X, Axis::Y].into_iter().zip(align) {
-                widgets.set_alignment(id, axis, align.unwrap_or_default());
-            }
-            self.tree.aligned.push(id);
-        }
-        if let Some(take) = plan.region_node {
-            self.rsc.ui_mut().widgets.set_region_node(id, take);
-            self.tree.nodes.push(id);
-        }
-        built
-    }
-
-    fn kind(&mut self, kind: &Kind) -> StrongWidget {
-        let id: StrongWidget = match kind {
-            Kind::Wrapped => wtext(WORDS).size(16).wrap(true).add_strong(self.rsc),
-            Kind::OneLine => wtext("one line, overflowing whatever it is given")
-                .size(16)
-                .wrap(false)
-                .add_strong(self.rsc),
-            Kind::Rect { color, alpha } => rect(COLORS[*color].alpha(*alpha)).add_strong(self.rsc),
-            Kind::Scroll { axis, inner } => {
-                let inner = self.node(inner);
-                let id = Scroll::new(inner, *axis).add(self.rsc);
-                self.tree.scrolls.push(id);
-                self.tree.ids.push(id.id());
-                return id.add_strong(self.rsc);
-            }
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                threshold,
-            } => {
-                let probe = self.node(probe);
-                let wide = self.node(wide);
-                let narrow = self.node(narrow);
-                let id = Branch {
-                    probe,
-                    wide,
-                    narrow,
-                    threshold: *threshold,
-                }
-                .add(self.rsc);
-                self.tree.ids.push(id.id());
-                return id.add_strong(self.rsc);
-            }
-            Kind::Pad { padding, inner } => {
-                let inner = self.node(inner);
-                let [left, right, top, bottom] = padding.map(Px::from_int);
-                let padding = Padding {
-                    left,
-                    right,
-                    top,
-                    bottom,
-                };
-                Pad { padding, inner }.add_strong(self.rsc)
-            }
-            Kind::Stack { children } => {
-                let children = children.iter().map(|c| self.node(c)).collect();
-                Stack {
-                    children,
-                    size: StackSize::Child(0),
-                }
-                .add_strong(self.rsc)
-            }
-            Kind::Span {
-                dir,
-                gap,
-                children,
-                spares,
-                order,
-            } => {
-                let grown = children.len();
-                // Every one of them is made, in this order, whether or not
-                // the span ends up holding it.
-                let made: Vec<StrongWidget> = children
-                    .iter()
-                    .chain(spares)
-                    .map(|c| self.node(c))
-                    .collect();
-                let mut left: Vec<Option<StrongWidget>> = made.into_iter().map(Some).collect();
-                let children: Vec<StrongWidget> = order
-                    .iter()
-                    .filter_map(|&i| left.get_mut(i).and_then(Option::take))
-                    .collect();
-                // What the span does not hold is still held here: dropping
-                // the last share of a widget frees its id for the next one
-                // to be given, which puts two trees out of step.
-                let spares: Vec<StrongWidget> = left.into_iter().flatten().collect();
-                let dir = [Dir::RIGHT, Dir::DOWN, Dir::LEFT, Dir::UP][*dir % 4];
-                let id = Span {
-                    children,
-                    dir,
-                    gap: Px::from_int(*gap),
-                }
-                .add(self.rsc);
-                if dir.axis == Axis::X {
-                    self.rsc
-                        .widgets_mut()
-                        .set_size_rules(id, None, Some(LayoutLen::rel(1.0)));
-                }
-                self.tree.ids.push(id.id());
-                self.tree.spans.push(Spanned { id, spares, grown });
-                return id.add_strong(self.rsc);
-            }
-        };
-        self.tree.ids.push(id.id());
-        id
-    }
-}

src/render/data.rs

@@ -0,0 +1,34 @@
+use crate::primitive::UIRegion;
+use wgpu::VertexAttribute;
+
+#[repr(C)]
+#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
+pub struct PrimitiveInstance {
+    pub region: UIRegion,
+    pub ptr: u32,
+}
+
+#[repr(C)]
+#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable, Default)]
+pub struct WindowUniform {
+    pub width: f32,
+    pub height: f32,
+}
+
+impl PrimitiveInstance {
+    const ATTRIBS: [VertexAttribute; 5] = wgpu::vertex_attr_array![
+        0 => Float32x2,
+        1 => Float32x2,
+        2 => Float32x2,
+        3 => Float32x2,
+        4 => Uint32,
+    ];
+
+    pub fn desc() -> wgpu::VertexBufferLayout<'static> {
+        wgpu::VertexBufferLayout {
+            array_stride: std::mem::size_of::<Self>() as wgpu::BufferAddress,
+            step_mode: wgpu::VertexStepMode::Instance,
+            attributes: &Self::ATTRIBS,
+        }
+    }
+}

src/render/mod.rs

@@ -0,0 +1,184 @@
+use crate::{
+    render::{data::PrimitiveInstance, util::ArrBuf},
+    UI,
+};
+use data::WindowUniform;
+use wgpu::{
+    util::{BufferInitDescriptor, DeviceExt},
+    *,
+};
+use winit::dpi::PhysicalSize;
+
+mod data;
+pub mod primitive;
+mod util;
+
+const SHAPE_SHADER: &str = include_str!("./shader.wgsl");
+
+pub struct UIRenderNode {
+    bind_group_layout: BindGroupLayout,
+    bind_group: BindGroup,
+    pipeline: RenderPipeline,
+
+    window_buffer: Buffer,
+    instance: ArrBuf<PrimitiveInstance>,
+    data: ArrBuf<u32>,
+}
+
+impl UIRenderNode {
+    pub fn draw<'a>(&'a self, pass: &mut RenderPass<'a>) {
+        pass.set_pipeline(&self.pipeline);
+        pass.set_bind_group(0, &self.bind_group, &[]);
+        if self.instance.len() != 0 {
+            pass.set_vertex_buffer(0, self.instance.buffer.slice(..));
+            pass.draw(0..4, 0..self.instance.len() as u32);
+        }
+    }
+
+    pub fn update(&mut self, device: &Device, queue: &Queue, ui: &UI) {
+        let primitives = ui.to_primitives();
+        self.instance.update(device, queue, &primitives.instances);
+        self.data.update(device, queue, &primitives.data);
+        self.bind_group = Self::bind_group(
+            device,
+            &self.bind_group_layout,
+            &self.window_buffer,
+            &self.data.buffer,
+        )
+    }
+
+    pub fn resize(&mut self, size: &PhysicalSize<u32>, queue: &Queue) {
+        let slice = &[WindowUniform {
+            width: size.width as f32,
+            height: size.height as f32,
+        }];
+        queue.write_buffer(&self.window_buffer, 0, bytemuck::cast_slice(slice));
+    }
+
+    pub fn new(device: &Device, config: &SurfaceConfiguration) -> Self {
+        let shader = device.create_shader_module(ShaderModuleDescriptor {
+            label: Some("UI Shape Shader"),
+            source: ShaderSource::Wgsl(SHAPE_SHADER.into()),
+        });
+
+        let window_uniform = WindowUniform::default();
+        let window_buffer = device.create_buffer_init(&BufferInitDescriptor {
+            label: Some("Camera Buffer"),
+            contents: bytemuck::cast_slice(&[window_uniform]),
+            usage: BufferUsages::UNIFORM | BufferUsages::COPY_DST,
+        });
+
+        let instance = ArrBuf::new(
+            device,
+            BufferUsages::VERTEX | BufferUsages::COPY_DST,
+            "instance",
+        );
+        let data = ArrBuf::new(
+            device,
+            BufferUsages::STORAGE | BufferUsages::COPY_DST,
+            "data",
+        );
+
+        let bind_group_layout = device.create_bind_group_layout(&BindGroupLayoutDescriptor {
+            entries: &[
+                BindGroupLayoutEntry {
+                    binding: 0,
+                    visibility: ShaderStages::VERTEX,
+                    ty: BindingType::Buffer {
+                        ty: BufferBindingType::Uniform,
+                        has_dynamic_offset: false,
+                        min_binding_size: None,
+                    },
+                    count: None,
+                },
+                BindGroupLayoutEntry {
+                    binding: 1,
+                    visibility: ShaderStages::FRAGMENT,
+                    ty: BindingType::Buffer {
+                        ty: BufferBindingType::Storage { read_only: true },
+                        has_dynamic_offset: false,
+                        min_binding_size: None,
+                    },
+                    count: None,
+                },
+            ],
+            label: Some("camera_bind_group_layout"),
+        });
+
+        let bind_group = Self::bind_group(device, &bind_group_layout, &window_buffer, &data.buffer);
+
+        let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
+            label: Some("UI Shape Pipeline Layout"),
+            bind_group_layouts: &[&bind_group_layout],
+            push_constant_ranges: &[],
+        });
+        let pipeline = device.create_render_pipeline(&RenderPipelineDescriptor {
+            label: Some("UI Shape Pipeline"),
+            layout: Some(&pipeline_layout),
+            vertex: VertexState {
+                module: &shader,
+                entry_point: Some("vs_main"),
+                buffers: &[PrimitiveInstance::desc()],
+                compilation_options: Default::default(),
+            },
+            fragment: Some(FragmentState {
+                module: &shader,
+                entry_point: Some("fs_main"),
+                targets: &[Some(ColorTargetState {
+                    format: config.format,
+                    blend: Some(BlendState::ALPHA_BLENDING),
+                    write_mask: ColorWrites::ALL,
+                })],
+                compilation_options: Default::default(),
+            }),
+            primitive: PrimitiveState {
+                topology: PrimitiveTopology::TriangleStrip,
+                strip_index_format: None,
+                front_face: FrontFace::Cw,
+                cull_mode: Some(Face::Back),
+                polygon_mode: PolygonMode::Fill,
+                unclipped_depth: false,
+                conservative: false,
+            },
+            depth_stencil: None,
+            multisample: MultisampleState {
+                count: 1,
+                mask: !0,
+                alpha_to_coverage_enabled: false,
+            },
+            multiview: None,
+            cache: None,
+        });
+
+        Self {
+            bind_group_layout,
+            bind_group,
+            pipeline,
+            window_buffer,
+            instance,
+            data,
+        }
+    }
+
+    pub fn bind_group(
+        device: &Device,
+        layout: &BindGroupLayout,
+        window_buffer: &Buffer,
+        data: &Buffer,
+    ) -> BindGroup {
+        device.create_bind_group(&BindGroupDescriptor {
+            layout,
+            entries: &[
+                BindGroupEntry {
+                    binding: 0,
+                    resource: window_buffer.as_entire_binding(),
+                },
+                BindGroupEntry {
+                    binding: 1,
+                    resource: data.as_entire_binding(),
+                },
+            ],
+            label: Some("ui_bind_group"),
+        })
+    }
+}

src/render/primitive/color.rs

@@ -0,0 +1,47 @@
+#![allow(clippy::multiple_bound_locations)]
+
+#[repr(C)]
+#[derive(Clone, Copy, bytemuck::Zeroable)]
+pub struct Color<T: ColorNum> {
+    r: T,
+    g: T,
+    b: T,
+    a: T,
+}
+
+impl<T: ColorNum> Color<T> {
+    pub const BLACK: Self = Self::rgb(T::MIN, T::MIN, T::MIN);
+    pub const WHITE: Self = Self::rgb(T::MAX, T::MAX, T::MAX);
+
+    pub const RED: Self = Self::rgb(T::MAX, T::MIN, T::MIN);
+    pub const ORANGE: Self = Self::rgb(T::MAX, T::MID, T::MIN);
+    pub const YELLOW: Self = Self::rgb(T::MAX, T::MAX, T::MIN);
+    pub const LIME: Self = Self::rgb(T::MID, T::MAX, T::MIN);
+    pub const GREEN: Self = Self::rgb(T::MIN, T::MAX, T::MIN);
+    pub const CYAN: Self = Self::rgb(T::MIN, T::MAX, T::MAX);
+    pub const BLUE: Self = Self::rgb(T::MIN, T::MIN, T::MAX);
+    pub const MAGENTA: Self = Self::rgb(T::MAX, T::MIN, T::MAX);
+}
+
+impl<T: ColorNum> Color<T> {
+    pub const fn new(r: T, g: T, b: T, a: T) -> Self {
+        Self { r, g, b, a }
+    }
+    pub const fn rgb(r: T, g: T, b: T) -> Self {
+        Self { r, g, b, a: T::MAX }
+    }
+}
+
+pub trait ColorNum {
+    const MIN: Self;
+    const MID: Self;
+    const MAX: Self;
+}
+
+impl ColorNum for u8 {
+    const MIN: Self = u8::MIN;
+    const MID: Self = u8::MAX / 2;
+    const MAX: Self = u8::MAX;
+}
+
+unsafe impl bytemuck::Pod for Color<u8> {}

src/render/primitive/def.rs

@@ -0,0 +1,14 @@
+use crate::primitive::{Color, PrimitiveData};
+
+#[repr(C)]
+#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
+pub struct RoundedRectData {
+    pub color: Color<u8>,
+    pub radius: f32,
+    pub thickness: f32,
+    pub inner_radius: f32,
+}
+
+impl PrimitiveData for RoundedRectData {
+    const DISCRIM: u32 = 0;
+}

src/render/primitive/format.rs

@@ -0,0 +1,97 @@
+use crate::primitive::{point::point, Point};
+
+#[repr(C)]
+#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable, Default)]
+pub struct UIPos {
+    pub anchor: Point,
+    pub offset: Point,
+}
+
+impl UIPos {
+    pub const fn anchor_offset(anchor_x: f32, anchor_y: f32, offset_x: f32, offset_y: f32) -> Self {
+        Self {
+            anchor: point(anchor_x, anchor_y),
+            offset: point(offset_x, offset_y),
+        }
+    }
+
+    pub const fn top_left() -> Self {
+        Self::anchor_offset(0.0, 0.0, 0.0, 0.0)
+    }
+
+    pub const fn bottom_right() -> Self {
+        Self::anchor_offset(1.0, 1.0, 0.0, 0.0)
+    }
+
+    pub const fn within(&self, region: &UIRegion) -> UIPos {
+        let range = region.bot_right.anchor - region.top_left.anchor;
+        let region_offset = region
+            .top_left
+            .offset
+            .lerp(region.bot_right.offset, self.anchor);
+        UIPos {
+            anchor: region.top_left.anchor + self.anchor * range,
+            offset: self.offset + region_offset,
+        }
+    }
+
+    pub fn axis_mut(&mut self, axis: Axis) -> UIPosAxisView<'_> {
+        match axis {
+            Axis::X => UIPosAxisView {
+                anchor: &mut self.anchor.x,
+                offset: &mut self.offset.x,
+            },
+            Axis::Y => UIPosAxisView {
+                anchor: &mut self.anchor.y,
+                offset: &mut self.offset.y,
+            },
+        }
+    }
+}
+
+pub struct UIPosAxisView<'a> {
+    pub anchor: &'a mut f32,
+    pub offset: &'a mut f32,
+}
+
+#[repr(C)]
+#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
+pub struct UIRegion {
+    pub top_left: UIPos,
+    pub bot_right: UIPos,
+}
+
+impl UIRegion {
+    pub const fn full() -> Self {
+        Self {
+            top_left: UIPos::top_left(),
+            bot_right: UIPos::bottom_right(),
+        }
+    }
+    pub fn within(&self, parent: &Self) -> Self {
+        Self {
+            top_left: self.top_left.within(parent),
+            bot_right: self.bot_right.within(parent),
+        }
+    }
+    pub fn select(&mut self, inner: &Self) {
+        *self = inner.within(self);
+    }
+    pub fn axis_mut(&mut self, axis: Axis) -> UIRegionAxisView<'_> {
+        UIRegionAxisView {
+            top_left: self.top_left.axis_mut(axis),
+            bot_right: self.bot_right.axis_mut(axis),
+        }
+    }
+}
+
+pub struct UIRegionAxisView<'a> {
+    pub top_left: UIPosAxisView<'a>,
+    pub bot_right: UIPosAxisView<'a>,
+}
+
+#[derive(Copy, Clone)]
+pub enum Axis {
+    X,
+    Y,
+}

src/render/primitive/mod.rs

@@ -0,0 +1,63 @@
+mod color;
+mod def;
+mod format;
+mod point;
+
+pub use color::*;
+pub use def::*;
+pub use format::*;
+pub use point::*;
+
+use crate::{render::data::PrimitiveInstance, WidgetId, Widgets};
+use bytemuck::Pod;
+
+#[derive(Default)]
+pub struct Primitives {
+    pub instances: Vec<PrimitiveInstance>,
+    pub data: Vec<u32>,
+}
+
+pub struct Painter<'a> {
+    nodes: &'a Widgets,
+    primitives: Primitives,
+    pub region: UIRegion,
+}
+
+/// NOTE: Self must have at least u32 alignment
+pub trait PrimitiveData: Pod {
+    const DISCRIM: u32;
+}
+
+impl<'a> Painter<'a> {
+    pub fn new(nodes: &'a Widgets) -> Self {
+        Self {
+            nodes,
+            primitives: Primitives::default(),
+            region: UIRegion::full(),
+        }
+    }
+    pub fn write<Data: PrimitiveData>(&mut self, data: Data) {
+        let ptr = self.primitives.data.len() as u32;
+        let region = self.region;
+        self.primitives
+            .instances
+            .push(PrimitiveInstance { region, ptr });
+        self.primitives.data.push(Data::DISCRIM);
+        self.primitives
+            .data
+            .extend_from_slice(bytemuck::cast_slice::<_, u32>(&[data]));
+    }
+    pub fn draw(&mut self, node: &WidgetId) {
+        self.nodes.get(node).draw(self);
+    }
+    pub fn draw_within(&mut self, node: &WidgetId, region: UIRegion) {
+        let old = self.region;
+        self.region.select(&region);
+        self.draw(node);
+        self.region = old;
+    }
+
+    pub fn finish(self) -> Primitives {
+        self.primitives
+    }
+}

src/render/primitive/point.rs

@@ -0,0 +1,84 @@
+use std::ops::*;
+
+#[repr(C)]
+#[derive(Clone, Copy, PartialEq, Default, bytemuck::Pod, bytemuck::Zeroable)]
+pub struct Point {
+    pub x: f32,
+    pub y: f32,
+}
+
+pub const fn point(x: f32, y: f32) -> Point {
+    Point::new(x, y)
+}
+
+impl Point {
+    pub const fn new(x: f32, y: f32) -> Self {
+        Self { x, y }
+    }
+
+    pub const fn lerp(self, to: Self, amt: impl const Into<Self>) -> Self {
+        let amt = amt.into();
+        Self {
+            x: lerp(self.x, to.x, amt.x),
+            y: lerp(self.y, to.y, amt.y),
+        }
+    }
+}
+
+const fn lerp(x: f32, y: f32, amt: f32) -> f32 {
+    (1.0 - amt) * x + y * amt
+}
+
+impl const From<f32> for Point {
+    fn from(v: f32) -> Self {
+        Self { x: v, y: v }
+    }
+}
+
+macro_rules! impl_op_inner {
+    ($op:ident $fn:ident $opa:ident $fna:ident) => {
+        impl const $op for Point {
+            type Output = Self;
+
+            fn $fn(self, rhs: Self) -> Self::Output {
+                Self {
+                    x: self.x.$fn(rhs.x),
+                    y: self.y.$fn(rhs.y),
+                }
+            }
+        }
+        impl $opa for Point {
+            fn $fna(&mut self, rhs: Self) {
+                self.x.$fna(rhs.x);
+                self.y.$fna(rhs.y);
+            }
+        }
+        impl const $op<f32> for Point {
+            type Output = Self;
+
+            fn $fn(self, rhs: f32) -> Self::Output {
+                Self {
+                    x: self.x.$fn(rhs),
+                    y: self.y.$fn(rhs),
+                }
+            }
+        }
+        impl $opa<f32> for Point {
+            fn $fna(&mut self, rhs: f32) {
+                self.x.$fna(rhs);
+                self.y.$fna(rhs);
+            }
+        }
+    };
+}
+
+macro_rules! impl_op {
+    ($op:ident $fn:ident) => {
+        impl_op_inner!($op $fn ${concat($op,Assign)} ${concat($fn,_assign)});
+    };
+}
+
+impl_op!(Add add);
+impl_op!(Sub sub);
+impl_op!(Mul mul);
+impl_op!(Div div);