A browser app takes part in the desktop as a Wayland client does: fullscreen, the desktop's windows, activation and the shell protocol through forge/web, its own files through ltk::vfs, and images its caller names
On a page with forge/web an ltk app had a main surface, overlays and subsurfaces, but none of what a shell such as crustace needs from the compositor: fullscreen did nothing, the app heard nothing of the other windows, an activation token it asked for never came, forge/web was never told when a launched window had shown, the shell could not speak its protocol, and the app had no way to read its own files in a browser. Each now goes through the app's connection to forge/web, in the shape of the Wayland protocol it stands for. Fullscreen. On a page with forge/web, `App::fullscreen` and `App::start_fullscreen` send a `set_fullscreen` request for the main window, as `xdg_toplevel.set_fullscreen` does, instead of doing nothing; alone on a page the canvas still takes the browser's fullscreen. `examples/web_hello.rs` gains a button that toggles it. The desktop's windows. On connecting, the backend asks for the list of toplevels, and forge/web's `toplevel_opened` and `toplevel_closed` events become `ToplevelEvent`s for `App::on_toplevel_event`, as `ext-foreign-toplevel-list-v1` does on Wayland, so a shell's dock knows which applications have windows open. Activation. The tokens an app asks for with `App::take_activation_requests` are issued before it draws: forge/web's, through its `activation_token` request, or empty without a desktop, as on Wayland without xdg-activation, and handed to `App::on_activation_token` with their messages processed. A browser app that launched others through tokens waited for one that never came. Each surface's first presented frame is reported with a `presented` request (`WebSurfaceState::presented`), so forge/web knows when a window it launched has shown and can report it activated, which dismisses crustace's splash. The shell protocol. `platform/web/shell.rs` carries the JSON a shell speaks to forge over its socket over the app's connection to forge/web: `ltk::web::shell_send( json )` sends it as a `shell` request, and each `shell` event's message reaches the listener `ltk::web::set_shell_listener` gives, as JSON. What is sent before the app has connected is kept and sent once it has, so a shell can tell forge/web its theme while it starts. An overlay's role now carries its `App::overlay_namespace`, as its layer-shell namespace does on Wayland, so forge/web can tell a shell's overlays apart. The cursor over every surface. The CSS `cursor` was set on the main surface's element only, so over an overlay the pointer kept the page's arrow. `WebSurfaceState` keeps the element that takes its input, the shape moves to that of the surface the pointer enters, and `WebPlatform::cursor` keeps the last one asked for. An app's own files. `ltk::vfs`, through which ltk reads its themes, fonts and keyboard layouts, is public: `read`, `read_to_string`, `read_dir`, `is_file` and `is_dir` read the file system natively and, in a browser, the files the page loaded into memory. `ltk::web::load_tree( base, root ).await` loads any tree served with a `MANIFEST` under `root`, and `load_resources` is that into `/ltk` with the directory made the resource directory. `ltk::time::Instant` is public too, `std`'s natively and `web_time`'s on wasm32, where `std::time::Instant::now` panics, so an app that builds for both measures time with ltk's clock. wasm-bindgen-cli. `scripts/wasm-bindgen-cli.sh TOOLS_DIR` builds wasm-bindgen-cli into `TOOLS_DIR/bin` at the version of the `wasm-bindgen` crate ltk pins in its `Cargo.toml`, from its sources with a lock resolved for Debian's rustc, which is what `make web-deps` did inline and now runs. Since `make install` copies `scripts/` into the registry, a project that builds for the browser against the installed ltk, such as forge/web or crustace, gets the same CLI without a checkout of ltk. The README and docs/architecture.md say so. Images named by their caller. Every draw through `draw_image_data` fingerprints its pixels to find them in the image caches, which for a terminal means hashing every glyph of every frame. `Canvas::draw_image_keyed( key, rgba, w, h, dest, opacity )` is `draw_image_data` with `key` naming the pixels in place of their fingerprint: every draw with the same key must pass the same pixels, which are read only when the image is not cached. Both backends' caches are keyed by `ImageId`, `Content` for a fingerprint and `Keyed` for a caller's key, so a key never names an image drawn by content even when it equals its fingerprint. `GlesCanvas` and `SoftwareCanvas` gain `draw_image_keyed`, and their `draw_image_data` and it share one private `draw_image`. Tests check that a keyed image draws as its pixels do and that a key equal to a fingerprint is another image. A held button is not also tapped. A button with `on_long_press` and no `on_drag_start` stayed a tap after its hold fired, so releasing it sent its `on_press` as well. `GestureState::long_press_msg_fired` is set when the hold fires `long_press_msg` and suppresses the press message on release; a test covers it. `CHANGELOG.md` describes these changes.
This commit is contained in:
+10
-2
@@ -15,7 +15,7 @@ use wasm_bindgen::closure::Closure;
|
||||
use wasm_bindgen::{ JsCast, JsValue };
|
||||
use web_sys::{ Document, Event, EventTarget, HtmlCanvasElement, HtmlElement, OffscreenCanvas, WebGl2RenderingContext };
|
||||
|
||||
use crate::app::App;
|
||||
use crate::app::{ App, ToplevelEvent };
|
||||
use crate::event_loop::{ AppData, RunError, Sources, SurfaceFocus, SurfaceState };
|
||||
|
||||
use super::desktop::{ main_role, Connection, MAIN };
|
||||
@@ -42,6 +42,8 @@ pub( super ) enum PageEvent
|
||||
{
|
||||
surface: u32,
|
||||
},
|
||||
/// A window of the desktop's, as `ext-foreign-toplevel-list` reports it.
|
||||
Toplevel( ToplevelEvent ),
|
||||
}
|
||||
|
||||
/// An event listener, registered for as long as it lives.
|
||||
@@ -129,6 +131,7 @@ pub( crate ) fn try_run<A: App>( app: A ) -> Result<(), RunError>
|
||||
( Some( desktop ), _ ) =>
|
||||
{
|
||||
let ( canvas, input ) = desktop.create_surface( MAIN, main_role( &app ) ).map_err( RunError::Desktop )?;
|
||||
if app.start_fullscreen() { desktop.set_fullscreen( MAIN, true ); }
|
||||
( canvas, input, false )
|
||||
}
|
||||
( None, Some( canvas ) ) => ( canvas.clone(), HtmlElement::from( canvas ), false ),
|
||||
@@ -163,7 +166,7 @@ pub( crate ) fn try_run<A: App>( app: A ) -> Result<(), RunError>
|
||||
if own { let _ = target.focus(); }
|
||||
|
||||
let coarse = window.match_media( "(pointer: coarse)" ).ok().flatten().is_some_and( |m| m.matches() );
|
||||
let main = SurfaceState::new( WebSurfaceState::new( canvas, MAIN, offscreen.is_some(), input ), 0.0, String::new() );
|
||||
let main = SurfaceState::new( WebSurfaceState::new( canvas, target.clone(), MAIN, offscreen.is_some(), input ), 0.0, String::new() );
|
||||
let platform = WebPlatform::new( desktop, offscreen, target, listeners, inset_probe );
|
||||
// ltk's own keyboard where the page is used by touch, since the page cannot raise the system's for a canvas.
|
||||
let mut data = AppData::new( app, platform, main, Sources::new( wake ), coarse, None );
|
||||
@@ -289,6 +292,10 @@ impl<A: App> AppData<A>
|
||||
if self.app.on_close_requested() { self.exit_requested = true; }
|
||||
}
|
||||
PageEvent::Close { surface } => self.dismiss_overlay( surface ),
|
||||
PageEvent::Toplevel( event ) =>
|
||||
{
|
||||
if let Some( msg ) = self.app.on_toplevel_event( event ) { self.pending_msgs.push( msg ); }
|
||||
}
|
||||
}
|
||||
}
|
||||
self.dispatch_sources();
|
||||
@@ -302,6 +309,7 @@ impl<A: App> AppData<A>
|
||||
}
|
||||
|
||||
self.before_draw();
|
||||
super::desktop::issue_activation_tokens( self );
|
||||
super::overlays::reconcile_overlays( self );
|
||||
let drawn = in_frame && self.draw_due();
|
||||
super::subsurfaces::reconcile_subsurfaces( self );
|
||||
|
||||
Reference in New Issue
Block a user