From 44e2f95331b7f78b43ed1a3e181db85d5517b696 Mon Sep 17 00:00:00 2001 From: daxpedda Date: Tue, 11 Jul 2023 18:26:00 +0200 Subject: [PATCH] Fix mentions of Wasm (#2950) --- FEATURES.md | 14 ++++++++------ src/event_loop.rs | 2 +- src/window.rs | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/FEATURES.md b/FEATURES.md index 04155b5d..10db04dc 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -13,7 +13,9 @@ be used to create both games and applications. It supports the following main gr - iOS - Android - Web - - via WASM + - Chrome + - Firefox + - Safari 13.1+ Most platforms expose capabilities that cannot be meaningfully transposed onto others. Winit does not aim to support every single feature of every platform, but rather to abstract over the common features @@ -172,7 +174,7 @@ Legend: - ❓: Unknown status ### Windowing -|Feature |Windows|MacOS |Linux x11 |Linux Wayland |Android|iOS |WASM |Redox OS| +|Feature |Windows|MacOS |Linux x11 |Linux Wayland |Android|iOS |Web |Redox OS| |-------------------------------- | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ | |Window initialization |✔️ |✔️ |▢[#5] |✔️ |▢[#33]|▢[#33] |✔️ |✔️ | |Providing pointer to init OpenGL |✔️ |✔️ |✔️ |✔️ |✔️ |✔️ |**N/A**|✔️ | @@ -192,13 +194,13 @@ Legend: |Popup windows |❌ |❌ |❌ |❌ |❌ |❌ |**N/A**|**N/A** | ### System information -|Feature |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS |WASM |Redox OS| +|Feature |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS |Web |Redox OS| |---------------- | ----- | ---- | ------- | ----------- | ----- | ------- | -------- | ------ | |Monitor list |✔️ |✔️ |✔️ |✔️ |✔️ |✔️ |**N/A**|❌ | |Video mode query |✔️ |✔️ |✔️ |✔️ |✔️ |✔️ |**N/A**|❌ | ### Input handling -|Feature |Windows |MacOS |Linux x11|Linux Wayland|Android|iOS |WASM |Redox OS| +|Feature |Windows |MacOS |Linux x11|Linux Wayland|Android|iOS |Web |Redox OS| |----------------------- | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ | |Mouse events |✔️ |▢[#63] |✔️ |✔️ |**N/A**|**N/A**|✔️ |✔️ | |Mouse set location |✔️ |✔️ |✔️ |✔️(when locked) |**N/A**|**N/A**|**N/A**|**N/A** | @@ -220,14 +222,14 @@ Legend: ### Pending API Reworks Changes in the API that have been agreed upon but aren't implemented across all platforms. -|Feature |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS |WASM |Redox OS| +|Feature |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS |Web |Redox OS| |------------------------------ | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ | |New API for HiDPI ([#315] [#319]) |✔️ |✔️ |✔️ |✔️ |✔️ |✔️ |❓ |❓ | |Event Loop 2.0 ([#459]) |✔️ |✔️ |✔️ |✔️ |✔️ |✔️ |❓ |✔️ | |Keyboard Input 2.0 ([#753]) |✔️ |✔️ |✔️ |✔️ |✔️ |❌ |✔️ |✔️ | ### Completed API Reworks -|Feature |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS |WASM |Redox OS| +|Feature |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS |Web |Redox OS| |------------------------------ | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ | [#165]: https://github.com/rust-windowing/winit/issues/165 diff --git a/src/event_loop.rs b/src/event_loop.rs index 9e59b37b..f8e373ed 100644 --- a/src/event_loop.rs +++ b/src/event_loop.rs @@ -189,7 +189,7 @@ pub enum ControlFlow { /// /// ## Platform-specific /// - /// - **Android / iOS / WASM:** The supplied exit code is unused. + /// - **Android / iOS / Web:** The supplied exit code is unused. /// - **Unix:** On most Unix-like platforms, only the 8 least significant bits will be used, /// which can cause surprises with negative exit values (`-42` would end up as `214`). See /// [`std::process::exit`]. diff --git a/src/window.rs b/src/window.rs index b1e23c03..272a454b 100644 --- a/src/window.rs +++ b/src/window.rs @@ -445,7 +445,7 @@ impl WindowBuilder { /// to the client area of its parent window. For more information, see /// /// - **X11**: A child window is confined to the client area of its parent window. - /// - **Android / iOS / Wayland:** Unsupported. + /// - **Android / iOS / Wayland / Web:** Unsupported. #[inline] pub unsafe fn with_parent_window(mut self, parent_window: Option) -> Self { self.window.parent_window = parent_window;