Applications built on ltk had no way to come back where the user left them: the toolkit hardcoded `app_id = "ltk"` on every toplevel, never wrote anything to disk, and died on SIGTERM without a chance to save. This release gives the runtime the whole plumbing and asks each application only for the bytes worth keeping, in the spirit of Android's saved-instance state. The `App` trait gains three mandatory methods, deliberately without default bodies so every application states its position: `app_id()` (reverse-DNS, used for `xdg_toplevel.set_app_id`, the AccessKit application name and the state directory — the `app_id` element of the deprecated `window_config` tuple is now ignored and a one-time warning reports a mismatch), `save_state() -> Option<Vec<u8>>` and `restore_state(Vec<u8>)`. The bytes are opaque; the trait carries no serde bound. Their rustdoc is the contract: when the runtime saves, where the files live, when the bytes come back and when they do not, what must never go in them, and a worked serde_json example. The runtime persists under `$XDG_STATE_HOME/<app_id>/` (falling back to `~/.local/state`): `session.json` holds the compositor session id, a clean-exit marker and the writer's pid; `state.bin` holds the application bytes. Writes are atomic (temp file + rename, mode 0600, directory 0700) and best-effort. State is saved every 30 s when the bytes changed, once after the event loop exits (which covers `on_close_requested`, `requested_exit` and lost connections), and on SIGTERM/SIGINT — a calloop signal source, installed before any thread exists, now turns those into a clean exit of the loop instead of process death. `restore_state` runs synchronously in `try_run` before the window is created and before the first `view()`, and only when the process is relaunched as part of a session restore (`LTK_SESSION_RESTORE=1`, removed from the environment before the app can spawn children) or when the previous run left `clean_exit: false`; a plain launch starts fresh. A second concurrent instance detects the live pid and runs with persistence disabled rather than clobbering the first. The compositor side of geometry restore goes through `xdg-session-management-v1`. Neither wayland-protocols nor sctk ship generated code for it yet, so the XML is vendored under `protocols/` and `wayland-scanner` generates the client module in-tree (`src/protocol/`), resolving the crate names through sctk's reexports so the bindings stay on the crate instances sctk links. Before the first commit of a `ShellMode::Window` toplevel the runtime binds `xdg_session_manager_v1`, calls `get_session(reason, stored_id)` and `restore_toplevel(toplevel, "main")`; the three window-creation paths in `run.rs` are folded into one `make_window` helper so the attach always sits immediately before `commit()`. `created` persists the id, `replaced` destroys the objects and stops persisting. Compositors without the global lose only the geometry half. Layer-shell and session-lock surfaces skip the whole machinery. Every `App` implementor in the tree is updated: the twelve examples (`showcase`, `scroll` and `mini_shell` persist real state; the rest return `None`), both integration tests (`event_loop_flow` gains `save_restore_round_trip`), the in-source and markdown doctests, README, onboarding, cookbook (new recipe "Surviving relaunch: session state") and architecture docs, and the changelog. `src/session_state.rs` carries unit tests over a temporary state directory. `Makefile install` now copies `protocols/` into the cargo registry — without it downstream builds would fail inside the proc-macro — and `debian/copyright` covers the vendored XML. The trait change is breaking, hence 0.3.0. Also fixes the pre-existing `viewport_tests` module in `render/mod.rs`, which used `Length` without importing it and broke `cargo test`.
171 lines
3.7 KiB
Rust
171 lines
3.7 KiB
Rust
//! `cargo run --example pickers`
|
||
//!
|
||
//! Showcases the four composition widgets added in this pass:
|
||
//! `notebook` (paginated tabs with a content area), `date_picker`,
|
||
//! `time_picker`, and `color_picker`. Each picker lives on its own
|
||
//! notebook page so the example doubles as a notebook demo.
|
||
//!
|
||
//! Esc exits.
|
||
|
||
use ltk::
|
||
{
|
||
App, Element, Color, Keysym,
|
||
column, text, scroll,
|
||
notebook, date_picker, time_picker, color_picker,
|
||
Date, Time,
|
||
};
|
||
|
||
#[ derive( Clone, Debug ) ]
|
||
enum Msg
|
||
{
|
||
SelectTab( usize ),
|
||
DateChanged( Date ),
|
||
DateView( i32, u8 ),
|
||
TimeChanged( Time ),
|
||
ColorChanged( Color ),
|
||
}
|
||
|
||
struct PickerApp
|
||
{
|
||
tab: usize,
|
||
date: Date,
|
||
view_year: i32,
|
||
view_month: u8,
|
||
time: Time,
|
||
color: Color,
|
||
}
|
||
|
||
impl PickerApp
|
||
{
|
||
fn new() -> Self
|
||
{
|
||
let today = Date::new( 2026, 5, 2 );
|
||
Self
|
||
{
|
||
tab: 0,
|
||
date: today,
|
||
view_year: today.year,
|
||
view_month: today.month,
|
||
time: Time::new( 9, 30 ),
|
||
color: Color::hex( 0x14, 0xB8, 0xA6 ),
|
||
}
|
||
}
|
||
|
||
fn date_page( &self ) -> Element<Msg>
|
||
{
|
||
let primary = ltk::theme_palette().text_primary;
|
||
let summary = format!(
|
||
"Selected: {}-{:02}-{:02}",
|
||
self.date.year, self.date.month, self.date.day,
|
||
);
|
||
column::<Msg>()
|
||
.padding( 0.0 )
|
||
.spacing( 16.0 )
|
||
.push( text( summary ).size( 14.0 ).color( primary ) )
|
||
.push(
|
||
date_picker( self.date )
|
||
.view( self.view_year, self.view_month )
|
||
.today( Date::new( 2026, 5, 2 ) )
|
||
.on_change( Msg::DateChanged )
|
||
.on_navigate( Msg::DateView )
|
||
)
|
||
.into()
|
||
}
|
||
|
||
fn time_page( &self ) -> Element<Msg>
|
||
{
|
||
let primary = ltk::theme_palette().text_primary;
|
||
let summary = format!(
|
||
"Selected: {:02}:{:02}",
|
||
self.time.hour, self.time.minute,
|
||
);
|
||
column::<Msg>()
|
||
.padding( 0.0 )
|
||
.spacing( 16.0 )
|
||
.push( text( summary ).size( 14.0 ).color( primary ) )
|
||
.push(
|
||
time_picker( self.time )
|
||
.minute_step( 1 )
|
||
.twelve_hour( true )
|
||
.on_change( Msg::TimeChanged )
|
||
)
|
||
.into()
|
||
}
|
||
|
||
fn color_page( &self ) -> Element<Msg>
|
||
{
|
||
let primary = ltk::theme_palette().text_primary;
|
||
let summary = format!(
|
||
"R={:.2} G={:.2} B={:.2} A={:.2}",
|
||
self.color.r, self.color.g, self.color.b, self.color.a,
|
||
);
|
||
column::<Msg>()
|
||
.padding( 0.0 )
|
||
.spacing( 16.0 )
|
||
.push( text( summary ).size( 14.0 ).color( primary ) )
|
||
.push(
|
||
color_picker( self.color )
|
||
.show_alpha( true )
|
||
.on_change( Msg::ColorChanged )
|
||
)
|
||
.into()
|
||
}
|
||
}
|
||
|
||
impl App for PickerApp
|
||
{
|
||
type Message = Msg;
|
||
|
||
fn app_id( &self ) -> &str { "net.liberux.ltk.example.pickers" }
|
||
fn save_state( &self ) -> Option<Vec<u8>> { None }
|
||
fn restore_state( &mut self, _state: Vec<u8> ) {}
|
||
|
||
fn view( &self ) -> Element<Msg>
|
||
{
|
||
let header = text( "ltk pickers" )
|
||
.size( 24.0 )
|
||
.color( ltk::theme_palette().text_primary )
|
||
.align_center();
|
||
|
||
let body = column::<Msg>()
|
||
.padding( 24.0 )
|
||
.spacing( 16.0 )
|
||
.push( header )
|
||
.push(
|
||
notebook::<Msg>()
|
||
.page( "Date", self.date_page() )
|
||
.page( "Time", self.time_page() )
|
||
.page( "Color", self.color_page() )
|
||
.selected( self.tab )
|
||
.on_select( Msg::SelectTab )
|
||
);
|
||
|
||
// Wrap in a scroll so the calendar's 6×7 grid fits even on
|
||
// modest window heights.
|
||
scroll( body ).into()
|
||
}
|
||
|
||
fn update( &mut self, msg: Msg )
|
||
{
|
||
match msg
|
||
{
|
||
Msg::SelectTab( i ) => self.tab = i,
|
||
Msg::DateChanged( d ) => { self.date = d; self.view_year = d.year; self.view_month = d.month; }
|
||
Msg::DateView( y, m ) => { self.view_year = y; self.view_month = m; }
|
||
Msg::TimeChanged( t ) => self.time = t,
|
||
Msg::ColorChanged( c ) => self.color = c,
|
||
}
|
||
}
|
||
|
||
fn on_key( &mut self, keysym: Keysym ) -> Option<Msg>
|
||
{
|
||
if keysym == Keysym::Escape { std::process::exit( 0 ); }
|
||
None
|
||
}
|
||
}
|
||
|
||
fn main()
|
||
{
|
||
ltk::run( PickerApp::new() );
|
||
}
|