remove websys dependency

Author: bgkillas

Cargo.lock

@@ -50,7 +50,7 @@ softbuffer-wayland=["softbuffer/wayland"]
 rug=["kalc-lib/rug","kalc-lib"]
 fastnum=["kalc-lib/fastnum","kalc-lib"]
 kalc-lib=["dep:kalc-lib"]
-wasm=["dep:wasm-bindgen", "dep:web-sys"]
+wasm=["dep:wasm-bindgen"]
 wasm-draw=["rupl/wasm", "wasm", "rupl/winit", "dep:winit"]
 wee=["dep:wee_alloc"]
 
@@ -67,5 +67,4 @@ rupl={version = "0.1.2",path="../rupl",default-features = false}
 kalc-lib={version="1.5.1",default-features=false,features = ["fastrand"],path="../kalc-lib",optional = true}
 wasm-bindgen = {version="0.2.100",optional = true}
 #console_error_panic_hook = { version = "0.1.7", optional = true }
-web-sys = { version = "0.3.77", features = ["CanvasRenderingContext2d", "HtmlCanvasElement"], optional = true }
 wee_alloc = {version = "0.4.5", optional = true}

Cargo.toml

@@ -295,11 +295,7 @@ impl App {
             self.plot.update(width, height, &mut v);
         }
         let canvas = self.plot.canvas.as_ref().unwrap();
-        draw_buffer_web(
-            self.window.as_ref().unwrap(),
-            canvas.width(),
-            wasm_bindgen::Clamped(canvas.data()),
-        );
+        crate::draw(canvas.data(), canvas.width());
         if b {
             let name = self.name.clone();
             if let Some(w) = self.window() {
@@ -326,21 +322,7 @@ impl App {
             b = true;
             self.name = n;
         };
-        use wasm_bindgen::prelude::*;
-        use winit::platform::web::WindowExtWebSys;
-        let canvas: web_sys::HtmlCanvasElement = self
-            .window
-            .as_ref()
-            .unwrap()
-            .canvas()
-            .expect("Failed to get canvas");
-        let ctx: web_sys::CanvasRenderingContext2d = canvas
-            .get_context("2d")
-            .expect("Failed to get 2d context")
-            .expect("Failed to get 2d context")
-            .dyn_into()
-            .expect("Failed to convert to CanvasRenderingContext2d");
-        self.plot.update(width, height, ctx);
+        self.plot.update(width, height);
         if b {
             let name = self.name.clone();
             if let Some(w) = self.window() {
@@ -353,23 +335,3 @@ impl App {
         }
     }
 }
-#[cfg(all(feature = "wasm", feature = "tiny-skia"))]
-fn draw_buffer_web(win: &winit::window::Window, width: u32, clamped: wasm_bindgen::Clamped<&[u8]>) {
-    use wasm_bindgen::prelude::*;
-    let canvas = get_a_canvas(win);
-    let ctx: web_sys::CanvasRenderingContext2d = canvas
-        .get_context("2d")
-        .expect("Failed to get 2d context")
-        .expect("Failed to get 2d context")
-        .dyn_into()
-        .expect("Failed to convert to CanvasRenderingContext2d");
-    let image = web_sys::ImageData::new_with_u8_clamped_array(clamped, width)
-        .expect("Failed to create image data");
-    ctx.put_image_data(&image, 0.0, 0.0)
-        .expect("Failed to put image data");
-
-    fn get_a_canvas(win: &winit::window::Window) -> web_sys::HtmlCanvasElement {
-        use winit::platform::web::WindowExtWebSys;
-        win.canvas().expect("Failed to get canvas")
-    }
-}

src/app.rs

@@ -25,6 +25,15 @@ extern crate wee_alloc;
 #[cfg(feature = "wee")]
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+#[cfg(feature = "wasm")]
+#[wasm_bindgen::prelude::wasm_bindgen(module = "/window.js")]
+extern "C" {
+    #[cfg(feature = "tiny-skia")]
+    pub fn draw(slice: &[u8], width: u32);
+    pub fn get_canvas() -> wasm_bindgen::JsValue;
+    pub fn resize(x: u32, y: u32);
+    pub fn dpr() -> f64;
+}
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen(start))]
 pub fn main() {
     //#[cfg(feature = "wasm")]

src/lib.rs

@@ -56,34 +56,20 @@ impl App {
     }
 }
 #[cfg(feature = "wasm")]
-use wasm_bindgen::JsCast;
-#[cfg(feature = "wasm")]
-use web_sys::HtmlCanvasElement;
-#[cfg(feature = "wasm")]
 use winit::platform::web::WindowAttributesExtWebSys;
 #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
 impl winit::application::ApplicationHandler for App {
     fn resumed(&mut self, event_loop: &winit::event_loop::ActiveEventLoop) {
         let window = {
-            #[cfg(feature = "wasm")]
-            let window = web_sys::window().expect("no global `window` exists");
-            #[cfg(feature = "wasm")]
-            let document = window.document().expect("should have a document");
-            #[cfg(feature = "wasm")]
-            let canvas = document
-                .get_element_by_id("canvas")
-                .expect("document should have canvas")
-                .dyn_into::<HtmlCanvasElement>()
-                .expect("element should be a canvas");
             let window = winit::window::Window::default_attributes();
             #[cfg(feature = "wasm")]
-            let window = window.with_canvas(Some(canvas));
+            let canvas = crate::get_canvas();
+            #[cfg(feature = "wasm")]
+            let window = window.with_canvas(Some(canvas.into()));
             let window = event_loop.create_window(window);
             #[cfg(feature = "wasm")]
             {
-                let window = web_sys::window().unwrap();
-                let d = window.device_pixel_ratio();
-                self.dpr = d;
+                self.dpr = crate::dpr();
             }
             window.unwrap()
         };
@@ -122,10 +108,7 @@ impl winit::application::ApplicationHandler for App {
                     };
                     #[cfg(feature = "wasm")]
                     {
-                        use winit::platform::web::WindowExtWebSys;
-                        let canvas: HtmlCanvasElement = state.canvas().unwrap();
-                        canvas.set_width(_d.width);
-                        canvas.set_height(_d.height);
+                        crate::resize(_d.width, _d.height);
                     }
                     state.request_redraw();
                     #[cfg(feature = "skia-vulkan")]

src/window.rs

@@ -0,0 +1,18 @@
+const canvas = document.getElementById('canvas');
+const ctx = canvas.getContext("2d");
+export function draw(slice, width) {
+    const clamped = new Uint8ClampedArray(slice);
+    const height = clamped.length / (width * 4);
+    const image = new ImageData(clamped, width, height);
+    ctx.putImageData(image, 0, 0);
+}
+export function get_canvas() {
+    return canvas;
+}
+export function resize(x, y) {
+    canvas.width = x;
+    canvas.height = y;
+}
+export function dpr() {
+    return window.devicePixelRatio
+}