Five orthogonal capabilities land together because they share the same `try_run` plumbing: an optional global is bound at startup, a piece of state is added to `AppData`, the run-loop iteration drains an inbox / pushes a frame snapshot, and the public surface gains a small set of opt-in `App` hooks. Nothing here breaks an existing app — every new path degrades to a no-op when the compositor does not advertise the relevant global or when the platform adapter cannot start. AT-SPI2 accessibility via AccessKit. A new `src/a11y/` module owns the platform adapter and the inbound `ActionRequest` channel. `A11yState::try_new` constructs an `accesskit_unix::Adapter`; when the AT-SPI2 daemon is not on the session bus (headless CI, locked-down compositors) the constructor returns `None` and the rest of the pipeline runs unchanged. After every successful `draw_frame`, the run loop builds a fresh `accesskit::TreeUpdate` from `widget_rects` and pushes it through the adapter — main surface plus every visible overlay, each translated to global coordinates via `surface_offset_for` so screen readers report positions in the same frame the user sees. Buttons / toggles / checkboxes / radios / list items / sliders / text edits map to the matching `Role`s; `Click` and `Focus` actions are advertised on every interactive node; inbound action requests are drained at the top of each iteration and translated into a synthetic press / focus on the matching widget. The integration is documented as best-effort in `docs/architecture.md` under "Known gaps and non-goals": hierarchical nesting, per-widget accessible names, live regions and `Action::SetValue` are listed as the natural follow-ups that the foundation now supports but does not yet wire. Cross-application clipboard via `wl_data_device_manager`. A new `src/event_loop/data_device.rs` bridges the existing process-local `clipboard: String` to the Wayland selection. Outbound (Ctrl+C / Cut): after the local clipboard is populated, `publish_clipboard_selection` creates a `CopyPasteSource` offering `text/plain;charset=utf-8` and installs it as the seat's selection; `DataSourceHandler::send` writes the cached string into the fd the peer hands us. Inbound (Ctrl+V from another app): `DataDeviceHandler::selection` asks for the offered text via `WlDataOffer::receive`, spawns a tiny worker thread to drain the read pipe with a 16 MiB cap to prevent paste-bomb DoS, and posts the result back through an `mpsc::Sender` that the run loop drains each iteration into `data.clipboard`. The `clipboard:` field's doc-comment is updated to reflect the new behaviour: process-local when the compositor does not advertise the global, synchronised with the seat selection otherwise. External drag-and-drop reception. The same `data_device` module handles `DragOffer` enter / motion / leave / drop_performed: `on_drop_motion( x, y )` fires while the drag hovers over the surface, `on_drop_leave()` when it withdraws without dropping, and `on_drop_received( x, y, mime, text )` when an external payload (`text/uri-list`, `text/plain`, …) is released on top of an ltk window. The receive path reuses the same worker-thread / channel pattern as the clipboard so the run loop never blocks on the read fd. Three new `App` hooks expose the events with no-op defaults; apps that ignore them get the previous behaviour. `xdg-activation-v1`. The global is bound optionally; when it is present, `try_run` reads `$XDG_ACTIVATION_TOKEN` from the environment, removes it immediately (single-use; preventing leaks into child processes) and stashes it on `AppData::activation_token_pending`. After the first successful configure of the main surface — the earliest point at which `xdg_activation_v1.activate` is meaningful — the token is consumed once and the surface raised to focus. Compositors without the global leave `activation_state` as `None` and the inbound path silently degrades. An `App::request_activation_token` outbound path is reserved on the trait but not yet exercised here. HarfBuzz shaping. A new `src/text_shaping.rs::shape_line` drives both renderers: the logical-order string is run through `unicode-bidi`, split into per-font sub-runs, and shaped through `rustybuzz`. Each `PositionedGlyph` carries the per-font `glyph_id`, the visual advance and the ink offsets — exactly what `fontdue::Font::rasterize_indexed` needs to render Arabic connected forms, Devanagari clusters and CJK shaped glyphs correctly. The GLES atlas is re-keyed on `(glyph_id, size_bits, font_id)` so glyphs from different fonts at the same size no longer collide, and the atlas format is selected per ES profile (`GL_R8` / `GL_RED` on ES3, `GL_LUMINANCE` on ES2) — the fragment shader samples `.r` for both, since `GL_LUMINANCE` replicates the coverage byte into `.r=.g=.b`. Software path follows the same key. New `Cargo.toml` deps: `unicode-bidi = "0.3"`, `rustybuzz = "0.14"`. Multi-touch hooks. `App::on_touch_down / on_touch_move / on_touch_up( id, x, y )` expose the raw `wl_touch.id` of every secondary finger. The first finger to land remains the *primary slot* and is fed through the regular gesture machine (`on_pointer_*`, swipe, scroll, long-press, drag-and-drop). Every additional finger fires the new callbacks instead, leaving the existing single-slot behaviour untouched for apps that do not override them. This is the substrate for app-defined pinch-zoom / two-finger pan; the toolkit itself does not yet ship a built-in pinch gesture (called out in the same "Known gaps" doc section). `event_loop::frame` extracted from `draw/mod.rs`. The `draw_frame` orchestrator and its per-format SHM helper (`pick_shm_format`) move into `src/event_loop/frame.rs`, leaving `draw/` strictly responsible for per-surface paint primitives. The import in `event_loop/run.rs` is rewritten accordingly; `draw/mod.rs` shrinks from 192-line orchestrator to a thin module index. Overlay teardown safety. `AppData::discard_overlay( id )` synchronously removes a destroyed overlay from the map and rewrites every per-device focus that pointed at it (pointer, keyboard, every touch slot), migrating an in-flight long-press drag to the main surface the same way `reconcile_overlays` does. Used by the compositor-driven destruction paths (`PopupHandler::done`, `LayerShellHandler::closed`) where waiting for the next reconcile would leave a window in which `surface()` / `surface_mut()` panic. The non-panicking siblings `try_surface` / `try_surface_mut` are added for callers on async dispatch paths (IME `Done`, tooltip arm) that may race a teardown. Miscellaneous. CI: `master` → `main` to match the actual default branch. `Makefile` adds `cargo run --example dialog` to the examples target. `src/lib.rs` re-exports `widget::scroll::ScrollAxis` so apps can configure a `scroll()` axis without reaching into a `pub(crate)` module. `Cargo.toml` adds `accesskit = "0.17"` and `accesskit_unix = "0.13"`. `docs/architecture.md` gains the "Known gaps and non-goals" section that enumerates the new capabilities, what still ships flat, and what is deferred (per-widget a11y labels, primary selection, intra-process multi-touch gestures, `wp_fractional_scale_v1`).
310 lines
9.8 KiB
Rust
310 lines
9.8 KiB
Rust
// SPDX-License-Identifier: LGPL-2.1-only
|
|
// Copyright (C) 2026 Liberux Labs, S. L. <info@liberux.net>
|
|
|
|
use crate::theme::Paint;
|
|
use crate::types::{ Color, Corners };
|
|
use crate::render::Canvas;
|
|
use super::Element;
|
|
|
|
#[ cfg( test ) ]
|
|
mod tests;
|
|
|
|
/// A transparent wrapper that adds a background color or a themed
|
|
/// surface and padding around any child [`Element`].
|
|
///
|
|
/// Does not consume a flat index — it is invisible to focus/hit-testing.
|
|
///
|
|
/// Two background styles. [`Container::background`] paints a flat
|
|
/// colour rounded rect. [`Container::surface`] names a theme slot (a
|
|
/// `"type": "surface"` entry in the active `ThemeDocument`) which
|
|
/// resolves at paint time to a full Glass stack: gradient / solid
|
|
/// fill, outer drop shadow, inset shadows, backdrop blur. `surface`
|
|
/// takes precedence when both are set, and degrades to `background`
|
|
/// (or to no background at all, when neither is set) if the slot is
|
|
/// absent from the active theme — third-party themes that do not
|
|
/// ship the named surface still render the content, just without
|
|
/// the Glass chrome.
|
|
///
|
|
/// ```rust,no_run
|
|
/// # use ltk::{ column, container, row, text, Color, Element };
|
|
/// # #[ derive( Clone ) ] enum Msg {}
|
|
/// # fn _ex(
|
|
/// # icon: Element<Msg>,
|
|
/// # title: Element<Msg>,
|
|
/// # subtitle: Element<Msg>,
|
|
/// # ) -> ( Element<Msg>, Element<Msg> ) {
|
|
/// // Flat colour
|
|
/// let flat = container( text( "Hello" ) )
|
|
/// .background( Color::rgb( 0.2, 0.2, 0.25 ) )
|
|
/// .padding( 12.0 );
|
|
///
|
|
/// // Glass card backed by a named theme surface
|
|
/// let card = container(
|
|
/// row()
|
|
/// .push( icon )
|
|
/// .push( column().push( title ).push( subtitle ) )
|
|
/// )
|
|
/// .surface( "surface-card" )
|
|
/// .radius( 32.0 )
|
|
/// .padding_h( 16.5 )
|
|
/// .padding_v( 24.0 );
|
|
/// # ( flat.into(), card.into() )
|
|
/// # }
|
|
/// ```
|
|
pub struct Container<Msg: Clone>
|
|
{
|
|
pub child: Box<Element<Msg>>,
|
|
/// Optional background paint — flat colour, linear or radial
|
|
/// gradient. Constructed via [`Container::background`], which
|
|
/// accepts anything `Into<Paint>` (a plain [`Color`] gets
|
|
/// promoted to [`Paint::Solid`] via the trait impl).
|
|
pub background: Option<Paint>,
|
|
/// Slot id of a themed surface (resolved via
|
|
/// [`crate::theme::resolve_surface`]). When set, takes precedence
|
|
/// over `background` and paints the full Glass stack instead of a
|
|
/// flat colour fill.
|
|
pub surface: Option<String>,
|
|
/// Per-corner radii applied to every painted layer of the
|
|
/// container chrome — flat fill, themed surface (gradient + outer
|
|
/// shadows + insets + backdrop blur). Stored as [`Corners`] so
|
|
/// callers can pin the rounded shape to one or two corners (a
|
|
/// panel pinned to the screen bottom, a side panel pinned to the
|
|
/// left edge, …) without hitting the renderer with an offset
|
|
/// trick.
|
|
pub corners: Corners,
|
|
/// Padding on the top edge in logical px — gap between the
|
|
/// container's top boundary and its child.
|
|
pub pad_top: f32,
|
|
/// Padding on the right edge in logical px.
|
|
pub pad_right: f32,
|
|
/// Padding on the bottom edge in logical px.
|
|
pub pad_bottom: f32,
|
|
/// Padding on the left edge in logical px.
|
|
pub pad_left: f32,
|
|
pub opacity: f32,
|
|
/// Optional `( color, width_px )` border stroke painted around the
|
|
/// container's rounded rectangle, after the fill / surface and
|
|
/// before the child draws. `None` leaves the chrome flat.
|
|
pub border: Option<( Color, f32 )>,
|
|
/// Optional hard cap on the container's outer width. When the parent
|
|
/// offers more, the container reports its preferred width as
|
|
/// `min( offered, max_width )` so it does not stretch to fill.
|
|
/// Mirrors the same flag on [`Column`](crate::layout::column::Column)
|
|
/// and [`Row`](crate::layout::row::Row).
|
|
pub max_width: Option<f32>,
|
|
/// When true, the contents of this container are announced by
|
|
/// assistive technologies as a `Live::Polite` region — useful for
|
|
/// toasts, status banners and OSDs that need to be read on
|
|
/// appearance even when the user has not navigated to them.
|
|
pub a11y_live: bool,
|
|
}
|
|
|
|
impl<Msg: Clone> Container<Msg>
|
|
{
|
|
pub fn new( child: impl Into<Element<Msg>> ) -> Self
|
|
{
|
|
Self
|
|
{
|
|
child: Box::new( child.into() ),
|
|
background: None,
|
|
surface: None,
|
|
corners: Corners::ZERO,
|
|
pad_top: 0.0,
|
|
pad_right: 0.0,
|
|
pad_bottom: 0.0,
|
|
pad_left: 0.0,
|
|
opacity: 1.0,
|
|
border: None,
|
|
max_width: None,
|
|
a11y_live: false,
|
|
}
|
|
}
|
|
|
|
pub fn live_region( mut self, live: bool ) -> Self
|
|
{
|
|
self.a11y_live = live;
|
|
self
|
|
}
|
|
|
|
/// Paint a rounded-rect stroke around the container with the given
|
|
/// colour and pixel width. Useful for input fields, popovers and
|
|
/// any chrome the design system specifies as outlined rather than
|
|
/// filled.
|
|
pub fn border( mut self, color: Color, width: f32 ) -> Self
|
|
{
|
|
self.border = Some( ( color, width.max( 0.0 ) ) );
|
|
self
|
|
}
|
|
|
|
/// Set the background fill. Accepts anything convertible to
|
|
/// [`Paint`] — a plain [`Color`] (auto-wrapped in
|
|
/// [`Paint::Solid`]) or an explicit [`crate::theme::LinearGradient`]
|
|
/// / [`crate::theme::RadialGradient`]. Ignored at paint time if a
|
|
/// themed [`surface`](Self::surface) is set and resolves against
|
|
/// the active theme.
|
|
pub fn background( mut self, paint: impl Into<Paint> ) -> Self
|
|
{
|
|
self.background = Some( paint.into() );
|
|
self
|
|
}
|
|
|
|
/// Back the container with a themed surface slot. The slot id is
|
|
/// resolved against the active `ThemeDocument` at paint time via
|
|
/// [`crate::theme::resolve_surface`]; missing slots fall through
|
|
/// to [`background`](Self::background) or to no background at all.
|
|
///
|
|
/// Slot ids are documented by the theme. The default theme ships
|
|
/// `surface-card` (generic Glass container) and the slider-specific
|
|
/// slots; downstream themes are free to add their own.
|
|
pub fn surface( mut self, slot: impl Into<String> ) -> Self
|
|
{
|
|
self.surface = Some( slot.into() );
|
|
self
|
|
}
|
|
|
|
/// Set the corner radii for every painted layer of the container
|
|
/// chrome. Accepts a single `f32` (uniform radius — the common
|
|
/// case, equivalent to `Corners::all( r )`), a tuple `( tl, tr,
|
|
/// br, bl )` (CSS shorthand order), or any explicit
|
|
/// [`Corners`] value.
|
|
///
|
|
/// ```rust,no_run
|
|
/// # use ltk::{ container, text, Corners, Element };
|
|
/// # #[ derive( Clone ) ] enum Msg {}
|
|
/// # fn _ex() -> ( Element<Msg>, Element<Msg>, Element<Msg> ) {
|
|
/// // Uniform 16 px on all corners (single-value form).
|
|
/// let a = container( text( "child" ) ).radius( 16.0 );
|
|
///
|
|
/// // Rounded top corners only — for a panel pinned flush against
|
|
/// // the bottom edge of the screen.
|
|
/// let b = container( text( "child" ) ).radius( Corners::top( 16.0 ) );
|
|
///
|
|
/// // Custom four-corner radii.
|
|
/// let c = container( text( "child" ) ).radius( ( 16.0, 16.0, 0.0, 0.0 ) );
|
|
/// # ( a.into(), b.into(), c.into() )
|
|
/// # }
|
|
/// ```
|
|
pub fn radius( mut self, corners: impl Into<Corners> ) -> Self
|
|
{
|
|
self.corners = corners.into();
|
|
self
|
|
}
|
|
|
|
/// Set uniform padding on all four sides — equivalent to setting
|
|
/// `padding_top`, `padding_right`, `padding_bottom`, and
|
|
/// `padding_left` to `p`. Asymmetric variants
|
|
/// ([`padding_top`](Self::padding_top), …) override individual
|
|
/// edges, so calling this first and then a per-edge setter is the
|
|
/// idiomatic way to express "uniform padding except for one
|
|
/// edge".
|
|
pub fn padding( mut self, p: f32 ) -> Self
|
|
{
|
|
self.pad_top = p;
|
|
self.pad_right = p;
|
|
self.pad_bottom = p;
|
|
self.pad_left = p;
|
|
self
|
|
}
|
|
|
|
/// Set horizontal padding (left + right each).
|
|
pub fn padding_h( mut self, p: f32 ) -> Self
|
|
{
|
|
self.pad_left = p;
|
|
self.pad_right = p;
|
|
self
|
|
}
|
|
|
|
/// Set vertical padding (top + bottom each).
|
|
pub fn padding_v( mut self, p: f32 ) -> Self
|
|
{
|
|
self.pad_top = p;
|
|
self.pad_bottom = p;
|
|
self
|
|
}
|
|
|
|
/// Set the top edge padding only. Pairs with
|
|
/// [`padding_bottom`](Self::padding_bottom) for asymmetric
|
|
/// vertical insets.
|
|
pub fn padding_top( mut self, p: f32 ) -> Self
|
|
{
|
|
self.pad_top = p;
|
|
self
|
|
}
|
|
|
|
/// Set the right edge padding only.
|
|
pub fn padding_right( mut self, p: f32 ) -> Self
|
|
{
|
|
self.pad_right = p;
|
|
self
|
|
}
|
|
|
|
/// Set the bottom edge padding only.
|
|
pub fn padding_bottom( mut self, p: f32 ) -> Self
|
|
{
|
|
self.pad_bottom = p;
|
|
self
|
|
}
|
|
|
|
/// Set the left edge padding only.
|
|
pub fn padding_left( mut self, p: f32 ) -> Self
|
|
{
|
|
self.pad_left = p;
|
|
self
|
|
}
|
|
|
|
/// Set opacity for the entire container and its contents (0.0 = transparent, 1.0 = opaque).
|
|
pub fn opacity( mut self, alpha: f32 ) -> Self
|
|
{
|
|
self.opacity = alpha.clamp( 0.0, 1.0 );
|
|
self
|
|
}
|
|
|
|
/// Cap the container's outer width in logical px. When the parent
|
|
/// offers a wider rect, the container reports its preferred width as
|
|
/// `min( offered, w )` so it does not stretch to fill.
|
|
pub fn max_width( mut self, w: f32 ) -> Self
|
|
{
|
|
self.max_width = Some( w );
|
|
self
|
|
}
|
|
|
|
/// Return the preferred `(width, height)` accounting for padding.
|
|
pub fn preferred_size( &self, max_width: f32, canvas: &Canvas ) -> ( f32, f32 )
|
|
{
|
|
let avail = self.max_width.map( |m| max_width.min( m ) ).unwrap_or( max_width );
|
|
let pad_x = self.pad_left + self.pad_right;
|
|
let pad_y = self.pad_top + self.pad_bottom;
|
|
let inner_w = ( avail - pad_x ).max( 0.0 );
|
|
let ( cw, ch ) = self.child.preferred_size( inner_w, canvas );
|
|
( cw + pad_x, ch + pad_y )
|
|
}
|
|
|
|
pub( crate ) fn map_msg<U>( self, f: &super::MapFn<Msg, U> ) -> Container<U>
|
|
where
|
|
U: Clone + 'static,
|
|
Msg: 'static,
|
|
{
|
|
Container
|
|
{
|
|
child: Box::new( self.child.map_arc( f ) ),
|
|
background: self.background,
|
|
surface: self.surface,
|
|
corners: self.corners,
|
|
pad_top: self.pad_top,
|
|
pad_right: self.pad_right,
|
|
pad_bottom: self.pad_bottom,
|
|
pad_left: self.pad_left,
|
|
opacity: self.opacity,
|
|
border: self.border,
|
|
max_width: self.max_width,
|
|
a11y_live: self.a11y_live,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Create a [`Container`] that wraps `child`.
|
|
pub fn container<Msg: Clone>( child: impl Into<Element<Msg>> ) -> Container<Msg>
|
|
{
|
|
Container::new( child )
|
|
}
|