feat(wasm): port Ghostty's wasm32 build
Ports main_wasm.zig as crates/ghostty-wasm (cdylib exporting the Zig names: atlas_*, face_*, deferred_face_*, shaper_*, config_*), the web_canvas font face and shaper (backend selected on wasm32), os/wasm (logging, target, JS interop) and config/Wasm.zig. C-library dependencies (freetype, harfbuzz, fontconfig, onig, gettext, D-Bus, rustix) are target-gated. Like Zig's wasm build, link regex search (StringMap::search_iterator) is unavailable without Oniguruma; Collection/SharedGrid/harfbuzz are compiled out on wasm32. ghostty-os switches from forbid to deny unsafe_code for the JS import blocks. The JS import ABI is currently a documented handle-based interface with a reference host (js/ghostty_host.js); aligning it with zig-js's exact import names follows separately. Test Plan: - cargo build --target wasm32-unknown-unknown -p ghostty-font \ -p ghostty-config -p ghostty-terminal -p ghostty-vt -p ghostty-wasm - cargo test -p ghostty-wasm (node runs the module against a fake canvas)
This commit is contained in:
1 parent
75252a7651
commit
42f05c926d
33 files changed
+2866
-30
No files matched your search
@@ -12,11 +12,15 @@ ghostty-datastruct.workspace = true
|
||||
ghostty-unicode.workspace = true
|
||||
ghostty-vt.workspace = true
|
||||
log = "0.4.34"
|
||||
png = "0.18.1"
|
||||
thiserror = "2.0.21"
|
||||
|
||||
# C / POSIX-only dependencies are unavailable on wasm32 (Zig builds the wasm
|
||||
# module without oniguruma, and kitty shared-memory images need POSIX shm).
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||
onig = "6.5.3"
|
||||
ghostty-onig.workspace = true
|
||||
png = "0.18.1"
|
||||
rustix = { version = "1.1.5", features = ["shm", "fs"] }
|
||||
thiserror = "2.0.21"
|
||||
|
||||
[dev-dependencies]
|
||||
ghostty-config.workspace = true
|
||||
|
||||
@@ -3,13 +3,32 @@
|
||||
//! [`LoadingImage`] is an image that is still being transmitted (possibly in
|
||||
//! chunks). [`Image`] is a fully loaded and validated image.
|
||||
|
||||
#[cfg(unix)]
|
||||
use std::os::unix::{ffi::OsStrExt, fs::FileExt};
|
||||
use std::{
|
||||
io::{Cursor, Read, Seek, SeekFrom},
|
||||
os::unix::{ffi::OsStrExt, fs::FileExt},
|
||||
path::Path,
|
||||
time::Instant,
|
||||
};
|
||||
|
||||
/// wasm32 has no `std::os::unix`; paths are treated as UTF-8 there.
|
||||
#[cfg(not(unix))]
|
||||
trait OsStrExt {
|
||||
fn from_bytes(bytes: &[u8]) -> &std::ffi::OsStr;
|
||||
fn as_bytes(&self) -> &[u8];
|
||||
}
|
||||
|
||||
#[cfg(not(unix))]
|
||||
impl OsStrExt for std::ffi::OsStr {
|
||||
fn from_bytes(bytes: &[u8]) -> &std::ffi::OsStr {
|
||||
std::ffi::OsStr::new(std::str::from_utf8(bytes).unwrap_or(""))
|
||||
}
|
||||
|
||||
fn as_bytes(&self) -> &[u8] {
|
||||
self.as_encoded_bytes()
|
||||
}
|
||||
}
|
||||
|
||||
use ghostty_vt::kitty::graphics_command::{
|
||||
Command,
|
||||
Display,
|
||||
@@ -143,6 +162,19 @@ impl LoadingImage {
|
||||
}
|
||||
|
||||
/// Reads the data from a shared memory segment.
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
#[allow(clippy::unused_self)]
|
||||
fn read_shared_memory(&mut self, _offset: u32, _size: u32, path: &[u8]) -> Result<(), Error> {
|
||||
// POSIX shared memory does not exist on wasm32.
|
||||
log::warn!(
|
||||
"shared memory not supported on wasm: {}",
|
||||
String::from_utf8_lossy(path)
|
||||
);
|
||||
Err(Error::InvalidData)
|
||||
}
|
||||
|
||||
/// Reads the data from a shared memory segment.
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
fn read_shared_memory(&mut self, offset: u32, size: u32, path: &[u8]) -> Result<(), Error> {
|
||||
use rustix::{fs::Mode, shm};
|
||||
|
||||
@@ -160,6 +192,7 @@ impl LoadingImage {
|
||||
result
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
fn read_shm_fd(
|
||||
&mut self,
|
||||
fd: rustix::fd::OwnedFd,
|
||||
@@ -898,6 +931,7 @@ mod tests {
|
||||
assert!(loading.complete().is_ok());
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[test]
|
||||
fn image_load_shared_memory() {
|
||||
use std::io::Write;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
//!
|
||||
//! Port of `ZIG/src/terminal/StringMap.zig`. Regex matching uses Oniguruma
|
||||
//! (the `onig` crate), like Ghostty.
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use onig::{MatchParam, Regex, Region, SearchOptions};
|
||||
|
||||
use crate::{page_list::Pin, selection::Selection};
|
||||
@@ -16,6 +17,7 @@ use crate::{page_list::Pin, selection::Selection};
|
||||
/// the `ghostty-onig` wrapper since the `onig` crate does not expose it).
|
||||
/// Exceeding it aborts matching with an error which is treated as "no
|
||||
/// further matches".
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
const ONI_SEARCH_RETRY_LIMIT: u32 = 100_000;
|
||||
|
||||
/// A string and a map from each byte of the string to the pin it came from.
|
||||
@@ -25,6 +27,9 @@ pub struct StringMap {
|
||||
pub map: Vec<Pin>,
|
||||
}
|
||||
|
||||
// Like Zig (`build_options.oniguruma == false`), regex search is not
|
||||
// available on wasm32 (Oniguruma is a C library).
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
impl StringMap {
|
||||
/// Returns an iterator that yields the next match of the given regex.
|
||||
pub fn search_iterator<'a>(&'a self, regex: &'a Regex) -> SearchIterator<'a> {
|
||||
@@ -36,6 +41,7 @@ impl StringMap {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
/// Iterates over the regular expression matches of the string.
|
||||
pub struct SearchIterator<'a> {
|
||||
map: &'a StringMap,
|
||||
@@ -43,6 +49,7 @@ pub struct SearchIterator<'a> {
|
||||
offset: usize,
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
impl<'a> SearchIterator<'a> {
|
||||
/// Returns the next regular expression match or None if there are
|
||||
/// no more matches.
|
||||
@@ -88,6 +95,7 @@ impl<'a> SearchIterator<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
impl<'a> Iterator for SearchIterator<'a> {
|
||||
type Item = Match<'a>;
|
||||
|
||||
@@ -115,7 +123,7 @@ impl Match<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[cfg(all(test, not(target_arch = "wasm32")))]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::{
|
||||
|
||||
Reference in new issue
Block a user