Handle spurious WM_SIZE messages

Cargo.toml

@@ -1,15 +1,13 @@
 [package]
-name = "winit"
+name = "floem-winit"
 version = "0.29.4"
 authors = ["The winit contributors", "Pierre Krieger <[email protected]>"]
-description = "Cross-platform window creation library."
+description = "Unofficial winit fork for Floem"
 edition = "2021"
-keywords = ["windowing"]
 license = "Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/rust-windowing/winit"
+repository = "https://github.com/lapce/winit"
 documentation = "https://docs.rs/winit"
-categories = ["gui"]
 rust-version = "1.65.0"
 
 [package.metadata.docs.rs]

README.md

@@ -1,187 +1,3 @@
-# winit - Cross-platform window creation and management in Rust
+You are probably looking for the [real winit crate](https://crates.io/crates/winit).
 
-[![Crates.io](https://img.shields.io/crates/v/winit.svg)](https://crates.io/crates/winit)
-[![Docs.rs](https://docs.rs/winit/badge.svg)](https://docs.rs/winit)
-[![CI Status](https://github.com/rust-windowing/winit/workflows/CI/badge.svg)](https://github.com/rust-windowing/winit/actions)
-
-```toml
-[dependencies]
-winit = "0.29.4"
-```
-
-## [Documentation](https://docs.rs/winit)
-
-For features _within_ the scope of winit, see [FEATURES.md](FEATURES.md).
-
-For features _outside_ the scope of winit, see [Are we GUI Yet?](https://areweguiyet.com/) and [Are we game yet?](https://arewegameyet.rs/), depending on what kind of project you're looking to do.
-
-## Contact Us
-
-Join us in any of these:
-
-[![Matrix](https://img.shields.io/badge/Matrix-%23rust--windowing%3Amatrix.org-blueviolet.svg)](https://matrix.to/#/#rust-windowing:matrix.org)
-[![Libera.Chat](https://img.shields.io/badge/libera.chat-%23winit-red.svg)](https://web.libera.chat/#winit)
-
-## Usage
-
-Winit is a window creation and management library. It can create windows and lets you handle
-events (for example: the window being resized, a key being pressed, a mouse movement, etc.)
-produced by the window.
-
-Winit is designed to be a low-level brick in a hierarchy of libraries. Consequently, in order to
-show something on the window you need to use the platform-specific getters provided by winit, or
-another library.
-
-### Cargo Features
-
-Winit provides the following features, which can be enabled in your `Cargo.toml` file:
-* `serde`: Enables serialization/deserialization of certain types with [Serde](https://crates.io/crates/serde).
-* `x11` (enabled by default): On Unix platform, compiles with the X11 backend
-* `wayland` (enabled by default): On Unix platform, compiles with the Wayland backend
-* `mint`: Enables mint (math interoperability standard types) conversions.
-
-## MSRV Policy
-
-This crate's Minimum Supported Rust Version (MSRV) is **1.65**. Changes to
-the MSRV will be accompanied by a minor version bump.
-
-As a **tentative** policy, the upper bound of the MSRV is given by the following
-formula:
-
-```
-min(sid, stable - 3)
-```
-
-Where `sid` is the current version of `rustc` provided by [Debian Sid], and
-`stable` is the latest stable version of Rust. This bound may be broken in case of a major ecosystem shift or a security vulnerability.
-
-[Debian Sid]: https://packages.debian.org/sid/rustc
-
-The exception is for the Android platform, where a higher Rust version
-must be used for certain Android features. In this case, the MSRV will be
-capped at the latest stable version of Rust minus three. This inconsistency is
-not reflected in Cargo metadata, as it is not powerful enough to expose this
-restriction.
-
-All crates in the [`rust-windowing`] organizations have the
-same MSRV policy.
-
-[`rust-windowing`]: https://github.com/rust-windowing
-
-### Platform-specific usage
-
-#### Wayland
-
-Note that windows don't appear on Wayland until you draw/present to them.
-
-#### WebAssembly
-
-To run the web example: `cargo run-wasm --example web`
-
-Winit supports compiling to the `wasm32-unknown-unknown` target with `web-sys`.
-
-On the web platform, a Winit window is backed by a `<canvas>` element. You can
-either [provide Winit with a `<canvas>` element][web with_canvas], or [let Winit
-create a `<canvas>` element which you can then retrieve][web canvas getter] and
-insert it into the DOM yourself.
-
-For the example code using Winit with WebAssembly, check out the [web example]. For
-information on using Rust on WebAssembly, check out the [Rust and WebAssembly
-book].
-
-[web with_canvas]: https://docs.rs/winit/latest/wasm32-unknown-unknown/winit/platform/web/trait.WindowBuilderExtWebSys.html#tymethod.with_canvas
-[web canvas getter]: https://docs.rs/winit/latest/wasm32-unknown-unknown/winit/platform/web/trait.WindowExtWebSys.html#tymethod.canvas
-[web example]: ./examples/web.rs
-[Rust and WebAssembly book]: https://rustwasm.github.io/book/
-
-#### Android
-
-The Android backend builds on (and exposes types from) the [`ndk`](https://docs.rs/ndk/latest/ndk/) crate.
-
-Native Android applications need some form of "glue" crate that is responsible
-for defining the main entry point for your Rust application as well as tracking
-various life-cycle events and synchronizing with the main JVM thread.
-
-Winit uses the [android-activity](https://github.com/rib/android-activity) as a
-glue crate (prior to `0.28` it used
-[ndk-glue](https://github.com/rust-windowing/android-ndk-rs/tree/master/ndk-glue)).
-
-The version of the glue crate that your application depends on _must_ match the
-version that Winit depends on because the glue crate is responsible for your
-application's main entry point. If Cargo resolves multiple versions, they will
-clash.
-
-`winit` glue compatibility table:
-
-| winit |       ndk-glue               |
-| :---: | :--------------------------: |
-| 0.29  | `android-activity = "0.5"`   |
-| 0.28  | `android-activity = "0.4"`   |
-| 0.27  | `ndk-glue = "0.7"`           |
-| 0.26  | `ndk-glue = "0.5"`           |
-| 0.25  | `ndk-glue = "0.3"`           |
-| 0.24  | `ndk-glue = "0.2"`           |
-
-The recommended way to avoid a conflict with the glue version is to avoid explicitly
-depending on the `android-activity` crate, and instead consume the API that
-is re-exported by Winit under `winit::platform::android::activity::*`
-
-Running on an Android device needs a dynamic system library. Add this to Cargo.toml:
-
-```toml
-[lib]
-name = "main"
-crate-type = ["cdylib"]
-```
-
-All Android applications are based on an `Activity` subclass, and the
-`android-activity` crate is designed to support different choices for this base
-class. Your application _must_ specify the base class it needs via a feature flag:
-
-| Base Class       | Feature Flag      |  Notes  |
-| :--------------: | :---------------: | :-----: |
-| `NativeActivity` | `android-native-activity` | Built-in to Android - it is possible to use without compiling any Java or Kotlin code. Java or Kotlin code may be needed to subclass `NativeActivity` to access some platform features. It does not derive from the [`AndroidAppCompat`] base class.|
-| [`GameActivity`] | `android-game-activity`   | Derives from [`AndroidAppCompat`], a defacto standard `Activity` base class that helps support a wider range of Android versions. Requires a build system that can compile Java or Kotlin and fetch Android dependencies from a [Maven repository][agdk_jetpack] (or link with an embedded [release][agdk_releases] of [`GameActivity`]) |
-
-[`GameActivity`]: https://developer.android.com/games/agdk/game-activity
-[`GameTextInput`]: https://developer.android.com/games/agdk/add-support-for-text-input
-[`AndroidAppCompat`]: https://developer.android.com/reference/androidx/appcompat/app/AppCompatActivity
-[agdk_jetpack]: https://developer.android.com/jetpack/androidx/releases/games
-[agdk_releases]: https://developer.android.com/games/agdk/download#agdk-libraries
-[Gradle]: https://developer.android.com/studio/build
-
-For more details, refer to these `android-activity` [example applications](https://github.com/rib/android-activity/tree/main/examples).
-
-##### Converting from `ndk-glue` to `android-activity`
-
-If your application is currently based on `NativeActivity` via the `ndk-glue` crate and building with `cargo apk`, then the minimal changes would be:
-1. Remove `ndk-glue` from your `Cargo.toml`
-2. Enable the `"android-native-activity"` feature for Winit: `winit = { version = "0.29.4", features = [ "android-native-activity" ] }`
-3. Add an `android_main` entrypoint (as above), instead of using the '`[ndk_glue::main]` proc macro from `ndk-macros` (optionally add a dependency on `android_logger` and initialize logging as above).
-4. Pass a clone of the `AndroidApp` that your application receives to Winit when building your event loop (as shown above).
-
-#### MacOS
-
-A lot of functionality expects the application to be ready before you start
-doing anything; this includes creating windows, fetching monitors, drawing,
-and so on, see issues [#2238], [#2051] and [#2087].
-
-If you encounter problems, you should try doing your initialization inside
-`Event::Resumed`.
-
-#### iOS
-
-Similar to macOS, iOS's main `UIApplicationMain` does some init work that's required
-by all UI-related code (see issue [#1705]). It would be best to consider creating your windows
-inside `Event::Resumed`.
-
-
-[#2238]: https://github.com/rust-windowing/winit/issues/2238
-[#2051]: https://github.com/rust-windowing/winit/issues/2051
-[#2087]: https://github.com/rust-windowing/winit/issues/2087
-[#1705]: https://github.com/rust-windowing/winit/issues/1705
-
-#### Redox OS
-
-Redox OS has some functionality not yet present that will be implemented when
-its orbital display server provides it.
+Floem depends on winit changes that haven't been upstreamed. To make Floem publishable on crates.io, all its dependencies have to be published there - hence this unofficial crate.

src/event.rs

@@ -581,6 +581,9 @@ pub enum WindowEvent {
     /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
     Occluded(bool),
 
+    /// A menu item was pressed
+    MenuAction(usize),
+
     /// Emitted when a window should be redrawn.
     ///
     /// This gets triggered in two scenarios:

src/lib.rs

@@ -176,6 +176,7 @@ pub mod event;
 pub mod event_loop;
 mod icon;
 pub mod keyboard;
+pub mod menu;
 pub mod monitor;
 mod platform_impl;
 pub mod window;

src/menu.rs

@@ -0,0 +1,41 @@
+use crate::platform_impl;
+
+pub struct Menu(pub(crate) platform_impl::Menu);
+
+impl Menu {
+    /// Create a new empty window or application menu.
+    pub fn new() -> Menu {
+        Menu(platform_impl::Menu::new())
+    }
+
+    /// Create a new empty context menu.
+    pub fn new_for_popup() -> Menu {
+        Menu(platform_impl::Menu::new_for_popup())
+    }
+
+    /// Consume this `Menu`, returning the platform menu object.
+    pub(crate) fn into_inner(self) -> platform_impl::Menu {
+        self.0
+    }
+
+    /// Add the provided `Menu` as a submenu of self, with the provided title.
+    pub fn add_dropdown(&mut self, menu: Menu, text: &str, enabled: bool) {
+        self.0.add_dropdown(menu.0, text, enabled)
+    }
+
+    /// Add an item to this menu.
+    pub fn add_item(&mut self, id: u32, text: &str, selected: Option<bool>, enabled: bool) {
+        self.0.add_item(id, text, selected, enabled)
+    }
+
+    /// Add a separator to the menu.
+    pub fn add_separator(&mut self) {
+        self.0.add_separator()
+    }
+}
+
+impl Default for Menu {
+    fn default() -> Self {
+        Self::new()
+    }
+}

src/platform/macos.rs

@@ -3,7 +3,9 @@ use std::os::raw::c_void;
 use objc2::rc::Id;
 
 use crate::{
+    dpi::Position,
     event_loop::{EventLoopBuilder, EventLoopWindowTarget},
+    menu::Menu,
     monitor::MonitorHandle,
     window::{Window, WindowBuilder},
 };
@@ -79,6 +81,8 @@ pub trait WindowExtMacOS {
 
     /// Getter for the [`WindowExtMacOS::set_option_as_alt`].
     fn option_as_alt(&self) -> OptionAsAlt;
+
+    fn show_context_menu(&self, menu: Menu, position: Option<Position>);
 }
 
 impl WindowExtMacOS for Window {
@@ -157,6 +161,11 @@ impl WindowExtMacOS for Window {
     fn option_as_alt(&self) -> OptionAsAlt {
         self.window.maybe_wait_on_main(|w| w.option_as_alt())
     }
+
+    fn show_context_menu(&self, menu: Menu, position: Option<Position>) {
+        self.window
+            .maybe_queue_on_main(move |w| w.show_context_menu(menu, position))
+    }
 }
 
 /// Corresponds to `NSApplicationActivationPolicy`.
@@ -196,6 +205,8 @@ pub trait WindowBuilderExtMacOS {
     fn with_fullsize_content_view(self, fullsize_content_view: bool) -> Self;
     fn with_disallow_hidpi(self, disallow_hidpi: bool) -> Self;
     fn with_has_shadow(self, has_shadow: bool) -> Self;
+    fn with_movable(self, movable: bool) -> Self;
+    fn with_traffic_lights_offset(self, x: f64, y: f64) -> Self;
     /// Window accepts click-through mouse events.
     fn with_accepts_first_mouse(self, accepts_first_mouse: bool) -> Self;
     /// Defines the window tabbing identifier.
@@ -239,6 +250,18 @@ impl WindowBuilderExtMacOS for WindowBuilder {
         self
     }
 
+    #[inline]
+    fn with_movable(mut self, movable: bool) -> Self {
+        self.platform_specific.movable = movable;
+        self
+    }
+
+    #[inline]
+    fn with_traffic_lights_offset(mut self, x: f64, y: f64) -> Self {
+        self.platform_specific.traffic_lights_offset = Some((x, y));
+        self
+    }
+
     #[inline]
     fn with_fullsize_content_view(mut self, fullsize_content_view: bool) -> Self {
         self.platform_specific.fullsize_content_view = fullsize_content_view;

src/platform/windows.rs

@@ -1,10 +1,11 @@
 use std::{ffi::c_void, path::Path};
 
 use crate::{
-    dpi::PhysicalSize,
+    dpi::{PhysicalSize, Position},
     event::{DeviceId, KeyEvent},
     event_loop::EventLoopBuilder,
     keyboard::Key,
+    menu::Menu,
     monitor::MonitorHandle,
     platform::modifier_supplement::KeyEventExtModifierSupplement,
     platform_impl::WinIcon,
@@ -136,6 +137,8 @@ pub trait WindowExtWindows {
     ///
     /// Enabling the shadow causes a thin 1px line to appear on the top of the window.
     fn set_undecorated_shadow(&self, shadow: bool);
+
+    fn show_context_menu(&self, menu: Menu, position: Option<Position>);
 }
 
 impl WindowExtWindows for Window {
@@ -158,6 +161,10 @@ impl WindowExtWindows for Window {
     fn set_undecorated_shadow(&self, shadow: bool) {
         self.window.set_undecorated_shadow(shadow)
     }
+
+    fn show_context_menu(&self, menu: Menu, position: Option<Position>) {
+        self.window.show_context_menu(menu, position);
+    }
 }
 
 /// Additional methods on `WindowBuilder` that are specific to Windows.

src/platform_impl/linux/mod.rs

@@ -960,3 +960,21 @@ fn is_main_thread() -> bool {
 fn is_main_thread() -> bool {
     std::thread::current().name() == Some("main")
 }
+
+pub struct Menu(usize);
+
+impl Menu {
+    pub fn new() -> Menu {
+        Menu(0)
+    }
+
+    pub fn new_for_popup() -> Menu {
+        Menu(0)
+    }
+
+    pub fn add_dropdown(&mut self, menu: Menu, text: &str, enabled: bool) {}
+
+    pub fn add_item(&mut self, id: u32, text: &str, selected: Option<bool>, enabled: bool) {}
+
+    pub fn add_separator(&mut self) {}
+}