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`).
282 lines
9.3 KiB
Rust
282 lines
9.3 KiB
Rust
// Handler-level dispatch coverage for the interactive widgets that aren't
|
|
// buttons or text edits: toggle, checkbox, radio and slider. Each test renders
|
|
// the widget through `UiSurface`, locates its `WidgetHandlers` snapshot and
|
|
// confirms the snapshot routes activations to the configured Msg variant.
|
|
|
|
use ltk::core::{ RenderOptions, UiSurface };
|
|
use ltk::test_support::WidgetHandlers;
|
|
use ltk::{
|
|
checkbox, column, radio, slider, toggle, Color, Element, Point, Rect, SliderAxis,
|
|
};
|
|
|
|
#[ derive( Clone, Debug, PartialEq ) ]
|
|
enum Msg
|
|
{
|
|
WifiToggled,
|
|
TermsAccepted,
|
|
PriorityHigh,
|
|
Brightness( f32 ),
|
|
}
|
|
|
|
fn render_view( view: Element<Msg> ) -> UiSurface<Msg>
|
|
{
|
|
let mut surface = UiSurface::<Msg>::new( 320, 240 );
|
|
let _ = surface.render(
|
|
&view,
|
|
RenderOptions::full_canvas( 320, 240 ).background( Color::rgb( 0.1, 0.1, 0.1 ) ),
|
|
);
|
|
surface
|
|
}
|
|
|
|
// ── Toggle ────────────────────────────────────────────────────────────────────
|
|
|
|
#[ test ]
|
|
fn toggle_handler_carries_on_toggle_message()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( toggle( false ).on_toggle( Msg::WifiToggled ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let idx = surface.widget_rects()[ 0 ].flat_idx;
|
|
let h = surface.handlers( idx ).expect( "toggle should expose a handler" );
|
|
assert!( !h.is_text_input() );
|
|
assert!( !h.is_slider() );
|
|
assert_eq!( h.press_msg(), Some( Msg::WifiToggled ) );
|
|
}
|
|
|
|
#[ test ]
|
|
fn toggle_handler_variant_is_toggle()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( toggle( true ).on_toggle( Msg::WifiToggled ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
let h = surface.handlers( surface.widget_rects()[ 0 ].flat_idx ).unwrap();
|
|
assert!( matches!( h, WidgetHandlers::Toggle { on_toggle: Some( _ ), .. } ) );
|
|
}
|
|
|
|
#[ test ]
|
|
fn toggle_without_on_toggle_yields_none_press_msg()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( toggle::<Msg>( false ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
let h = surface.handlers( surface.widget_rects()[ 0 ].flat_idx ).unwrap();
|
|
assert!( h.press_msg().is_none() );
|
|
}
|
|
|
|
// ── Checkbox ──────────────────────────────────────────────────────────────────
|
|
|
|
#[ test ]
|
|
fn checkbox_handler_carries_on_toggle_message()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( checkbox( false ).on_toggle( Msg::TermsAccepted ).label( "Accept" ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let idx = surface.widget_rects()[ 0 ].flat_idx;
|
|
let h = surface.handlers( idx ).unwrap();
|
|
assert!( matches!( h, WidgetHandlers::Checkbox { on_toggle: Some( _ ), .. } ) );
|
|
assert_eq!( h.press_msg(), Some( Msg::TermsAccepted ) );
|
|
}
|
|
|
|
#[ test ]
|
|
fn checkbox_state_is_independent_of_handler()
|
|
{
|
|
// The widget renders the current `checked` value; toggling that value is
|
|
// the parent app's job — handler dispatch must work regardless of the
|
|
// initial state.
|
|
let unchecked: Element<Msg> = column().push( checkbox( false ).on_toggle( Msg::TermsAccepted ) ).into();
|
|
let checked: Element<Msg> = column().push( checkbox( true ).on_toggle( Msg::TermsAccepted ) ).into();
|
|
|
|
for view in [ unchecked, checked ]
|
|
{
|
|
let surface = render_view( view );
|
|
let h = surface.handlers( surface.widget_rects()[ 0 ].flat_idx ).unwrap();
|
|
assert_eq!( h.press_msg(), Some( Msg::TermsAccepted ) );
|
|
}
|
|
}
|
|
|
|
// ── Radio ─────────────────────────────────────────────────────────────────────
|
|
|
|
#[ test ]
|
|
fn radio_handler_carries_on_select_message()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( radio( false ).on_select( Msg::PriorityHigh ).label( "High" ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let idx = surface.widget_rects()[ 0 ].flat_idx;
|
|
let h = surface.handlers( idx ).unwrap();
|
|
assert!( matches!( h, WidgetHandlers::Radio { on_select: Some( _ ), .. } ) );
|
|
assert_eq!( h.press_msg(), Some( Msg::PriorityHigh ) );
|
|
}
|
|
|
|
#[ test ]
|
|
fn three_radios_each_route_to_their_own_message()
|
|
{
|
|
#[ derive( Clone, Debug, PartialEq ) ]
|
|
enum Choice { Low, Medium, High }
|
|
|
|
let view: Element<Choice> = column()
|
|
.push( radio( false ).on_select( Choice::Low ) )
|
|
.push( radio( false ).on_select( Choice::Medium ) )
|
|
.push( radio( true ).on_select( Choice::High ) )
|
|
.into();
|
|
|
|
let mut surface = UiSurface::<Choice>::new( 240, 240 );
|
|
let _ = surface.render( &view, RenderOptions::full_canvas( 240, 240 ) );
|
|
|
|
let messages: Vec<_> = surface.widget_rects().iter()
|
|
.map( |w| surface.handlers( w.flat_idx ).and_then( |h| h.press_msg() ) )
|
|
.collect();
|
|
assert_eq!(
|
|
messages,
|
|
vec![ Some( Choice::Low ), Some( Choice::Medium ), Some( Choice::High ) ],
|
|
);
|
|
}
|
|
|
|
// ── Slider ────────────────────────────────────────────────────────────────────
|
|
|
|
#[ test ]
|
|
fn slider_handler_variant_is_slider()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( slider( 0.5 ).on_change( |v| Msg::Brightness( v ) ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let h = surface.handlers( surface.widget_rects()[ 0 ].flat_idx ).unwrap();
|
|
assert!( h.is_slider() );
|
|
assert!( !h.is_text_input() );
|
|
}
|
|
|
|
#[ test ]
|
|
fn slider_change_msg_wraps_value_through_callback()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( slider( 0.0 ).on_change( |v| Msg::Brightness( v ) ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let h = surface.handlers( surface.widget_rects()[ 0 ].flat_idx ).unwrap();
|
|
assert_eq!( h.slider_change_msg( 0.0 ), Some( Msg::Brightness( 0.0 ) ) );
|
|
assert_eq!( h.slider_change_msg( 0.5 ), Some( Msg::Brightness( 0.5 ) ) );
|
|
assert_eq!( h.slider_change_msg( 1.0 ), Some( Msg::Brightness( 1.0 ) ) );
|
|
}
|
|
|
|
#[ test ]
|
|
fn slider_value_from_pos_at_left_edge_is_zero()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( slider( 0.5 ).on_change( |v| Msg::Brightness( v ) ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let w = &surface.widget_rects()[ 0 ];
|
|
let left = Point { x: w.rect.x, y: w.rect.y + w.rect.height * 0.5 };
|
|
let v = w.handlers.slider_value_from_pos( w.rect, left );
|
|
assert!( ( v - 0.0 ).abs() < 1e-3 );
|
|
}
|
|
|
|
#[ test ]
|
|
fn slider_value_from_pos_at_right_edge_is_one()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( slider( 0.5 ).on_change( |v| Msg::Brightness( v ) ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let w = &surface.widget_rects()[ 0 ];
|
|
let right = Point { x: w.rect.x + w.rect.width, y: w.rect.y + w.rect.height * 0.5 };
|
|
let v = w.handlers.slider_value_from_pos( w.rect, right );
|
|
assert!( ( v - 1.0 ).abs() < 1e-3 );
|
|
}
|
|
|
|
#[ test ]
|
|
fn slider_value_from_pos_at_midpoint_is_one_half()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( slider( 0.0 ).on_change( |v| Msg::Brightness( v ) ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let w = &surface.widget_rects()[ 0 ];
|
|
let mid = Point
|
|
{
|
|
x: w.rect.x + w.rect.width * 0.5,
|
|
y: w.rect.y + w.rect.height * 0.5,
|
|
};
|
|
let v = w.handlers.slider_value_from_pos( w.rect, mid );
|
|
assert!( ( v - 0.5 ).abs() < 1e-3 );
|
|
}
|
|
|
|
#[ test ]
|
|
fn slider_value_from_pos_clamps_outside_rect()
|
|
{
|
|
// Pointer way outside the rect on either side must clamp to 0 or 1.
|
|
let view: Element<Msg> = column()
|
|
.push( slider( 0.5 ).on_change( |v| Msg::Brightness( v ) ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let w = &surface.widget_rects()[ 0 ];
|
|
let far_left = Point { x: w.rect.x - 200.0, y: w.rect.y + 10.0 };
|
|
let far_right = Point { x: w.rect.x + w.rect.width + 200.0, y: w.rect.y + 10.0 };
|
|
|
|
assert_eq!( w.handlers.slider_value_from_pos( w.rect, far_left ), 0.0 );
|
|
assert_eq!( w.handlers.slider_value_from_pos( w.rect, far_right ), 1.0 );
|
|
}
|
|
|
|
// Bonus: confirm slider_value_from_pos returns 0.0 for non-slider variants —
|
|
// gives the gesture state machine a safe fallback when a slider handler gets
|
|
// swapped out mid-gesture.
|
|
#[ test ]
|
|
fn slider_value_from_pos_returns_zero_for_non_slider_handler()
|
|
{
|
|
use ltk::button;
|
|
let view: Element<Msg> = column()
|
|
.push( button( "go" ).on_press( Msg::WifiToggled ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
|
|
let w = &surface.widget_rects()[ 0 ];
|
|
let mid = Point
|
|
{
|
|
x: w.rect.x + w.rect.width * 0.5,
|
|
y: w.rect.y + w.rect.height * 0.5,
|
|
};
|
|
assert_eq!( w.handlers.slider_value_from_pos( w.rect, mid ), 0.0 );
|
|
}
|
|
|
|
// ── SliderAxis sanity ─────────────────────────────────────────────────────────
|
|
|
|
#[ test ]
|
|
fn slider_axis_enum_is_publicly_exposed()
|
|
{
|
|
// Compile-time guard: SliderAxis must remain a publicly-named enum so
|
|
// downstream apps can match on it (e.g. when wrapping value_from_pos
|
|
// for a custom hit area).
|
|
let _ = SliderAxis::Horizontal;
|
|
let _ = SliderAxis::Vertical;
|
|
}
|
|
|
|
// Bonus: ensure the rect from layout has non-zero size so the value tests
|
|
// above are meaningful (if rect.width were 0 every position lookup would
|
|
// degenerate to 0 / 0).
|
|
#[ test ]
|
|
fn slider_layout_rect_has_non_zero_width()
|
|
{
|
|
let view: Element<Msg> = column()
|
|
.push( slider( 0.5 ).on_change( |v| Msg::Brightness( v ) ) )
|
|
.into();
|
|
let surface = render_view( view );
|
|
let w: Rect = surface.widget_rects()[ 0 ].rect;
|
|
assert!( w.width > 0.0 );
|
|
assert!( w.height > 0.0 );
|
|
}
|