stdweb support for eventloop 2.0

CONTRIBUTING.md

@@ -46,9 +46,10 @@ This table summarizes who can be contacted in which case, with the following leg
 - `T` - Tester: has the ability of testing the platform
 - ` `: knows nothing of this platform
 
-| Platform            | Windows | macOS | X11   | Wayland | Android | iOS   | Emscripten |
-| :---                | :---:   | :---: | :---: | :---:   | :---:   | :---: | :---:      |
-| @mitchmindtree      | T       |       | T     | T       |         |       |            |
-| @Osspial            | M       |       | T     | T       | T       |       | T          |
-| @vberger            |         |       | T     | M       |         |       |            |
-| @mtak-              |         | T     |       |         | T       | M     |            |
+| Platform            | Windows | macOS | X11   | Wayland | Android | iOS   | Emscripten | Stdweb |
+| :---                | :---:   | :---: | :---: | :---:   | :---:   | :---: | :---:      |  :---: |
+| @mitchmindtree      | T       |       | T     | T       |         |       |            |        |
+| @Osspial            | M       |       | T     | T       | T       |       | T          |        |
+| @vberger            |         |       | T     | M       |         |       |            |        |
+| @mtak-              |         | T     |       |         | T       | M     |            |        |
+| @ryanisacg          | T       | T     |       |         |         |       |            |   M    |

Cargo.toml

@@ -14,6 +14,7 @@ categories = ["gui"]
 features = ["serde"]
 
 [dependencies]
+instant = "0.1"
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
@@ -72,3 +73,7 @@ percent-encoding = "1.0"
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "windows"))'.dependencies.parking_lot]
 version = "0.8"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+stdweb = { path = "../stdweb", optional = true }
+instant = { version = "0.1", features = ["stdweb"] }

examples/window.rs

@@ -1,4 +1,7 @@
 extern crate winit;
+#[macro_use]
+extern crate stdweb;
+
 use winit::window::WindowBuilder;
 use winit::event::{Event, WindowEvent};
 use winit::event_loop::{EventLoop, ControlFlow};
@@ -10,9 +13,10 @@ fn main() {
         .with_title("A fantastic window!")
         .build(&event_loop)
         .unwrap();
+    console!(log, "Built window!");
 
     event_loop.run(|event, _, control_flow| {
-        println!("{:?}", event);
+        console!(log, format!("{:?}", event));
 
         match event {
             Event::WindowEvent {

src/event.rs

@@ -4,7 +4,7 @@
 //! processed and used to modify the program state. For more details, see the root-level documentation.
 //!
 //! [event_loop_run]: ../event_loop/struct.EventLoop.html#method.run
-use std::time::Instant;
+use instant::Instant;
 use std::path::PathBuf;
 
 use dpi::{LogicalPosition, LogicalSize};
@@ -58,7 +58,7 @@ impl<T> Event<T> {
 }
 
 /// Describes the reason the event loop is resuming.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum StartCause {
     /// Sent if the time specified by `ControlFlow::WaitUntil` has been reached. Contains the
     /// moment the timeout was requested and the requested resume time. The actual resume time is

src/event_loop.rs

@@ -10,7 +10,7 @@
 //! [event_loop_proxy]: ./struct.EventLoopProxy.html
 //! [send_event]: ./struct.EventLoopProxy.html#method.send_event
 use std::{fmt, error};
-use std::time::Instant;
+use instant::Instant;
 use std::ops::Deref;
 
 use platform_impl;
@@ -69,7 +69,7 @@ impl<T> fmt::Debug for EventLoopWindowTarget<T> {
 /// the control flow to `Poll`.
 ///
 /// [events_cleared]: ../event/enum.Event.html#variant.EventsCleared
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum ControlFlow {
     /// When the current loop iteration finishes, immediately begin a new iteration regardless of
     /// whether or not new events are available to process.

src/lib.rs

@@ -75,6 +75,7 @@
 //! [`LoopDestroyed`]: ./event/enum.Event.html#variant.LoopDestroyed
 //! [`platform`]: ./platform/index.html
 
+extern crate instant;
 #[allow(unused_imports)]
 #[macro_use]
 extern crate lazy_static;
@@ -109,6 +110,9 @@ extern crate parking_lot;
 extern crate percent_encoding;
 #[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
 extern crate smithay_client_toolkit as sctk;
+#[cfg(feature = "stdweb")]
+#[macro_use]
+extern crate stdweb;
 #[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
 extern crate calloop;
 

src/platform/mod.rs

@@ -20,4 +20,6 @@ pub mod macos;
 pub mod unix;
 pub mod windows;
 
+pub mod stdweb;
+
 pub mod desktop;

src/platform/stdweb.rs

@@ -0,0 +1,8 @@
+#![cfg(feature = "stdweb")]
+
+use stdweb::web::html_element::CanvasElement;
+
+pub trait WindowExtStdweb {
+    fn canvas(&self) -> CanvasElement;
+}
+

src/platform_impl/mod.rs

@@ -18,9 +18,13 @@ mod platform;
 #[cfg(target_os = "emscripten")]
 #[path="emscripten/mod.rs"]
 mod platform;
+#[cfg(feature = "stdweb")]
+#[path="stdweb/mod.rs"]
+mod platform;
 
 #[cfg(all(not(target_os = "ios"), not(target_os = "windows"), not(target_os = "linux"),
   not(target_os = "macos"), not(target_os = "android"), not(target_os = "dragonfly"),
   not(target_os = "freebsd"), not(target_os = "netbsd"), not(target_os = "openbsd"),
-  not(target_os = "emscripten")))]
+  not(target_os = "emscripten"),
+  not(feature = "stdweb")))]
 compile_error!("The platform you're compiling for is not supported by winit");