Wasm support

.github/workflows/ci.yml

@@ -239,3 +239,62 @@ jobs:
         with:
           command: rustc
           args: --manifest-path=druid-shell/Cargo.toml  --features=x11 -- -D warnings
+
+  test-stable-wasm:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macOS-latest, windows-2019, ubuntu-latest]
+
+    name: cargo test stable (wasm32)
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: install cairo
+        run: brew install cairo
+        if: contains(matrix.os, 'mac')
+
+      - name: install libgtk-dev
+        run: |
+          sudo apt update
+          sudo apt install libgtk-3-dev
+        if: contains(matrix.os, 'ubuntu')
+
+      - name: install deps
+        run: cargo install wasm-pack
+
+      - name: install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+          components: clippy
+          profile: minimal
+          override: true
+
+      - name: cargo clippy (wasm32)
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all --target wasm32-unknown-unknown -- -D warnings
+
+      - name: cargo test compile druid-shell (wasm32)
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path=druid-shell/Cargo.toml --no-run --target wasm32-unknown-unknown
+
+      - name: cargo test compile druid (wasm32)
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path=druid/Cargo.toml --no-run --target wasm32-unknown-unknown
+
+      - name: wasm-pack build examples
+        run: wasm-pack build --target web druid/examples/wasm
+
+      - name: Run rustc -D warnings in druid/examples/wasm
+        uses: actions-rs/cargo@v1
+        with:
+          command: rustc
+          args: --manifest-path=druid/examples/wasm/Cargo.toml -- -D warnings

Cargo.toml

@@ -4,4 +4,5 @@ members = [
     "druid-shell",
     "druid-derive",
     "docs/book_examples",
+    "druid/examples/wasm",
 ]

druid-shell/Cargo.toml

@@ -24,6 +24,8 @@ time = "0.2.7"
 cfg-if = "0.1.10"
 # NOTE: if changing, ensure version is compatible with the version in piet
 kurbo = "0.5.11"
+# NOTE: This defaults to mimicking std::time on non-wasm targets
+instant = { version = "0.1", features = [ "wasm-bindgen" ] }
 
 cairo-rs = {  version = "0.8.1", default_features = false, optional = true }
 cairo-sys-rs = { version = "0.9.2", default_features = false, optional = true }
@@ -61,3 +63,8 @@ gtk-sys = "0.9.0"
 [target.'cfg(target_os="linux")'.dependencies.gtk]
 version = "0.8.1"
 features = ["v3_20"]
+
+[target.'cfg(target_arch="wasm32")'.dependencies]
+wasm-bindgen = "0.2.59"
+js-sys = "0.3.36"
+web-sys = { version = "0.3.36", features = ["Window", "MouseEvent", "CssStyleDeclaration", "WheelEvent", "KeyEvent", "KeyboardEvent"] }

druid-shell/examples/shello.rs

@@ -64,7 +64,7 @@ impl WinHandler for HelloState {
     }
 
     fn key_down(&mut self, event: KeyEvent) -> bool {
-        let deadline = std::time::Instant::now() + std::time::Duration::from_millis(500);
+        let deadline = instant::Instant::now() + std::time::Duration::from_millis(500);
         let id = self.handle.request_timer(deadline);
         println!("keydown: {:?}, timer id = {:?}", event, id);
 

druid-shell/src/keyboard.rs

@@ -41,12 +41,12 @@ pub struct KeyEvent {
 impl KeyEvent {
     /// Create a new `KeyEvent` struct. This accepts either &str or char for the last
     /// two arguments.
-    pub(crate) fn new(
+    pub(crate) fn new<'a>(
         key_code: impl Into<KeyCode>,
         is_repeat: bool,
         mods: KeyModifiers,
-        text: impl Into<StrOrChar>,
-        unmodified_text: impl Into<StrOrChar>,
+        text: impl Into<StrOrChar<'a>>,
+        unmodified_text: impl Into<StrOrChar<'a>>,
     ) -> Self {
         let text = match text.into() {
             StrOrChar::Char(c) => c.into(),
@@ -176,25 +176,25 @@ impl From<char> for TinyStr {
 
 /// A type we use in the constructor of `KeyEvent`, specifically to avoid exposing
 /// internals.
-pub enum StrOrChar {
+pub enum StrOrChar<'a> {
     Char(char),
-    Str(&'static str),
+    Str(&'a str),
 }
 
-impl From<&'static str> for StrOrChar {
-    fn from(src: &'static str) -> Self {
+impl<'a> From<&'a str> for StrOrChar<'a> {
+    fn from(src: &'a str) -> Self {
         StrOrChar::Str(src)
     }
 }
 
-impl From<char> for StrOrChar {
-    fn from(src: char) -> StrOrChar {
+impl From<char> for StrOrChar<'static> {
+    fn from(src: char) -> StrOrChar<'static> {
         StrOrChar::Char(src)
     }
 }
 
-impl From<Option<char>> for StrOrChar {
-    fn from(src: Option<char>) -> StrOrChar {
+impl From<Option<char>> for StrOrChar<'static> {
+    fn from(src: Option<char>) -> StrOrChar<'static> {
         match src {
             Some(c) => StrOrChar::Char(c),
             None => StrOrChar::Str(""),

druid-shell/src/platform/mod.rs

@@ -27,5 +27,8 @@ cfg_if::cfg_if! {
     } else if #[cfg(any(feature = "use_gtk", target_os = "linux"))] {
         mod gtk;
         pub use self::gtk::*;
+    } else if #[cfg(target_arch = "wasm32")] {
+        mod web;
+        pub use web::*;
     }
 }

druid-shell/src/platform/web/application.rs

@@ -0,0 +1,40 @@
+// Copyright 2020 The xi-editor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Web implementation of features at the application scope.
+
+use super::clipboard::Clipboard;
+use crate::application::AppHandler;
+
+pub struct Application;
+
+impl Application {
+    pub fn new(_handler: Option<Box<dyn AppHandler>>) -> Application {
+        // TODO: Implement this
+        Application
+    }
+
+    pub fn run(&mut self) {}
+
+    pub fn quit() {}
+
+    pub fn clipboard() -> Clipboard {
+        Clipboard
+    }
+
+    pub fn get_locale() -> String {
+        //TODO ahem
+        "en-US".into()
+    }
+}

druid-shell/src/platform/web/clipboard.rs

@@ -0,0 +1,60 @@
+// Copyright 2020 The xi-editor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Interactions with the browser pasteboard.
+
+use crate::clipboard::{ClipboardFormat, FormatId};
+
+/// The browser clipboard.
+#[derive(Debug, Clone, Default)]
+pub struct Clipboard;
+
+impl Clipboard {
+    /// Put a string onto the system clipboard.
+    pub fn put_string(&mut self, _s: impl AsRef<str>) {
+        log::warn!("unimplemented");
+    }
+
+    /// Put multi-format data on the system clipboard.
+    pub fn put_formats(&mut self, _formats: &[ClipboardFormat]) {
+        log::warn!("unimplemented");
+    }
+
+    /// Get a string from the system clipboard, if one is available.
+    pub fn get_string(&self) -> Option<String> {
+        log::warn!("unimplemented");
+        None
+    }
+
+    /// Given a list of supported clipboard types, returns the supported type which has
+    /// highest priority on the system clipboard, or `None` if no types are supported.
+    pub fn preferred_format(&self, _formats: &[FormatId]) -> Option<FormatId> {
+        log::warn!("unimplemented");
+        None
+    }
+
+    /// Return data in a given format, if available.
+    ///
+    /// It is recommended that the `fmt` argument be a format returned by
+    /// [`Clipboard::preferred_format`]
+    pub fn get_format(&self, _format: FormatId) -> Option<Vec<u8>> {
+        log::warn!("unimplemented");
+        None
+    }
+
+    pub fn available_type_names(&self) -> Vec<String> {
+        log::warn!("unimplemented");
+        Vec::new()
+    }
+}

druid-shell/src/platform/web/dialog.rs

@@ -0,0 +1,36 @@
+// Copyright 2020 The xi-editor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![allow(dead_code)]
+//! File open/save dialogs, Web implementation.
+
+/// Type of file dialog.
+pub enum FileDialogType {
+    /// File open dialog.
+    Open,
+    /// File save dialog.
+    Save,
+}
+
+#[derive(Default)]
+pub struct FileDialogOptions;
+
+impl FileDialogOptions {
+    /// Include system and hidden items.
+    pub fn set_show_hidden(&mut self) {
+        // TODO
+    }
+
+    // TODO: more options as needed
+}