Iris: "the organization of the rust rewrite is a mess right now... there shouldn't be anything related to the app inside of iris. Iris is supposed to be the UI framework alone." And, on the crate count: "I'm confused why the app only code needs more than one crate though." Nine cargo workspaces become three, and the port's project code -- which sat in five places, four of them inside the framework -- becomes one crate, `ai-app`, in `app-rust/`: client-core -> app-rust/src/client iris/transcript-ui -> app-rust/src/ui iris/transcript-fixture -> app-rust/src/ui/fixture.rs + tests/ + touch/ iris/desktop-app -> app-rust/src/desktop + src/bin_desktop.rs iris/android-app -> app-rust/src/android + android-project/ android-shell -> app-rust/src/shell iris/ keeps core, macro, the iris crate, tabs-ui and rig-input, and now mentions no session, transcript, setup or server anywhere. Only two of the old splits had a reason that survived reading. event-model stays a crate at the repo root because server/ depends on it too, so a crate is what makes the backend and the app agree by construction. The two Android .so names looked like a hard constraint -- a package produces one library artifact -- until P2 turned out to already plan merging those two Android apps into one; both faces now come out of libai_app.so, picked apart by features so `--no-default-features --features shell` keeps wgpu, parley and iris out of the Compose app's APK. docs/RUST.md's "One app crate" has the rest, including what each remaining feature is for. DECISIONS.md and SUBAGENTS.md move into docs/ with everything else. Verified: ./run-tests.sh and `cd iris && cargo test` green, clippy and fmt clean in all five workspaces, `cargo ndk -t x86_64` links libai_app.so, build-apk.sh produces an APK that installs and launches on this checkout's emulator (Gl ... virgl, as expected), and the phone-sized headless screenshot renders the transcript unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
108 lines
3.4 KiB
Rust
108 lines
3.4 KiB
Rust
use iris_core::*;
|
|
use iris_macro::*;
|
|
use std::sync::Arc;
|
|
|
|
use crate::task::{TaskCtx, TaskUpdate, Tasks};
|
|
|
|
/// A field's Enter key (without a shift, in a multi-line field). Backend
|
|
/// input handling raises it directly rather than through `on`, since a
|
|
/// field does not know ahead of time whether anything is listening.
|
|
#[derive(Eq, PartialEq, Hash, Clone)]
|
|
pub struct Submit;
|
|
impl Event for Submit {}
|
|
|
|
/// A field's content changed as a result of input the backend applied
|
|
/// directly to it (a keystroke, an IME commit) rather than through a
|
|
/// widget event handler.
|
|
#[derive(Eq, PartialEq, Hash, Clone)]
|
|
pub struct Edited;
|
|
impl Event for Edited {}
|
|
|
|
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>;
|
|
/// No `Data: Send` bound, deliberately: the registered handler below
|
|
/// takes `|_, rsc|` and the event's data never crosses into the
|
|
/// spawned future -- `AsyncEventIdCtx` carries the widget id and the
|
|
/// task handle and nothing else. The bound used to be here anyway, and
|
|
/// it was the whole reason `CursorData`'s pointer state was behind a
|
|
/// `Mutex` rather than owned by the input handler (Iris, 2026-09-08:
|
|
/// never reach for a lock first).
|
|
fn task_on<E: EventLike, F: AsyncWidgetEventFn<Rsc, WL::Widget>>(
|
|
self,
|
|
event: E,
|
|
f: F,
|
|
) -> impl WidgetIdFn<Rsc, WL::Widget>
|
|
where 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);
|
|
}
|
|
}
|