From 457ddf81311e8d9da135a25ba0112cd28dd731dc Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Sat, 15 Feb 2025 15:29:18 +0100
Subject: [PATCH] send images as raw binary

---
 src-tauri/Cargo.lock                    | 1203 +++++++++++++++++++----
 src-tauri/Cargo.toml                    |    7 +-
 src-tauri/capabilities/default.json     |    3 +-
 src-tauri/src/lib.rs                    |   65 +-
 src-tauri/src/render.rs                 |    1 +
 src-tauri/src/retrieval.rs              |   25 +-
 src-tauri/src/tests.rs                  |   23 -
 src/components/PageView.svelte          |    2 +-
 src/components/PrimitiveView.svelte     |  114 ++-
 src/components/RenderedPageView.svelte  |    7 +-
 src/components/StreamDataView.svelte    |   23 +-
 src/components/XRefTable.svelte         |    1 -
 src/components/ZoomControls.svelte      |    1 -
 src/components/ZoomableContainer.svelte |    8 +-
 src/models/FileViewState.svelte.ts      |   21 +-
 src/models/PageViewState.svelte.ts      |    7 +-
 src/models/RawImageData.ts              |   51 +
 src/models/StreamData.svelte.ts         |   12 +-
 18 files changed, 1242 insertions(+), 332 deletions(-)
 create mode 100644 src/models/RawImageData.ts

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 7ce2a1e..1ba8cf0 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2,6 +2,22 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "ab_glyph"
+version = "0.2.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
+
 [[package]]
 name = "addr2line"
 version = "0.24.2"
@@ -88,6 +104,30 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
+[[package]]
+name = "android-activity"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+dependencies = [
+ "android-properties",
+ "bitflags 1.3.2",
+ "cc",
+ "jni-sys",
+ "libc",
+ "log",
+ "ndk 0.7.0",
+ "ndk-context",
+ "ndk-sys 0.4.1+23.1.7779620",
+ "num_enum 0.6.1",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -135,6 +175,12 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -147,6 +193,15 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "ash"
+version = "0.37.3+1.3.251"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
+dependencies = [
+ "libloading 0.7.4",
+]
+
 [[package]]
 name = "ashpd"
 version = "0.10.2"
@@ -157,14 +212,14 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "rand 0.8.5",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "serde",
  "serde_repr",
  "tokio",
  "url",
  "wayland-backend",
- "wayland-client",
- "wayland-protocols",
+ "wayland-client 0.31.8",
+ "wayland-protocols 0.32.6",
  "zbus",
 ]
 
@@ -405,6 +460,21 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
 [[package]]
 name = "bit_field"
 version = "0.10.2"
@@ -456,13 +526,32 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block-sys"
+version = "0.1.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
+dependencies = [
+ "objc-sys 0.2.0-beta.2",
+]
+
+[[package]]
+name = "block2"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
+dependencies = [
+ "block-sys",
+ "objc2-encode 2.0.0-pre.2",
+]
+
 [[package]]
 name = "block2"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "objc2",
+ "objc2 0.5.2",
 ]
 
 [[package]]
@@ -569,6 +658,20 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "calloop"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
+dependencies = [
+ "bitflags 1.3.2",
+ "log",
+ "nix 0.25.1",
+ "slotmap",
+ "thiserror 1.0.69",
+ "vec_map",
+]
+
 [[package]]
 name = "camino"
 version = "1.1.9"
@@ -670,6 +773,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
@@ -714,9 +823,9 @@ dependencies = [
  "bitflags 2.8.0",
  "block",
  "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
+ "foreign-types 0.5.0",
  "libc",
  "objc",
 ]
@@ -729,18 +838,34 @@ checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
 dependencies = [
  "bitflags 2.8.0",
  "block",
- "core-foundation",
- "core-graphics-types",
+ "core-foundation 0.10.0",
+ "core-graphics-types 0.2.0",
  "libc",
  "objc",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
 [[package]]
 name = "color_quant"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -776,6 +901,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.10.0"
@@ -792,6 +927,19 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
+[[package]]
+name = "core-graphics"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types 0.3.2",
+ "libc",
+]
+
 [[package]]
 name = "core-graphics"
 version = "0.24.0"
@@ -799,9 +947,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
  "bitflags 2.8.0",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
+ "core-foundation 0.10.0",
+ "core-graphics-types 0.2.0",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -812,7 +971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
  "bitflags 2.8.0",
- "core-foundation",
+ "core-foundation 0.10.0",
  "libc",
 ]
 
@@ -970,6 +1129,17 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "d3d12"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
+dependencies = [
+ "bitflags 2.8.0",
+ "libloading 0.8.6",
+ "winapi",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.10"
@@ -1011,12 +1181,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728"
 
-[[package]]
-name = "data-encoding"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
-
 [[package]]
 name = "datasize"
 version = "0.2.15"
@@ -1402,10 +1566,16 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
- "memoffset",
+ "memoffset 0.9.1",
  "rustc_version",
 ]
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "flate2"
 version = "1.0.35"
@@ -1442,6 +1612,15 @@ dependencies = [
  "tuple 0.5.2 (git+https://github.com/s3bk/tuple/)",
 ]
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1449,7 +1628,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -1463,6 +1642,12 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -1488,6 +1673,21 @@ dependencies = [
  "new_debug_unreachable",
 ]
 
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -1495,6 +1695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
+ "futures-sink",
 ]
 
 [[package]]
@@ -1562,6 +1763,7 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
+ "futures-channel",
  "futures-core",
  "futures-io",
  "futures-macro",
@@ -1797,6 +1999,12 @@ dependencies = [
  "xml-rs",
 ]
 
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+
 [[package]]
 name = "glib"
 version = "0.18.5"
@@ -1868,11 +2076,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f07c02868ebe3ffab0c273801b815f19a9fc05743b5b9da971449dd40604fe30"
 dependencies = [
  "async-trait",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "tuple 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "web-time",
 ]
 
+[[package]]
+name = "glow"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "glyphmatcher"
 version = "0.1.0"
@@ -1900,6 +2120,58 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "gpu-alloc"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
+dependencies = [
+ "bitflags 2.8.0",
+ "gpu-alloc-types",
+]
+
+[[package]]
+name = "gpu-alloc-types"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "gpu-allocator"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+dependencies = [
+ "backtrace",
+ "log",
+ "thiserror 1.0.69",
+ "winapi",
+ "windows 0.44.0",
+]
+
+[[package]]
+name = "gpu-descriptor"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
+dependencies = [
+ "bitflags 2.8.0",
+ "gpu-descriptor-types",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "gpu-descriptor-types"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
 [[package]]
 name = "gtk"
 version = "0.18.2"
@@ -2010,6 +2282,21 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
+[[package]]
+name = "hassle-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+dependencies = [
+ "bitflags 1.3.2",
+ "com-rs",
+ "libc",
+ "libloading 0.7.4",
+ "thiserror 1.0.69",
+ "widestring",
+ "winapi",
+]
+
 [[package]]
 name = "heapless"
 version = "0.7.17"
@@ -2048,6 +2335,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
 [[package]]
 name = "html5ever"
 version = "0.26.0"
@@ -2668,6 +2961,17 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "khronos-egl"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+dependencies = [
+ "libc",
+ "libloading 0.7.4",
+ "pkg-config",
+]
+
 [[package]]
 name = "khronos-egl"
 version = "6.0.0"
@@ -2814,6 +3118,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.8.0",
  "libc",
+ "redox_syscall 0.5.8",
 ]
 
 [[package]]
@@ -2916,6 +3221,24 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -2925,6 +3248,21 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "metal"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
+dependencies = [
+ "bitflags 2.8.0",
+ "block",
+ "core-graphics-types 0.1.3",
+ "foreign-types 0.5.0",
+ "log",
+ "objc",
+ "paste",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -2956,6 +3294,18 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "mio"
 version = "1.0.3"
@@ -2977,7 +3327,7 @@ dependencies = [
  "dpi",
  "gtk",
  "keyboard-types",
- "objc2",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
  "once_cell",
@@ -2987,6 +3337,41 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "naga"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
+dependencies = [
+ "bit-set",
+ "bitflags 2.8.0",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap 1.9.3",
+ "log",
+ "num-traits",
+ "petgraph",
+ "rustc-hash 1.1.0",
+ "spirv",
+ "termcolor",
+ "thiserror 1.0.69",
+ "unicode-xid",
+]
+
+[[package]]
+name = "ndk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+dependencies = [
+ "bitflags 1.3.2",
+ "jni-sys",
+ "ndk-sys 0.4.1+23.1.7779620",
+ "num_enum 0.5.11",
+ "raw-window-handle 0.5.2",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "ndk"
 version = "0.9.0"
@@ -2996,9 +3381,9 @@ dependencies = [
  "bitflags 2.8.0",
  "jni-sys",
  "log",
- "ndk-sys",
- "num_enum",
- "raw-window-handle",
+ "ndk-sys 0.6.0+11769913",
+ "num_enum 0.7.3",
+ "raw-window-handle 0.6.2",
  "thiserror 1.0.69",
 ]
 
@@ -3008,6 +3393,15 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
+[[package]]
+name = "ndk-sys"
+version = "0.4.1+23.1.7779620"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+dependencies = [
+ "jni-sys",
+]
+
 [[package]]
 name = "ndk-sys"
 version = "0.6.0+11769913"
@@ -3023,6 +3417,31 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nix"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset 0.6.5",
+]
+
+[[package]]
+name = "nix"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset 0.6.5",
+]
+
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -3031,9 +3450,9 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
  "bitflags 2.8.0",
  "cfg-if 1.0.0",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "libc",
- "memoffset",
+ "memoffset 0.9.1",
 ]
 
 [[package]]
@@ -3147,13 +3566,55 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive 0.5.11",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive 0.6.1",
+]
+
 [[package]]
 name = "num_enum"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.7.3",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -3175,8 +3636,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
  "malloc_buf",
+ "objc_exception",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.2.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -3186,14 +3654,25 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.3.patch-leaks.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
+dependencies = [
+ "block2 0.2.0-alpha.6",
+ "objc-sys 0.2.0-beta.2",
+ "objc2-encode 2.0.0-pre.2",
+]
+
 [[package]]
 name = "objc2"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
- "objc-sys",
- "objc2-encode",
+ "objc-sys 0.3.5",
+ "objc2-encode 4.1.0",
 ]
 
 [[package]]
@@ -3203,9 +3682,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
+ "block2 0.5.1",
  "libc",
- "objc2",
+ "objc2 0.5.2",
  "objc2-core-data",
  "objc2-core-image",
  "objc2-foundation",
@@ -3219,8 +3698,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-core-location",
  "objc2-foundation",
 ]
@@ -3231,8 +3710,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-foundation",
 ]
 
@@ -3243,8 +3722,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-foundation",
 ]
 
@@ -3254,8 +3733,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-foundation",
  "objc2-metal",
 ]
@@ -3266,12 +3745,21 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-contacts",
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc2-encode"
+version = "2.0.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+dependencies = [
+ "objc-sys 0.2.0-beta.2",
+]
+
 [[package]]
 name = "objc2-encode"
 version = "4.1.0"
@@ -3285,10 +3773,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
+ "block2 0.5.1",
  "dispatch",
  "libc",
- "objc2",
+ "objc2 0.5.2",
 ]
 
 [[package]]
@@ -3297,8 +3785,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
 ]
@@ -3310,8 +3798,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-foundation",
 ]
 
@@ -3322,8 +3810,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-foundation",
  "objc2-metal",
 ]
@@ -3334,7 +3822,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
- "objc2",
+ "objc2 0.5.2",
  "objc2-foundation",
 ]
 
@@ -3345,8 +3833,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-image",
@@ -3365,8 +3853,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-foundation",
 ]
 
@@ -3377,8 +3865,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-core-location",
  "objc2-foundation",
 ]
@@ -3390,12 +3878,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65"
 dependencies = [
  "bitflags 2.8.0",
- "block2",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc_exception"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -3429,6 +3926,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
+[[package]]
+name = "orbclient"
+version = "0.3.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
+dependencies = [
+ "libredox",
+]
+
 [[package]]
 name = "ordered-stream"
 version = "0.2.0"
@@ -3439,6 +3945,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "owned_ttf_parser"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
+dependencies = [
+ "ttf-parser",
+]
+
 [[package]]
 name = "pango"
 version = "0.18.3"
@@ -3488,7 +4003,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.8",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -3587,7 +4102,7 @@ dependencies = [
  "font",
  "gl",
  "image 0.25.5",
- "khronos-egl",
+ "khronos-egl 6.0.0",
  "pathfinder_canvas",
  "pathfinder_color",
  "pathfinder_content",
@@ -3687,7 +4202,6 @@ name = "pdf-forge"
 version = "0.1.0"
 dependencies = [
  "base64 0.21.7",
- "fax",
  "image 0.25.5",
  "lazy_static",
  "pathfinder_geometry",
@@ -3697,12 +4211,12 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
+ "show-image",
  "tauri",
  "tauri-build",
  "tauri-plugin-dialog",
  "tauri-plugin-fs",
  "tauri-plugin-opener",
- "tauri-plugin-websocket",
  "uuid",
 ]
 
@@ -3762,6 +4276,16 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.7.1",
+]
+
 [[package]]
 name = "phf"
 version = "0.8.0"
@@ -4141,7 +4665,7 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "rustls",
  "socket2",
  "thiserror 2.0.11",
@@ -4159,7 +4683,7 @@ dependencies = [
  "getrandom 0.2.15",
  "rand 0.8.5",
  "ring",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "rustls",
  "rustls-pki-types",
  "slab",
@@ -4175,7 +4699,7 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "libc",
  "once_cell",
  "socket2",
@@ -4273,6 +4797,12 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "range-alloc"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
+
 [[package]]
 name = "rav1e"
 version = "0.7.1"
@@ -4323,6 +4853,12 @@ dependencies = [
  "rgb",
 ]
 
+[[package]]
+name = "raw-window-handle"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -4349,6 +4885,15 @@ dependencies = [
  "crossbeam-utils 0.8.21",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.8"
@@ -4409,6 +4954,12 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
+[[package]]
+name = "renderdoc-sys"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
+
 [[package]]
 name = "reqwest"
 version = "0.12.12"
@@ -4461,18 +5012,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a24763657bff09769a8ccf12c8b8a50416fb035fe199263b4c5071e4e3f006f"
 dependencies = [
  "ashpd",
- "block2",
- "core-foundation",
+ "block2 0.5.1",
+ "core-foundation 0.10.0",
  "core-foundation-sys",
  "glib-sys",
  "gobject-sys",
  "gtk-sys",
  "js-sys",
  "log",
- "objc2",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -4512,6 +5063,12 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -4643,6 +5200,19 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sctk-adwaita"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
+dependencies = [
+ "ab_glyph",
+ "log",
+ "memmap2",
+ "smithay-client-toolkit",
+ "tiny-skia",
+]
+
 [[package]]
 name = "selectors"
 version = "0.22.0"
@@ -4820,17 +5390,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -4848,6 +5407,33 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "show-image"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d6d4263fd19c1fbd0f4bbc0e0128de55dce8beb8f7d9052e09ee7f104c9eeb"
+dependencies = [
+ "futures",
+ "glam",
+ "image 0.25.5",
+ "indexmap 2.7.1",
+ "rustc_version",
+ "show-image-macros",
+ "wgpu",
+ "winit",
+]
+
+[[package]]
+name = "show-image-macros"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61837ba1e28bb121c95460d867ff3466d368c4f029abe42aaf0fd33f00e0dea5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -4908,6 +5494,25 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9"
+dependencies = [
+ "bitflags 1.3.2",
+ "calloop",
+ "dlib",
+ "lazy_static",
+ "log",
+ "memmap2",
+ "nix 0.24.3",
+ "pkg-config",
+ "wayland-client 0.29.5",
+ "wayland-cursor",
+ "wayland-protocols 0.29.5",
+]
+
 [[package]]
 name = "snafu"
 version = "0.8.5"
@@ -4946,16 +5551,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
 dependencies = [
  "bytemuck",
- "cfg_aliases",
- "core-graphics",
- "foreign-types",
+ "cfg_aliases 0.2.1",
+ "core-graphics 0.24.0",
+ "foreign-types 0.5.0",
  "js-sys",
  "log",
- "objc2",
+ "objc2 0.5.2",
  "objc2-foundation",
  "objc2-quartz-core",
- "raw-window-handle",
- "redox_syscall",
+ "raw-window-handle 0.6.2",
+ "redox_syscall 0.5.8",
  "wasm-bindgen",
  "web-sys",
  "windows-sys 0.59.0",
@@ -4996,6 +5601,16 @@ dependencies = [
  "lock_api",
 ]
 
+[[package]]
+name = "spirv"
+version = "0.2.0+1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+dependencies = [
+ "bitflags 1.3.2",
+ "num-traits",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -5008,6 +5623,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+
 [[package]]
 name = "string_cache"
 version = "0.8.8"
@@ -5130,8 +5751,8 @@ checksum = "3731d04d4ac210cd5f344087733943b9bfb1a32654387dad4d1c70de21aee2c9"
 dependencies = [
  "bitflags 2.8.0",
  "cocoa",
- "core-foundation",
- "core-graphics",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
  "crossbeam-channel 0.5.14",
  "dispatch",
  "dlopen2",
@@ -5143,18 +5764,18 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk",
+ "ndk 0.9.0",
  "ndk-context",
- "ndk-sys",
+ "ndk-sys 0.6.0+11769913",
  "objc",
  "once_cell",
  "parking_lot",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "scopeguard",
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
  "windows-version",
  "x11-dl",
@@ -5199,12 +5820,12 @@ dependencies = [
  "log",
  "mime",
  "muda",
- "objc2",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
  "percent-encoding",
  "plist",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "reqwest",
  "serde",
  "serde_json",
@@ -5224,7 +5845,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -5314,7 +5935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b59fd750551b1066744ab956a1cd6b1ea3e1b3763b0b9153ac27a044d596426"
 dependencies = [
  "log",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "rfd",
  "serde",
  "serde_json",
@@ -5366,29 +5987,10 @@ dependencies = [
  "tauri-plugin",
  "thiserror 2.0.11",
  "url",
- "windows",
+ "windows 0.58.0",
  "zbus",
 ]
 
-[[package]]
-name = "tauri-plugin-websocket"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af3ac71aec5fb0ae5441e830cd075b1cbed49ac3d39cb975a4894ea8fa2e62b9"
-dependencies = [
- "futures-util",
- "http",
- "log",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror 2.0.11",
- "tokio",
- "tokio-tungstenite",
-]
-
 [[package]]
 name = "tauri-runtime"
 version = "2.3.0"
@@ -5399,13 +6001,13 @@ dependencies = [
  "gtk",
  "http",
  "jni",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "serde",
  "serde_json",
  "tauri-utils",
  "thiserror 2.0.11",
  "url",
- "windows",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -5418,11 +6020,11 @@ dependencies = [
  "http",
  "jni",
  "log",
- "objc2",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
  "percent-encoding",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "softbuffer",
  "tao",
  "tauri-runtime",
@@ -5430,7 +6032,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.58.0",
  "wry",
 ]
 
@@ -5506,6 +6108,15 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thin-slice"
 version = "0.1.1"
@@ -5594,6 +6205,31 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tiny-skia"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.6",
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "png 0.17.16",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
 [[package]]
 name = "tinystr"
 version = "0.7.6"
@@ -5628,7 +6264,7 @@ dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
+ "mio 1.0.3",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -5646,22 +6282,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-tungstenite"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a"
-dependencies = [
- "futures-util",
- "log",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tungstenite",
- "webpki-roots",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.13"
@@ -5809,12 +6429,12 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b"
 dependencies = [
- "core-graphics",
+ "core-graphics 0.24.0",
  "crossbeam-channel 0.5.14",
  "dirs 5.0.1",
  "libappindicator",
  "muda",
- "objc2",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
  "once_cell",
@@ -5831,24 +6451,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
-name = "tungstenite"
-version = "0.26.1"
+name = "ttf-parser"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "rand 0.8.5",
- "rustls",
- "rustls-pki-types",
- "sha1",
- "thiserror 2.0.11",
- "utf-8",
-]
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 
 [[package]]
 name = "tuple"
@@ -5887,7 +6493,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
 dependencies = [
- "memoffset",
+ "memoffset 0.9.1",
  "tempfile",
  "winapi",
 ]
@@ -5966,6 +6572,18 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -6141,13 +6759,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -6208,7 +6825,23 @@ dependencies = [
  "rustix",
  "scoped-tls",
  "smallvec",
- "wayland-sys",
+ "wayland-sys 0.31.6",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
+dependencies = [
+ "bitflags 1.3.2",
+ "downcast-rs",
+ "libc",
+ "nix 0.24.3",
+ "scoped-tls",
+ "wayland-commons",
+ "wayland-scanner 0.29.5",
+ "wayland-sys 0.29.5",
 ]
 
 [[package]]
@@ -6220,7 +6853,42 @@ dependencies = [
  "bitflags 2.8.0",
  "rustix",
  "wayland-backend",
- "wayland-scanner",
+ "wayland-scanner 0.31.6",
+]
+
+[[package]]
+name = "wayland-commons"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
+dependencies = [
+ "nix 0.24.3",
+ "once_cell",
+ "smallvec",
+ "wayland-sys 0.29.5",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
+dependencies = [
+ "nix 0.24.3",
+ "wayland-client 0.29.5",
+ "xcursor",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
+dependencies = [
+ "bitflags 1.3.2",
+ "wayland-client 0.29.5",
+ "wayland-commons",
+ "wayland-scanner 0.29.5",
 ]
 
 [[package]]
@@ -6231,8 +6899,19 @@ checksum = "0781cf46869b37e36928f7b432273c0995aa8aed9552c556fb18754420541efc"
 dependencies = [
  "bitflags 2.8.0",
  "wayland-backend",
- "wayland-client",
- "wayland-scanner",
+ "wayland-client 0.31.8",
+ "wayland-scanner 0.31.6",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "xml-rs",
 ]
 
 [[package]]
@@ -6246,6 +6925,17 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "wayland-sys"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
+dependencies = [
+ "dlib",
+ "lazy_static",
+ "pkg-config",
+]
+
 [[package]]
 name = "wayland-sys"
 version = "0.31.6"
@@ -6259,9 +6949,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6338,7 +7028,7 @@ checksum = "823e7ebcfaea51e78f72c87fc3b65a1e602c321f407a0b36dbb327d7bb7cd921"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
  "windows-implement",
  "windows-interface",
@@ -6362,7 +7052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a82bce72db6e5ee83c68b5de1e2cd6ea195b9fbff91cb37df5884cbe3222df4"
 dependencies = [
  "thiserror 1.0.69",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
 ]
 
@@ -6372,6 +7062,111 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
+[[package]]
+name = "wgpu"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41"
+dependencies = [
+ "arrayvec 0.7.6",
+ "cfg-if 1.0.0",
+ "js-sys",
+ "log",
+ "naga",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle 0.5.2",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
+dependencies = [
+ "arrayvec 0.7.6",
+ "bit-vec",
+ "bitflags 2.8.0",
+ "codespan-reporting",
+ "log",
+ "naga",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle 0.5.2",
+ "rustc-hash 1.1.0",
+ "smallvec",
+ "thiserror 1.0.69",
+ "web-sys",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
+dependencies = [
+ "android_system_properties",
+ "arrayvec 0.7.6",
+ "ash",
+ "bit-set",
+ "bitflags 2.8.0",
+ "block",
+ "core-graphics-types 0.1.3",
+ "d3d12",
+ "glow",
+ "gpu-alloc",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hassle-rs",
+ "js-sys",
+ "khronos-egl 4.1.0",
+ "libc",
+ "libloading 0.8.6",
+ "log",
+ "metal",
+ "naga",
+ "objc",
+ "parking_lot",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle 0.5.2",
+ "renderdoc-sys",
+ "rustc-hash 1.1.0",
+ "smallvec",
+ "thiserror 1.0.69",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types",
+ "winapi",
+]
+
+[[package]]
+name = "wgpu-types"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
+dependencies = [
+ "bitflags 2.8.0",
+ "js-sys",
+ "web-sys",
+]
+
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -6409,14 +7204,23 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ea403deff7b51fff19e261330f71608ff2cdef5721d72b64180bb95be7c4150"
 dependencies = [
- "objc2",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "windows-sys 0.59.0",
  "windows-version",
 ]
 
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
 [[package]]
 name = "windows"
 version = "0.58.0"
@@ -6788,6 +7592,41 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
+[[package]]
+name = "winit"
+version = "0.28.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
+dependencies = [
+ "android-activity",
+ "bitflags 1.3.2",
+ "cfg_aliases 0.1.1",
+ "core-foundation 0.9.4",
+ "core-graphics 0.22.3",
+ "dispatch",
+ "instant",
+ "libc",
+ "log",
+ "mio 0.8.11",
+ "ndk 0.7.0",
+ "objc2 0.3.0-beta.3.patch-leaks.3",
+ "once_cell",
+ "orbclient",
+ "percent-encoding",
+ "raw-window-handle 0.5.2",
+ "redox_syscall 0.3.5",
+ "sctk-adwaita",
+ "smithay-client-toolkit",
+ "wasm-bindgen",
+ "wayland-client 0.29.5",
+ "wayland-commons",
+ "wayland-protocols 0.29.5",
+ "wayland-scanner 0.29.5",
+ "web-sys",
+ "windows-sys 0.45.0",
+ "x11-dl",
+]
+
 [[package]]
 name = "winnow"
 version = "0.5.40"
@@ -6844,7 +7683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2e33c08b174442ff80d5c791020696f9f8b4e4a87b8cfc7494aad6167ec44e1"
 dependencies = [
  "base64 0.22.1",
- "block2",
+ "block2 0.5.1",
  "cookie",
  "crossbeam-channel 0.5.14",
  "dpi",
@@ -6857,15 +7696,15 @@ dependencies = [
  "jni",
  "kuchikiki",
  "libc",
- "ndk",
- "objc2",
+ "ndk 0.9.0",
+ "objc2 0.5.2",
  "objc2-app-kit",
  "objc2-foundation",
  "objc2-ui-kit",
  "objc2-web-kit",
  "once_cell",
  "percent-encoding",
- "raw-window-handle",
+ "raw-window-handle 0.6.2",
  "sha2",
  "soup3",
  "tao-macros",
@@ -6874,7 +7713,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
  "windows-version",
  "x11-dl",
@@ -6901,6 +7740,12 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "xcursor"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
+
 [[package]]
 name = "xdg-home"
 version = "1.3.0"
@@ -6962,7 +7807,7 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex",
- "nix",
+ "nix 0.29.0",
  "ordered-stream",
  "serde",
  "serde_repr",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 685443e..10125c2 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -28,10 +28,13 @@ tauri-plugin-dialog = "2"
 uuid = { version = "1.12.0", features = ["v4"] }
 regex = "1.10.3"
 lazy_static = "1.4.0"
-fax = "0.2"
 base64 = "0.21"
 image = { version = "0.25.5", features = ["jpeg"] }
 pdf_render = { path = "../../pdf-render/render" }
 pathfinder_rasterize = { git = "https://github.com/s3bk/pathfinder_rasterizer" }
 pathfinder_geometry = { git = "https://github.com/servo/pathfinder" }
-tauri-plugin-websocket = "2"
+show-image = {version = "0.14.0", features = ["image"] }
+
+[[example]]
+name = "render_test"
+path = "examples/render.rs"
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 8e150bc..201f411 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -15,7 +15,6 @@
     "core:window:allow-close",
     "core:window:allow-minimize",
     "core:window:allow-toggle-maximize",
-    "core:window:allow-internal-toggle-maximize",
-    "websocket:default"
+    "core:window:allow-internal-toggle-maximize"
   ]
 }
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index c36fed6..d39b920 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,17 +1,13 @@
-mod render;
+extern crate pdf;
+pub mod render;
 mod retrieval;
 
 #[cfg(test)]
 mod tests;
 
-extern crate pdf;
-
 use crate::pdf::object::Resolve;
 use crate::render::Renderer;
-use base64;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use image::{ImageFormat, RgbImage};
+use image::DynamicImage;
 use lazy_static::lazy_static;
 use pdf::file::{File, FileOptions, NoLog, ObjectCache, StreamCache};
 use pdf::object::{Object, PlainRef};
@@ -21,10 +17,10 @@ use regex::Regex;
 use retrieval::{get_prim_by_path_with_file, get_stream_data_by_path_with_file};
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, VecDeque};
-use std::io::Cursor;
 use std::ops::DerefMut;
 use std::path::Path;
 use std::sync::{Arc, RwLock};
+use tauri::ipc::{InvokeResponseBody, Response};
 use tauri::{Manager, State};
 use uuid::Uuid;
 
@@ -216,16 +212,33 @@ fn get_stream_data_as_string(
     Ok(String::from_utf8_lossy(&data).into_owned())
 }
 
-fn encode_b64(img: RgbImage) -> Result<String, String> {
-    let mut writer = Cursor::new(Vec::new());
-    match img.write_to(&mut writer, ImageFormat::Jpeg) {
-        Ok(_) => Ok(format!(
-            "data:image/{};base64,{}",
-            "jpeg",
-            BASE64_STANDARD.encode(writer.into_inner())
-        )),
-        Err(e) => Err(e.to_string()),
-    }
+fn format_img_as_response(img: DynamicImage) -> Result<Response, String> {
+    use std::mem;
+
+    let w: u32 = img.width();
+    let h: u32 = img.height();
+    let mut data: Vec<u8> = img.into_rgba8().into_raw();
+
+    let w_bytes = w.to_le_bytes(); // or to_be_bytes() depending on endianness
+    let h_bytes = h.to_le_bytes();
+
+    let old_capacity = data.capacity();
+
+    let ptr = data.as_mut_ptr();
+    let len = data.len();
+    mem::forget(data);
+
+    // Create a new Vec with the two u32s in front
+    let merged = unsafe {
+        let mut new_vec = Vec::from_raw_parts(ptr, len, old_capacity);
+
+        // Insert u32 bytes at the front
+        new_vec.splice(0..0, w_bytes.iter().copied());
+        new_vec.splice(4..4, h_bytes.iter().copied());
+
+        new_vec
+    };
+    Ok(Response::new(InvokeResponseBody::from(merged)))
 }
 
 #[tauri::command]
@@ -233,12 +246,10 @@ async fn get_stream_data_as_image(
     id: &str,
     path: &str,
     session: State<'_, Session>,
-) -> Result<String, String> {
-    use base64::prelude::*;
-
+) -> Result<Response, String> {
     let file = session.get_file(id)?;
     let img = retrieval::get_image_by_path(path, &file.cos_file)?;
-    encode_b64(img.into_rgb8())
+    format_img_as_response(img)
 }
 
 #[tauri::command]
@@ -246,11 +257,12 @@ async fn get_page_by_num(
     id: &str,
     num: u32,
     session: State<'_, Session>,
-) -> Result<String, String> {
+) -> Result<Response, String> {
     let file = session.get_file(id)?;
     let mut renderer = Renderer::new(&file.cos_file, 150);
     let img = renderer.render(num)?;
-    encode_b64(img.into_rgb8())
+
+    format_img_as_response(img)
 }
 
 #[tauri::command]
@@ -705,11 +717,11 @@ fn get_xref_table_model_with_file(file: &CosFile) -> Result<XRefTableModel, Stri
     })
 }
 
-struct Session {
+pub struct Session {
     files: RwLock<HashMap<String, Arc<SessionFile>>>,
 }
 
-struct SessionFile {
+pub struct SessionFile {
     pdf_file: PdfFile,
     cos_file: CosFile,
 }
@@ -770,7 +782,6 @@ impl Session {
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
-        .plugin(tauri_plugin_websocket::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_opener::init())
diff --git a/src-tauri/src/render.rs b/src-tauri/src/render.rs
index ff5c21d..25037ba 100644
--- a/src-tauri/src/render.rs
+++ b/src-tauri/src/render.rs
@@ -6,6 +6,7 @@ use image::{DynamicImage, RgbaImage};
 use pathfinder_geometry::transform2d::Transform2F;
 use pathfinder_rasterize::Rasterizer;
 use pdf_render::{render_page, Cache, SceneBackend};
+use show_image::{create_window, run_context};
 
 pub struct Renderer<'a> {
     file: &'a CosFile,
diff --git a/src-tauri/src/retrieval.rs b/src-tauri/src/retrieval.rs
index f99b209..20a9fb9 100644
--- a/src-tauri/src/retrieval.rs
+++ b/src-tauri/src/retrieval.rs
@@ -5,14 +5,15 @@ use std::{
     sync::Arc,
 };
 
-use image::{DynamicImage, GrayImage, RgbImage};
+use image::{DynamicImage, GrayImage, RgbImage, RgbaImage};
 use pdf::{
     enc::StreamFilter,
     file::FileOptions,
     object::{ColorSpace, ImageXObject, ObjectWrite, PlainRef, Resolve, Stream},
     primitive::{PdfStream, Primitive},
 };
-
+use pdf::object::Resources;
+use pdf_render::{load_image, BlendMode};
 use crate::{CosFile, PathTrace, Step};
 
 #[macro_export]
@@ -152,19 +153,15 @@ pub fn get_image_by_path(path: &str, file: &CosFile) -> Result<DynamicImage, Str
     let stream = get_pdf_stream_by_path_with_file(path, file)?;
     let resolver = file.resolver();
     let img = t!(ImageXObject::from_stream(stream, &resolver));
-    let data = t!(img.image_data(&resolver));
-    let color_space = img.color_space.as_ref();
-
-    match color_space {
-        Some(ColorSpace::DeviceRGB) | Some(ColorSpace::CalRGB(_)) => {
-            RgbImage::from_raw(img.width, img.height, data.to_vec()).map(DynamicImage::ImageRgb8)
-        }
-        Some(ColorSpace::DeviceGray) | Some(ColorSpace::CalGray(_)) => {
-            GrayImage::from_raw(img.width, img.height, data.to_vec()).map(DynamicImage::ImageLuma8)
-        }
-        _ => return parse_image_lossy(data),
+    let img_data = t!(load_image(&img, &Resources::default(), &resolver, BlendMode::Overlay));
+    let h = img_data.height();
+    let w = img_data.width();
+    let mut data: Vec<u8> = Vec::with_capacity((h * w * 4) as usize);
+    for x in img_data.rgba_data() {
+        data.push(*x);
     }
-    .ok_or_else(|| "Failed to decode image".to_string())
+    let rgba_img = RgbaImage::from_raw(w, h, data).expect("Image conversion failed");
+    Ok(DynamicImage::ImageRgba8(rgba_img))
 }
 
 fn parse_image_lossy(data: Arc<[u8]>) -> Result<DynamicImage, String> {
diff --git a/src-tauri/src/tests.rs b/src-tauri/src/tests.rs
index f07739e..4acf7e2 100644
--- a/src-tauri/src/tests.rs
+++ b/src-tauri/src/tests.rs
@@ -252,28 +252,5 @@ mod tests {
         );
     }
 
-    use crate::render::{render, render_with_dpi, Renderer};
 
-    #[test]
-    fn test_render() {
-        let file = timed!(
-            FileOptions::cached().open(PDF_SPEC_PATH).unwrap(),
-            "Loading file"
-        );
-        let mut renderer = Renderer::new(&file, 150);
-        let mut rendered_pages: Vec<DynamicImage> = vec![];
-        timed!(
-            for i in 0..1 {
-                let img = timed!(renderer.render(i), format!("render page {}", i));
-                rendered_pages.push(img.unwrap())
-            },
-            "rendering some pages"
-        );
-        timed!(
-            for (num, image) in rendered_pages.iter().enumerate() {
-                image.to_rgb8().save(format!("page_{}.jpg", num)).unwrap()
-            },
-            "saving images"
-        );
-    }
 }
diff --git a/src/components/PageView.svelte b/src/components/PageView.svelte
index f04db7e..bc83ce6 100644
--- a/src/components/PageView.svelte
+++ b/src/components/PageView.svelte
@@ -35,7 +35,7 @@
             </div>
         </Pane>
         <Pane minSize={1}>
-            <RenderedPageView imgB64={state.img_data} {height}></RenderedPageView>
+            <RenderedPageView img={state.img_data} {height}></RenderedPageView>
         </Pane>
     </Splitpanes>
 {:else }
diff --git a/src/components/PrimitiveView.svelte b/src/components/PrimitiveView.svelte
index 0a11bab..d108799 100644
--- a/src/components/PrimitiveView.svelte
+++ b/src/components/PrimitiveView.svelte
@@ -2,12 +2,12 @@
     import type FileViewState from "../models/FileViewState.svelte";
     import type Primitive from "../models/Primitive.svelte";
     import PrimitiveIcon from "./PrimitiveIcon.svelte";
-    import StreamEditor from "./StreamEditor.svelte";
+    import {Pane, Splitpanes} from "svelte-splitpanes";
     import StreamDataView from "./StreamDataView.svelte";
 
     const cellH = 29;
     const headerOffset = 24;
-    let { fState, height }: { fState: FileViewState; height: number } =
+    let {fState, height}: { fState: FileViewState; height: number } =
         $props();
     let fillerHeight: number = $state(0);
     let firstEntry = $state(0);
@@ -50,60 +50,72 @@
         fState.selectPath(_path);
     }
 </script>
-
-{#if prim && prim.children && prim.children.length > 0}
-    <div
-        class="overflow-auto"
-        onscroll={handleScroll}
-        style="height: {bodyHeight}px"
-    >
-        <div class="w-[851px]">
-            <table style="position: relative; top: {scrollY}px">
-                <thead>
-                    <tr>
-                        <td class="page-cell t-header border-forge-prim">Key</td
-                        >
-                        <td class="ref-cell t-header border-forge-prim">Type</td
-                        >
-                        <td class="cell t-header border-forge-sec">Value</td>
-                    </tr>
-                </thead>
-            </table>
-            <div class="container" style="height: {tableHeight}px">
-                <table>
-                    <tbody>
-                        <tr class="filler" style="height: {fillerHeight}px"
-                        ></tr>
-                        {#each entriesToDisplay as entry}
-                            <tr
-                                class:selected={entry.key ===
-                                    locallySelected?.key}
-                                class="row"
-                                onclick={() => handlePrimClick(entry)}
-                                ondblclick={() => handlePrimDbLClick(entry)}
+<Splitpanes  theme="forge-movable">
+    <Pane minSize={1}>
+        {#if prim && prim.children && prim.children.length > 0}
+            <div
+                    class="overflow-auto"
+                    onscroll={handleScroll}
+                    style="height: {bodyHeight}px"
+            >
+                <div class="w-[851px]">
+                    <table style="position: relative; top: {scrollY}px">
+                        <thead>
+                        <tr>
+                            <td class="page-cell t-header border-forge-prim">Key
+                            </td
                             >
-                                <td class="page-cell t-data">
-                                    <div class="key-field">
-                                        <PrimitiveIcon ptype={entry.ptype} />
-                                        <p class="text-left">
-                                            {entry.key}
-                                        </p>
-                                    </div>
-                                </td>
-                                <td class="ref-cell t-data">{entry.ptype}</td>
-                                <td class="cell t-data">{entry.value}</td>
-                            </tr>
-                        {/each}
-                    </tbody>
-                </table>
+                            <td class="ref-cell t-header border-forge-prim">Type
+                            </td
+                            >
+                            <td class="cell t-header border-forge-sec">Value</td>
+                        </tr>
+                        </thead>
+                    </table>
+                    <div class="container" style="height: {tableHeight}px">
+                        <table>
+                            <tbody>
+                            <tr class="filler" style="height: {fillerHeight}px"
+                            ></tr>
+                            {#each entriesToDisplay as entry}
+                                <tr
+                                        class:selected={entry.key ===
+                                    locallySelected?.key}
+                                        class="row"
+                                        onclick={() => handlePrimClick(entry)}
+                                        ondblclick={() => handlePrimDbLClick(entry)}
+                                >
+                                    <td class="page-cell t-data">
+                                        <div class="key-field">
+                                            <PrimitiveIcon ptype={entry.ptype}/>
+                                            <p class="text-left">
+                                                {entry.key}
+                                            </p>
+                                        </div>
+                                    </td>
+                                    <td class="ref-cell t-data">{entry.ptype}</td>
+                                    <td class="cell t-data">{entry.value}</td>
+                                </tr>
+                            {/each}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
             </div>
+        {/if}
+    </Pane>
+    <Pane
+            size={fState.container_prim?.stream_data ? 50 : 0}
+            minSize={fState.container_prim?.stream_data ? 1 : 0}
+            maxSize={fState.container_prim?.stream_data ? 100 : 0}
+    >
+        <div style:height={height} class="bg-forge-dark">
             {#if fState.container_prim?.stream_data}
-                <StreamDataView {fState} {editorHeight}></StreamDataView>
+                <StreamDataView {fState} {height}></StreamDataView>
             {/if}
         </div>
-    </div>
-{/if}
-
+    </Pane>
+</Splitpanes>
 <style lang="postcss">
     .key-field {
         display: flex;
diff --git a/src/components/RenderedPageView.svelte b/src/components/RenderedPageView.svelte
index 89fe659..a350bef 100644
--- a/src/components/RenderedPageView.svelte
+++ b/src/components/RenderedPageView.svelte
@@ -1,18 +1,19 @@
 <script lang="ts">
     import ZoomableContainer from "./ZoomableContainer.svelte";
     import { RefreshOutline } from "flowbite-svelte-icons";
+    import {RawImageData} from "../models/RawImageData";
 
-    let { imgB64, height }: { imgB64: string | undefined; height: number } =
+    let { img, height }: { img: RawImageData | undefined; height: number } =
         $props();
 </script>
 
 <div class="page-container" style:height={height + "px"}>
-    {#if !imgB64}
+    {#if !img}
         <div class="loading-container">
             <RefreshOutline class="animate-spin" size="xl" />
         </div>
     {:else}
-        <ZoomableContainer {imgB64} {height} />
+        <ZoomableContainer {img} {height} />
     {/if}
 </div>
 
diff --git a/src/components/StreamDataView.svelte b/src/components/StreamDataView.svelte
index 586b0f0..39162a7 100644
--- a/src/components/StreamDataView.svelte
+++ b/src/components/StreamDataView.svelte
@@ -5,19 +5,22 @@
     import type {StreamData} from "../models/StreamData.svelte";
     import RenderedPageView from "./RenderedPageView.svelte";
 
-    let {fState, editorHeight}: { fState: FileViewState, editorHeight: number } = $props()
-    let streamData: StreamData = $derived(fState.container_prim?.stream_data?);
+    let {fState, height}: { fState: FileViewState, height: number } = $props()
+    let streamData: StreamData | undefined = $derived(fState.container_prim?.stream_data);
 
 
 </script>
-{#if streamData.type === "Image"}
-    <RenderedPageView imgB64={streamData.data} height={editorHeight}></RenderedPageView>
-{:else}
-    <StreamEditor
-            stream_data={streamData.data}
-            height={editorHeight}
-    ></StreamEditor>
-
+{#if streamData}
+    {#if streamData.type === "Image"}
+        <RenderedPageView img={streamData.imageData} {height}></RenderedPageView>
+    {:else}
+        {#if streamData.textData}
+            <StreamEditor
+                    stream_data={streamData.textData}
+                    {height}
+            ></StreamEditor>
+        {/if}
+    {/if}
 {/if}
 
 <style lang="postcss">
diff --git a/src/components/XRefTable.svelte b/src/components/XRefTable.svelte
index 4b17d6c..88a335b 100644
--- a/src/components/XRefTable.svelte
+++ b/src/components/XRefTable.svelte
@@ -16,7 +16,6 @@
     );
 
     let bodyViewHeight: number = $derived(Math.max(height - headerOffset, 0));
-    $inspect(bodyViewHeight);
     let selectedPath: number | string | undefined = $derived(
         fState.getLastJump(),
     );
diff --git a/src/components/ZoomControls.svelte b/src/components/ZoomControls.svelte
index 761d4a2..b2c2f2b 100644
--- a/src/components/ZoomControls.svelte
+++ b/src/components/ZoomControls.svelte
@@ -17,7 +17,6 @@
         resetZoom: () => void;
     } = $props();
 
-    $inspect(scale);
 </script>
 
 <div class="controls">
diff --git a/src/components/ZoomableContainer.svelte b/src/components/ZoomableContainer.svelte
index 6b6a898..639a7a2 100644
--- a/src/components/ZoomableContainer.svelte
+++ b/src/components/ZoomableContainer.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
     import ZoomControls from "../components/ZoomControls.svelte";
+    import { RawImageData } from "../models/RawImageData";
 
     type ZoomableProps = {
         minZoom?: number;
         maxZoom?: number;
         zoomStep?: number;
-        imgB64: string;
+        img: RawImageData;
         height?: string | number;
     };
 
@@ -13,7 +14,7 @@
         minZoom = 0.5,
         maxZoom = 4,
         zoomStep = 0.1,
-        imgB64,
+        img,
         height,
     }: ZoomableProps = $props();
 
@@ -106,6 +107,7 @@
             return () => container.removeEventListener("wheel", handleZoom);
         }
     });
+
 </script>
 
 <div class="relative w-full h-full">
@@ -132,7 +134,7 @@
         >
             <img
                 alt="rendered-page"
-                src={imgB64}
+                src={img.toObjectUrl()}
                 style:max-height={height + "px"}
             />
         </div>
diff --git a/src/models/FileViewState.svelte.ts b/src/models/FileViewState.svelte.ts
index 9a3e841..9b84132 100644
--- a/src/models/FileViewState.svelte.ts
+++ b/src/models/FileViewState.svelte.ts
@@ -1,13 +1,14 @@
 import type PdfFile from "./PdfFile";
 import type XRefEntry from "./XRefEntry";
 import Primitive from "./Primitive.svelte";
-import { invoke } from "@tauri-apps/api/core";
+import {invoke} from "@tauri-apps/api/core";
 import type XRefTable from "./XRefTable";
-import type { PathSelectedEvent } from "../events/PathSelectedEvent";
-import type { PrimitiveModel } from "./PrimitiveModel";
-import { StreamData } from "./StreamData.svelte";
-import { ForgeNotification } from "./ForgeNotification.svelte";
-import { Mutex } from 'async-mutex';
+import type {PathSelectedEvent} from "../events/PathSelectedEvent";
+import type {PrimitiveModel} from "./PrimitiveModel";
+import {StreamData} from "./StreamData.svelte";
+import {ForgeNotification} from "./ForgeNotification.svelte";
+import {Mutex} from 'async-mutex';
+import {RawImageData} from "./RawImageData";
 
 export default class FileViewState {
     public file: PdfFile;
@@ -72,7 +73,7 @@ export default class FileViewState {
     }
 
     public loadXrefEntries() {
-        invoke<XRefTable>("get_xref_table", { id: this.file.id })
+        invoke<XRefTable>("get_xref_table", {id: this.file.id})
             .then(result => {
                 this.xref_entries = result.entries;
             })
@@ -109,12 +110,12 @@ export default class FileViewState {
             const path = this.formatPaths(this.path) + "/Data";
             container.stream_data = new StreamData(leaf.sub_type)
             if (leaf.sub_type === "Image") {
-                const data = await invoke<string>("get_stream_data_as_image", { id: this.file.id, path: path })
+                const data = await invoke<ArrayBuffer>("get_stream_data_as_image", {id: this.file.id, path: path})
                     .catch(err => this.logError(err))
                 if (!data) return;
-                container.stream_data.setData(data);
+                container.stream_data.setImageData(new RawImageData(data));
             } else {
-                const data = await invoke<string>("get_stream_data_as_string", { id: this.file.id, path: path })
+                const data = await invoke<string>("get_stream_data_as_string", {id: this.file.id, path: path})
                     .catch(err => this.logError(err))
                 if (!data) return;
                 container.stream_data.setData(data);
diff --git a/src/models/PageViewState.svelte.ts b/src/models/PageViewState.svelte.ts
index 2d6a9a7..bd2d359 100644
--- a/src/models/PageViewState.svelte.ts
+++ b/src/models/PageViewState.svelte.ts
@@ -1,12 +1,13 @@
 import type ContentModel from "./ContentModel.svelte";
 import {invoke} from "@tauri-apps/api/core";
+import {RawImageData} from "./RawImageData";
 
 export class PageViewState {
     file_id: string;
     page_num: number;
     errorHandler: (arg0: string) => void;
 
-    img_data: string | undefined = $state();
+    img_data: RawImageData | undefined = $state();
     contents: string = $state("");
 
     constructor(file_id: string, page_num: number, errorHandler: (arg0: string) => void) {
@@ -26,12 +27,12 @@ export class PageViewState {
     }
 
     public async loadImage() {
-        let result = await invoke<string>("get_page_by_num", {
+        let result = await invoke<ArrayBuffer>("get_page_by_num", {
             id: this.file_id,
             num: this.page_num,
         }).catch(err => this.errorHandler(err));
         if (result) {
-            this.img_data = result;
+            this.img_data = new RawImageData(result);
         }
     }
 
diff --git a/src/models/RawImageData.ts b/src/models/RawImageData.ts
new file mode 100644
index 0000000..54ae644
--- /dev/null
+++ b/src/models/RawImageData.ts
@@ -0,0 +1,51 @@
+export class RawImageData {
+    height: number;
+    width: number;
+    pixels: ArrayBuffer;
+    private _objectUrl: string | null = null;
+
+    constructor(buff: ArrayBuffer) {
+        const view = new DataView(buff);
+        this.width = view.getUint32(0, true); // true for little-endian
+        this.height = view.getUint32(4, true);
+        this.pixels = buff.slice(8);
+    }
+
+    private createImageData(): ImageData {
+        const uint8Array = new Uint8Array(this.pixels);
+        return new ImageData(
+            new Uint8ClampedArray(uint8Array),
+            this.width,
+            this.height
+            ,
+        );
+    }
+
+    toObjectUrl(): string {
+        if (this._objectUrl) {
+            return this._objectUrl;
+        }
+
+        const canvas = document.createElement('canvas');
+        canvas.width = this.width;
+        canvas.height = this.height;
+
+        const ctx = canvas.getContext('2d');
+        if (!ctx) {
+            throw new Error('Could not get canvas context');
+        }
+
+        const imageData = this.createImageData();
+        ctx.putImageData(imageData, 0, 0);
+
+        this._objectUrl = canvas.toDataURL('image/png');
+        return this._objectUrl;
+    }
+
+    dispose() {
+        if (this._objectUrl) {
+            URL.revokeObjectURL(this._objectUrl);
+            this._objectUrl = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/models/StreamData.svelte.ts b/src/models/StreamData.svelte.ts
index d48128b..57ed74d 100644
--- a/src/models/StreamData.svelte.ts
+++ b/src/models/StreamData.svelte.ts
@@ -1,12 +1,20 @@
+import type {RawImageData} from "./RawImageData";
+
 export class StreamData {
     // Image, Text
     public type: string;
-    public data: string = $state("");
+    public textData: string | undefined = $state();
+    public imageData: RawImageData | undefined = $state();
+
     constructor(type: string) {
         this.type = type;
     }
 
     public setData(data: string) {
-        this.data = data;
+        this.textData = data;
+    }
+
+    public setImageData(data: RawImageData) {
+        this.imageData = data;
     }
 }
\ No newline at end of file