Relase alpha 6 (#1338)

* Relase alpha 6

* Update CHANGELOG.md

Co-authored-by: Freya Gentz <zegentzy@protonmail.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,7 @@
 - [ ] Tested on all platforms changed
 - [ ] Compilation warnings were addressed
 - [ ] `cargo fmt` has been run on this branch
+- [ ] `cargo doc` builds successfully
 - [ ] Added an entry to `CHANGELOG.md` if knowledge of this change could be valuable to users
 - [ ] Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
 - [ ] Created or updated an example program if it would help users understand this functionality

.travis.yml

@@ -81,6 +81,8 @@ install:
 
 script:
   - cargo +stable fmt --all -- --check
+  # Ensure that the documentation builds properly.
+  - cargo doc --no-deps
   # Install cargo-web to build stdweb
   - if [[ $WEB = "web" ]]; then cargo install -f cargo-web; fi
   # Build without serde then with serde

CHANGELOG.md

@@ -1,5 +1,51 @@
 # Unreleased
 
+# 0.20.0 Alpha 6 (2020-01-03)
+
+- On macOS, fix `set_cursor_visible` hides cursor outside of window.
+- On macOS, fix `CursorEntered` and `CursorLeft` events fired at old window size.
+- On macOS, fix error when `set_fullscreen` is called during fullscreen transition.
+- On all platforms except mobile and WASM, implement `Window::set_minimized`.
+- On X11, fix `CursorEntered` event being generated for non-winit windows.
+- On macOS, fix crash when starting maximized without decorations.
+- On macOS, fix application not to terminate on `run_return`.
+- On Wayland, fix cursor icon updates on window borders when using CSD.
+- On Wayland, under mutter(GNOME Wayland), fix CSD being behind the status bar, when starting window in maximized mode.
+- On Windows, theme the title bar according to whether the system theme is "Light" or "Dark".
+- Added `WindowEvent::ThemeChanged` variant to handle changes to the system theme. Currently only implemented on Windows.
+- **Breaking**: Changes to the `RedrawRequested` event (#1041):
+  - `RedrawRequested` has been moved from `WindowEvent` to `Event`.
+  - `EventsCleared` has been renamed to `MainEventsCleared`.
+  - `RedrawRequested` is now issued only after `MainEventsCleared`.
+  - `RedrawEventsCleared` is issued after each set of `RedrawRequested` events.
+- Implement synthetic window focus key events on Windows.
+- **Breaking**: Change `ModifiersState` to a `bitflags` struct.
+- On Windows, implement `VirtualKeyCode` translation for `LWin` and `RWin`.
+- On Windows, fix closing the last opened window causing `DeviceEvent`s to stop getting emitted.
+- On Windows, fix `Window::set_visible` not setting internal flags correctly. This resulted in some weird behavior.
+- Add `DeviceEvent::ModifiersChanged`.
+  - Deprecate `modifiers` fields in other events in favor of `ModifiersChanged`.
+- On X11, `WINIT_HIDPI_FACTOR` now dominates `Xft.dpi` when picking DPI factor for output.
+- On X11, add special value `randr` for `WINIT_HIDPI_FACTOR` to make winit use self computed DPI factor instead of the one from `Xft.dpi`.
+
+# 0.20.0 Alpha 5 (2019-12-09)
+
+- On macOS, fix application termination on `ControlFlow::Exit`
+- On Windows, fix missing `ReceivedCharacter` events when Alt is held.
+- On macOS, stop emitting private corporate characters in `ReceivedCharacter` events.
+- On X11, fix misreporting DPI factor at startup.
+- On X11, fix events not being reported when using `run_return`.
+- On X11, fix key modifiers being incorrectly reported.
+- On X11, fix window creation hanging when another window is fullscreen.
+- On Windows, fix focusing unfocused windows when switching from fullscreen to windowed.
+- On X11, fix reporting incorrect DPI factor when waking from suspend.
+- Change `EventLoopClosed` to contain the original event.
+- **Breaking**: Add `is_synthetic` field to `WindowEvent` variant `KeyboardInput`,
+  indicating that the event is generated by winit.
+- On X11, generate synthetic key events for keys held when a window gains or loses focus.
+- On X11, issue a `CursorMoved` event when a `Touch` event occurs,
+  as X11 implicitly moves the cursor for such events.
+
 # 0.20.0 Alpha 4 (2019-10-18)
 
 - Add web support via the 'stdweb' or 'web-sys' features
@@ -26,6 +72,7 @@
 - On X11, return dummy monitor data to avoid panicking when no monitors exist.
 - On X11, prevent stealing input focus when creating a new window.
   Only steal input focus when entering fullscreen mode.
+- On Wayland, fixed DeviceEvents for relative mouse movement is not always produced
 - On Wayland, add support for set_cursor_visible and set_cursor_grab.
 - On Wayland, fixed DeviceEvents for relative mouse movement is not always produced.
 - Removed `derivative` crate dependency.
@@ -41,6 +88,7 @@
   - This is because some platforms cannot run the event loop outside the main thread. Preventing this
     reduces the potential for cross-platform compatibility gotchyas.
 - On Windows and Linux X11/Wayland, add platform-specific functions for creating an `EventLoop` outside the main thread.
+- On Wayland, drop resize events identical to the current window size.
 
 # 0.20.0 Alpha 3 (2019-08-14)
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "winit"
-version = "0.20.0-alpha4"
+version = "0.20.0-alpha6"
 authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
 edition = "2018"
@@ -25,6 +25,7 @@ libc = "0.2.64"
 log = "0.4"
 serde = { version = "1", optional = true, features = ["serde_derive"] }
 raw-window-handle = "0.3"
+bitflags = "1"
 
 [dev-dependencies]
 image = "0.21"
@@ -48,9 +49,6 @@ version = "0.1.3"
 default_features = false
 features = ["display_link"]
 
-[target.'cfg(any(target_os = "ios", target_os = "windows"))'.dependencies]
-bitflags = "1"
-
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
 version = "0.3.6"
 features = [
@@ -83,7 +81,7 @@ x11-dl = "2.18.3"
 percent-encoding = "2.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.9"
+version = "0.10"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web_sys]
 package = "web-sys"
@@ -117,3 +115,6 @@ package = "stdweb"
 version = "=0.4.20"
 optional = true
 features = ["experimental_features_which_may_break_on_minor_version_bumps"]
+
+[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
+console_log = "0.1"

FEATURES.md

@@ -80,6 +80,7 @@ If your PR makes notable changes to Winit's features, please update this section
 - **Window maximization**: The windows created by winit can be maximized upon creation.
 - **Window maximization toggle**: The windows created by winit can be maximized and unmaximized after
   creation.
+- **Window minimization**: The windows created by winit can be minimized after creation.
 - **Fullscreen**: The windows created by winit can be put into fullscreen mode.
 - **Fullscreen toggle**: The windows created by winit can be switched to and from fullscreen after
   creation.
@@ -116,6 +117,7 @@ If your PR makes notable changes to Winit's features, please update this section
 * Setting the taskbar icon
 * Setting the parent window
 * `WS_EX_NOREDIRECTIONBITMAP` support
+* Theme the title bar according to Windows 10 Dark Mode setting
 
 ### macOS
 * Window activation policy
@@ -173,6 +175,7 @@ Legend:
 |Window transparency              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|N/A        |
 |Window maximization              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|
 |Window maximization toggle       |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|
+|Window minimization              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|
 |Fullscreen                       |✔️     |✔️     |✔️         |✔️             |**N/A**|✔️     |✔️        |
 |Fullscreen toggle                |✔️     |✔️     |✔️         |✔️             |**N/A**|✔️     |✔️        |
 |Exclusive fullscreen             |✔️     |✔️     |✔️         |**N/A**         |❌    |✔️     |**N/A**|

README.md

@@ -7,7 +7,7 @@
 
 ```toml
 [dependencies]
-winit = "0.20.0-alpha4"
+winit = "0.20.0-alpha6"
 ```
 
 ## [Documentation](https://docs.rs/winit)

appveyor.yml

@@ -32,3 +32,4 @@ build: false
 test_script:
   - cargo test --verbose
   - cargo test --features serde --verbose
+  - cargo doc --no-deps

examples/cursor_grab.rs

@@ -1,5 +1,5 @@
 use winit::{
-    event::{DeviceEvent, ElementState, Event, KeyboardInput, WindowEvent},
+    event::{DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
     window::WindowBuilder,
 };
@@ -12,6 +12,8 @@ fn main() {
         .build(&event_loop)
         .unwrap();
 
+    let mut modifiers = ModifiersState::default();
+
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Wait;
         match event {
@@ -22,7 +24,6 @@ fn main() {
                         KeyboardInput {
                             state: ElementState::Released,
                             virtual_keycode: Some(key),
-                            modifiers,
                             ..
                         },
                     ..
@@ -30,8 +31,8 @@ fn main() {
                     use winit::event::VirtualKeyCode::*;
                     match key {
                         Escape => *control_flow = ControlFlow::Exit,
-                        G => window.set_cursor_grab(!modifiers.shift).unwrap(),
-                        H => window.set_cursor_visible(modifiers.shift),
+                        G => window.set_cursor_grab(!modifiers.shift()).unwrap(),
+                        H => window.set_cursor_visible(modifiers.shift()),
                         _ => (),
                     }
                 }
@@ -43,6 +44,7 @@ fn main() {
                     ElementState::Pressed => println!("mouse button {} pressed", button),
                     ElementState::Released => println!("mouse button {} released", button),
                 },
+                DeviceEvent::ModifiersChanged(m) => modifiers = m,
                 _ => (),
             },
             _ => (),

examples/minimize.rs

@@ -0,0 +1,35 @@
+extern crate winit;
+
+use winit::event::{Event, VirtualKeyCode, WindowEvent};
+use winit::event_loop::{ControlFlow, EventLoop};
+use winit::window::WindowBuilder;
+
+fn main() {
+    let event_loop = EventLoop::new();
+
+    let window = WindowBuilder::new()
+        .with_title("A fantastic window!")
+        .build(&event_loop)
+        .unwrap();
+
+    event_loop.run(move |event, _, control_flow| match event {
+        Event::WindowEvent {
+            event: WindowEvent::CloseRequested,
+            ..
+        } => *control_flow = ControlFlow::Exit,
+
+        // Keyboard input event to handle minimize via a hotkey
+        Event::WindowEvent {
+            event: WindowEvent::KeyboardInput { input, .. },
+            window_id,
+        } => {
+            if window_id == window.id() {
+                // Pressing the 'M' key will minimize the window
+                if input.virtual_keycode == Some(VirtualKeyCode::M) {
+                    window.set_minimized(true);
+                }
+            }
+        }
+        _ => *control_flow = ControlFlow::Wait,
+    });
+}

examples/multithreaded.rs

@@ -60,7 +60,7 @@ fn main() {
                         ..
                     } => {
                         window.set_title(&format!("{:?}", key));
-                        let state = !modifiers.shift;
+                        let state = !modifiers.shift();
                         use VirtualKeyCode::*;
                         match key {
                             A => window.set_always_on_top(state),
@@ -81,7 +81,7 @@ fn main() {
                                     video_modes.iter().nth(video_mode_id).unwrap()
                                 );
                             }
-                            F => window.set_fullscreen(match (state, modifiers.alt) {
+                            F => window.set_fullscreen(match (state, modifiers.alt()) {
                                 (true, false) => {
                                     Some(Fullscreen::Borderless(window.current_monitor()))
                                 }

examples/request_redraw.rs

@@ -20,14 +20,11 @@ fn main() {
             event: WindowEvent::CloseRequested,
             ..
         } => *control_flow = ControlFlow::Exit,
-        Event::EventsCleared => {
+        Event::MainEventsCleared => {
             window.request_redraw();
             *control_flow = ControlFlow::WaitUntil(Instant::now() + Duration::new(1, 0))
         }
-        Event::WindowEvent {
-            event: WindowEvent::RedrawRequested,
-            ..
-        } => {
+        Event::RedrawRequested(_) => {
             println!("{:?}", event);
         }
         _ => (),

examples/web.rs

@@ -0,0 +1,72 @@
+use winit::{
+    event::{Event, WindowEvent},
+    event_loop::{ControlFlow, EventLoop},
+    window::WindowBuilder,
+};
+
+pub fn main() {
+    let event_loop = EventLoop::new();
+
+    let window = WindowBuilder::new()
+        .with_title("A fantastic window!")
+        .build(&event_loop)
+        .unwrap();
+
+    #[cfg(feature = "web-sys")]
+    {
+        use winit::platform::web::WindowExtWebSys;
+
+        let canvas = window.canvas();
+
+        let window = web_sys::window().unwrap();
+        let document = window.document().unwrap();
+        let body = document.body().unwrap();
+
+        body.append_child(&canvas)
+            .expect("Append canvas to HTML body");
+    }
+
+    #[cfg(feature = "stdweb")]
+    {
+        use std_web::web::INode;
+        use winit::platform::web::WindowExtStdweb;
+
+        let canvas = window.canvas();
+
+        let document = std_web::web::document();
+        let body: std_web::web::Node = document.body().expect("Get HTML body").into();
+
+        body.append_child(&canvas);
+    }
+
+    event_loop.run(move |event, _, control_flow| {
+        #[cfg(feature = "web-sys")]
+        log::debug!("{:?}", event);
+
+        #[cfg(feature = "stdweb")]
+        std_web::console!(log, "%s", format!("{:?}", event));
+
+        match event {
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                window_id,
+            } if window_id == window.id() => *control_flow = ControlFlow::Exit,
+            Event::MainEventsCleared => {
+                window.request_redraw();
+            }
+            _ => *control_flow = ControlFlow::Wait,
+        }
+    });
+}
+
+#[cfg(feature = "web-sys")]
+mod wasm {
+    use wasm_bindgen::prelude::*;
+
+    #[wasm_bindgen(start)]
+    pub fn run() {
+        console_log::init_with_level(log::Level::Debug);
+
+        super::main();
+    }
+}

examples/window.rs

@@ -20,7 +20,10 @@ fn main() {
                 event: WindowEvent::CloseRequested,
                 window_id,
             } if window_id == window.id() => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            Event::MainEventsCleared => {
+                window.request_redraw();
+            }
+            _ => *control_flow = ControlFlow::Poll,
         }
     });
 }

examples/window_debug.rs

@@ -0,0 +1,121 @@
+// This example is used by developers to test various window functions.
+
+use winit::{
+    dpi::{LogicalSize, PhysicalSize},
+    event::{DeviceEvent, ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
+    event_loop::{ControlFlow, EventLoop},
+    window::{Fullscreen, WindowBuilder},
+};
+
+fn main() {
+    let event_loop = EventLoop::new();
+
+    let window = WindowBuilder::new()
+        .with_title("A fantastic window!")
+        .with_inner_size(LogicalSize::from((100, 100)))
+        .build(&event_loop)
+        .unwrap();
+
+    eprintln!("debugging keys:");
+    eprintln!("  (E) Enter exclusive fullscreen");
+    eprintln!("  (F) Toggle borderless fullscreen");
+    #[cfg(waiting_for_set_minimized)]
+    eprintln!("  (M) Toggle minimized");
+    eprintln!("  (Q) Quit event loop");
+    eprintln!("  (V) Toggle visibility");
+    eprintln!("  (X) Toggle maximized");
+
+    #[cfg(waiting_for_set_minimized)]
+    let mut minimized = false;
+    let mut maximized = false;
+    let mut visible = true;
+
+    event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
+
+        match event {
+            Event::DeviceEvent {
+                event:
+                    DeviceEvent::Key(KeyboardInput {
+                        virtual_keycode: Some(key),
+                        state: ElementState::Pressed,
+                        ..
+                    }),
+                ..
+            } => match key {
+                #[cfg(waiting_for_set_minimized)]
+                VirtualKeyCode::M => {
+                    if minimized {
+                        minimized = !minimized;
+                        window.set_minimized(minimized);
+                    }
+                }
+                VirtualKeyCode::V => {
+                    if !visible {
+                        visible = !visible;
+                        window.set_visible(visible);
+                    }
+                }
+                _ => (),
+            },
+            Event::WindowEvent {
+                event: WindowEvent::KeyboardInput { input, .. },
+                ..
+            } => match input {
+                KeyboardInput {
+                    virtual_keycode: Some(key),
+                    state: ElementState::Pressed,
+                    ..
+                } => match key {
+                    VirtualKeyCode::E => {
+                        fn area(size: PhysicalSize) -> f64 {
+                            size.width * size.height
+                        }
+
+                        let monitor = window.current_monitor();
+                        if let Some(mode) = monitor.video_modes().max_by(|a, b| {
+                            area(a.size())
+                                .partial_cmp(&area(b.size()))
+                                .expect("NaN in video mode size")
+                        }) {
+                            window.set_fullscreen(Some(Fullscreen::Exclusive(mode)));
+                        } else {
+                            eprintln!("no video modes available");
+                        }
+                    }
+                    VirtualKeyCode::F => {
+                        if window.fullscreen().is_some() {
+                            window.set_fullscreen(None);
+                        } else {
+                            let monitor = window.current_monitor();
+                            window.set_fullscreen(Some(Fullscreen::Borderless(monitor)));
+                        }
+                    }
+                    #[cfg(waiting_for_set_minimized)]
+                    VirtualKeyCode::M => {
+                        minimized = !minimized;
+                        window.set_minimized(minimized);
+                    }
+                    VirtualKeyCode::Q => {
+                        *control_flow = ControlFlow::Exit;
+                    }
+                    VirtualKeyCode::V => {
+                        visible = !visible;
+                        window.set_visible(visible);
+                    }
+                    VirtualKeyCode::X => {
+                        maximized = !maximized;
+                        window.set_maximized(maximized);
+                    }
+                    _ => (),
+                },
+                _ => (),
+            },
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                window_id,
+            } if window_id == window.id() => *control_flow = ControlFlow::Exit,
+            _ => (),
+        }
+    });
+}

examples/window_run_return.rs

@@ -9,6 +9,7 @@
     target_os = "openbsd"
 ))]
 fn main() {
+    use std::{thread::sleep, time::Duration};
     use winit::{
         event::{Event, WindowEvent},
         event_loop::{ControlFlow, EventLoop},
@@ -17,36 +18,38 @@ fn main() {
     };
     let mut event_loop = EventLoop::new();
 
-    let window = WindowBuilder::new()
+    let _window = WindowBuilder::new()
         .with_title("A fantastic window!")
         .build(&event_loop)
         .unwrap();
 
-    println!("Close the window to continue.");
-    event_loop.run_return(|event, _, control_flow| match event {
-        Event::WindowEvent {
-            event: WindowEvent::CloseRequested,
-            ..
-        } => *control_flow = ControlFlow::Exit,
-        _ => *control_flow = ControlFlow::Wait,
-    });
-    drop(window);
+    let mut quit = false;
 
-    let _window_2 = WindowBuilder::new()
-        .with_title("A second, fantasticer window!")
-        .build(&event_loop)
-        .unwrap();
+    while !quit {
+        event_loop.run_return(|event, _, control_flow| {
+            if let Event::WindowEvent { event, .. } = &event {
+                // Print only Window events to reduce noise
+                println!("{:?}", event);
+            }
 
-    println!("Wa ha ha! You thought that closing the window would finish this?!");
-    event_loop.run_return(|event, _, control_flow| match event {
-        Event::WindowEvent {
-            event: WindowEvent::CloseRequested,
-            ..
-        } => *control_flow = ControlFlow::Exit,
-        _ => *control_flow = ControlFlow::Wait,
-    });
+            match event {
+                Event::WindowEvent {
+                    event: WindowEvent::CloseRequested,
+                    ..
+                } => {
+                    quit = true;
+                    *control_flow = ControlFlow::Exit;
+                }
+                Event::MainEventsCleared => {
+                    *control_flow = ControlFlow::Exit;
+                }
+                _ => *control_flow = ControlFlow::Wait,
+            }
+        });
 
-    println!("Okay we're done now for real.");
+        // Sleep for 1/60 second to simulate rendering
+        sleep(Duration::from_millis(16));
+    }
 }
 
 #[cfg(any(target_os = "ios", target_os = "android", target_arch = "wasm32"))]

src/dpi.rs

@@ -28,18 +28,18 @@
 //! them entering an existential panic. Once users enter that state, they will no longer be focused on your application.
 //!
 //! There are two ways to get the DPI factor:
-//! - You can track the [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged) event of your
+//! - You can track the [`HiDpiFactorChanged`](crate::event::WindowEvent::HiDpiFactorChanged) event of your
 //!   windows. This event is sent any time the DPI factor changes, either because the window moved to another monitor,
 //!   or because the user changed the configuration of their screen.
 //! - You can also retrieve the DPI factor of a monitor by calling
-//!   [`MonitorHandle::hidpi_factor`](../monitor/struct.MonitorHandle.html#method.hidpi_factor), or the
+//!   [`MonitorHandle::hidpi_factor`](crate::monitor::MonitorHandle::hidpi_factor), or the
 //!   current DPI factor applied to a window by calling
-//!   [`Window::hidpi_factor`](../window/struct.Window.html#method.hidpi_factor), which is roughly equivalent
+//!   [`Window::hidpi_factor`](crate::window::Window::hidpi_factor), which is roughly equivalent
 //!   to `window.current_monitor().hidpi_factor()`.
 //!
 //! Depending on the platform, the window's actual DPI factor may only be known after
 //! the event loop has started and your window has been drawn once. To properly handle these cases,
-//! the most robust way is to monitor the [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged)
+//! the most robust way is to monitor the [`HiDpiFactorChanged`](crate::event::WindowEvent::HiDpiFactorChanged)
 //! event and dynamically adapt your drawing logic to follow the DPI factor.
 //!
 //! Here's an overview of what sort of DPI factors you can expect, and where they come from:
@@ -49,7 +49,7 @@
 //! - **macOS:** The buzzword is "retina displays", which have a DPI factor of 2.0. Otherwise, the DPI factor is 1.0.
 //! Intermediate DPI factors are never used, thus 1440p displays/etc. aren't properly supported. It's possible for any
 //! display to use that 2.0 DPI factor, given the use of the command line.
-//! - **X11:** On X11, we calcuate the DPI factor based on the millimeter dimensions provided by XRandR. This can
+//! - **X11:** On X11, we calculate the DPI factor based on the millimeter dimensions provided by XRandR. This can
 //! result in a wide range of possible values, including some interesting ones like 1.0833333333333333. This can be
 //! overridden using the `WINIT_HIDPI_FACTOR` environment variable, though that's not recommended.
 //! - **Wayland:** On Wayland, DPI factors are set per-screen by the server, and are always integers (most often 1 or 2).
@@ -59,21 +59,21 @@
 //!
 //! The window's logical size is conserved across DPI changes, resulting in the physical size changing instead. This
 //! may be surprising on X11, but is quite standard elsewhere. Physical size changes always produce a
-//! [`Resized`](../event/enum.WindowEvent.html#variant.Resized) event, even on platforms where no resize actually occurs,
+//! [`Resized`](crate::event::WindowEvent::Resized) event, even on platforms where no resize actually occurs,
 //! such as macOS and Wayland. As a result, it's not necessary to separately handle
-//! [`HiDpiFactorChanged`](../event/enum.WindowEvent.html#variant.HiDpiFactorChanged) if you're only listening for size.
+//! [`HiDpiFactorChanged`](crate::event::WindowEvent::HiDpiFactorChanged) if you're only listening for size.
 //!
 //! Your GPU has no awareness of the concept of logical pixels, and unless you like wasting pixel density, your
 //! framebuffer's size should be in physical pixels.
 //!
-//! `winit` will send [`Resized`](../enum.WindowEvent.html#variant.Resized) events whenever a window's logical size
-//! changes, and [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged) events
+//! `winit` will send [`Resized`](crate::event::WindowEvent::Resized) events whenever a window's logical size
+//! changes, and [`HiDpiFactorChanged`](crate::event::WindowEvent::HiDpiFactorChanged) events
 //! whenever the DPI factor changes. Receiving either of these events means that the physical size of your window has
 //! changed, and you should recompute it using the latest values you received for each. If the logical size and the
 //! DPI factor change simultaneously, `winit` will send both events together; thus, it's recommended to buffer
 //! these events and process them at the end of the queue.
 //!
-//! If you never received any [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged) events,
+//! If you never received any [`HiDpiFactorChanged`](crate::event::WindowEvent::HiDpiFactorChanged) events,
 //! then your window's DPI factor is 1.
 
 /// Checks that the DPI factor is a normal positive `f64`.

src/event.rs

@@ -3,14 +3,14 @@
 //! These are sent to the closure given to [`EventLoop::run(...)`][event_loop_run], where they get
 //! 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
+//! [event_loop_run]: crate::event_loop::EventLoop::run
 use instant::Instant;
 use std::path::PathBuf;
 
 use crate::{
     dpi::{LogicalPosition, LogicalSize},
     platform_impl,
-    window::WindowId,
+    window::{Theme, WindowId},
 };
 
 /// Describes a generic event.
@@ -26,13 +26,26 @@ pub enum Event<T> {
         device_id: DeviceId,
         event: DeviceEvent,
     },
-    /// Emitted when an event is sent from [`EventLoopProxy::send_event`](../event_loop/struct.EventLoopProxy.html#method.send_event)
+    /// Emitted when an event is sent from [`EventLoopProxy::send_event`](crate::event_loop::EventLoopProxy::send_event)
     UserEvent(T),
     /// Emitted when new events arrive from the OS to be processed.
     NewEvents(StartCause),
-    /// Emitted when all of the event loop's events have been processed and control flow is about
-    /// to be taken away from the program.
-    EventsCleared,
+    /// Emitted when all events (except for `RedrawRequested`) have been reported.
+    ///
+    /// This event is followed by zero or more instances of `RedrawRequested`
+    /// and, finally, `RedrawEventsCleared`.
+    MainEventsCleared,
+
+    /// The OS or application has requested that a window be redrawn.
+    ///
+    /// Emitted only after `MainEventsCleared`.
+    RedrawRequested(WindowId),
+
+    /// Emitted after any `RedrawRequested` events.
+    ///
+    /// If there are no `RedrawRequested` events, it is reported immediately after
+    /// `MainEventsCleared`.
+    RedrawEventsCleared,
 
     /// Emitted when the event loop is being shut down. This is irreversable - if this event is
     /// emitted, it is guaranteed to be the last event emitted.
@@ -53,7 +66,9 @@ impl<T> Event<T> {
             WindowEvent { window_id, event } => Ok(WindowEvent { window_id, event }),
             DeviceEvent { device_id, event } => Ok(DeviceEvent { device_id, event }),
             NewEvents(cause) => Ok(NewEvents(cause)),
-            EventsCleared => Ok(EventsCleared),
+            MainEventsCleared => Ok(MainEventsCleared),
+            RedrawRequested(wid) => Ok(RedrawRequested(wid)),
+            RedrawEventsCleared => Ok(RedrawEventsCleared),
             LoopDestroyed => Ok(LoopDestroyed),
             Suspended => Ok(Suspended),
             Resumed => Ok(Resumed),
@@ -132,12 +147,18 @@ pub enum WindowEvent {
     KeyboardInput {
         device_id: DeviceId,
         input: KeyboardInput,
+        /// If `true`, the event was generated synthetically by winit
+        /// in one of the following circumstances:
+        ///
+        /// * Synthetic key press events are generated for all keys pressed
+        ///   when a window gains focus. Likewise, synthetic key release events
+        ///   are generated for all keys pressed when a window goes out of focus.
+        ///   ***Currently, this is only functional on X11 and Windows***
+        ///
+        /// Otherwise, this value is always `false`.
+        is_synthetic: bool,
     },
 
-    /// Keyboard modifiers have changed
-    #[doc(hidden)]
-    ModifiersChanged { modifiers: ModifiersState },
-
     /// The cursor has moved on the window.
     CursorMoved {
         device_id: DeviceId,
@@ -146,6 +167,7 @@ pub enum WindowEvent {
         /// limited by the display area and it may have been transformed by the OS to implement effects such as cursor
         /// acceleration, it should not be used to implement non-cursor-like interactions such as 3D camera control.
         position: LogicalPosition,
+        #[deprecated = "Deprecated in favor of DeviceEvent::ModifiersChanged"]
         modifiers: ModifiersState,
     },
 
@@ -160,6 +182,7 @@ pub enum WindowEvent {
         device_id: DeviceId,
         delta: MouseScrollDelta,
         phase: TouchPhase,
+        #[deprecated = "Deprecated in favor of DeviceEvent::ModifiersChanged"]
         modifiers: ModifiersState,
     },
 
@@ -168,6 +191,7 @@ pub enum WindowEvent {
         device_id: DeviceId,
         state: ElementState,
         button: MouseButton,
+        #[deprecated = "Deprecated in favor of DeviceEvent::ModifiersChanged"]
         modifiers: ModifiersState,
     },
 
@@ -189,9 +213,6 @@ pub enum WindowEvent {
         value: f64,
     },
 
-    /// The OS or application has requested that the window be redrawn.
-    RedrawRequested,
-
     /// Touch event has been received
     Touch(Touch),
 
@@ -203,8 +224,16 @@ pub enum WindowEvent {
     /// * Changing the display's DPI factor (e.g. in Control Panel on Windows).
     /// * Moving the window to a display with a different DPI factor.
     ///
-    /// For more information about DPI in general, see the [`dpi`](../dpi/index.html) module.
+    /// For more information about DPI in general, see the [`dpi`](crate::dpi) module.
     HiDpiFactorChanged(f64),
+
+    /// The system window theme has changed.
+    ///
+    /// Applications might wish to react to this to change the theme of the content of the window
+    /// when the system changes the window theme.
+    ///
+    /// At the moment this is only supported on Windows.
+    ThemeChanged(Theme),
 }
 
 /// Identifier of an input device.
@@ -266,7 +295,19 @@ pub enum DeviceEvent {
         button: ButtonId,
         state: ElementState,
     },
+
     Key(KeyboardInput),
+
+    /// The keyboard modifiers have changed.
+    ///
+    /// This is tracked internally to avoid tracking errors arising from modifier key state changes when events from
+    /// this device are not being delivered to the application, e.g. due to keyboard focus being elsewhere.
+    ///
+    /// Platform-specific behavior:
+    /// - **Web**: This API is currently unimplemented on the web. This isn't by design - it's an
+    ///   issue, and it should get fixed - but it's the current state of the API.
+    ModifiersChanged(ModifiersState),
+
     Text {
         codepoint: char,
     },
@@ -295,6 +336,7 @@ pub struct KeyboardInput {
     ///
     /// This is tracked internally to avoid tracking errors arising from modifier key state changes when events from
     /// this device are not being delivered to the application, e.g. due to keyboard focus being elsewhere.
+    #[deprecated = "Deprecated in favor of DeviceEvent::ModifiersChanged"]
     pub modifiers: ModifiersState,
 }
 
@@ -641,21 +683,99 @@ pub enum VirtualKeyCode {
     Cut,
 }
 
-/// Represents the current state of the keyboard modifiers
-///
-/// Each field of this struct represents a modifier and is `true` if this modifier is active.
-#[derive(Default, Debug, Hash, PartialEq, Eq, Clone, Copy)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(default))]
-pub struct ModifiersState {
-    /// The "shift" key
-    pub shift: bool,
-    /// The "control" key
-    pub ctrl: bool,
-    /// The "alt" key
-    pub alt: bool,
-    /// The "logo" key
-    ///
-    /// This is the "windows" key on PC and "command" key on Mac.
-    pub logo: bool,
+impl ModifiersState {
+    /// Returns `true` if the shift key is pressed.
+    pub fn shift(&self) -> bool {
+        self.intersects(Self::SHIFT)
+    }
+    /// Returns `true` if the control key is pressed.
+    pub fn ctrl(&self) -> bool {
+        self.intersects(Self::CTRL)
+    }
+    /// Returns `true` if the alt key is pressed.
+    pub fn alt(&self) -> bool {
+        self.intersects(Self::ALT)
+    }
+    /// Returns `true` if the logo key is pressed.
+    pub fn logo(&self) -> bool {
+        self.intersects(Self::LOGO)
+    }
+}
+
+bitflags! {
+    /// Represents the current state of the keyboard modifiers
+    ///
+    /// Each flag represents a modifier and is set if this modifier is active.
+    #[derive(Default)]
+    pub struct ModifiersState: u32 {
+        // left and right modifiers are currently commented out, but we should be able to support
+        // them in a future release
+        /// The "shift" key.
+        const SHIFT = 0b100 << 0;
+        // const LSHIFT = 0b010 << 0;
+        // const RSHIFT = 0b001 << 0;
+        /// The "control" key.
+        const CTRL = 0b100 << 3;
+        // const LCTRL = 0b010 << 3;
+        // const RCTRL = 0b001 << 3;
+        /// The "alt" key.
+        const ALT = 0b100 << 6;
+        // const LALT = 0b010 << 6;
+        // const RALT = 0b001 << 6;
+        /// This is the "windows" key on PC and "command" key on Mac.
+        const LOGO = 0b100 << 9;
+        // const LLOGO = 0b010 << 9;
+        // const RLOGO = 0b001 << 9;
+    }
+}
+
+#[cfg(feature = "serde")]
+mod modifiers_serde {
+    use super::ModifiersState;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    #[derive(Default, Serialize, Deserialize)]
+    #[serde(default)]
+    #[serde(rename = "ModifiersState")]
+    pub struct ModifiersStateSerialize {
+        pub shift: bool,
+        pub ctrl: bool,
+        pub alt: bool,
+        pub logo: bool,
+    }
+
+    impl Serialize for ModifiersState {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            let s = ModifiersStateSerialize {
+                shift: self.shift(),
+                ctrl: self.ctrl(),
+                alt: self.alt(),
+                logo: self.logo(),
+            };
+            s.serialize(serializer)
+        }
+    }
+
+    impl<'de> Deserialize<'de> for ModifiersState {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            let ModifiersStateSerialize {
+                shift,
+                ctrl,
+                alt,
+                logo,
+            } = ModifiersStateSerialize::deserialize(deserializer)?;
+            let mut m = ModifiersState::empty();
+            m.set(ModifiersState::SHIFT, shift);
+            m.set(ModifiersState::CTRL, ctrl);
+            m.set(ModifiersState::ALT, alt);
+            m.set(ModifiersState::LOGO, logo);
+            Ok(m)
+        }
+    }
 }

src/event_loop.rs

@@ -6,9 +6,9 @@
 //! See the root-level documentation for information on how to create and use an event loop to
 //! handle events.
 //!
-//! [create_proxy]: ./struct.EventLoop.html#method.create_proxy
-//! [event_loop_proxy]: ./struct.EventLoopProxy.html
-//! [send_event]: ./struct.EventLoopProxy.html#method.send_event
+//! [create_proxy]: crate::event_loop::EventLoop::create_proxy
+//! [event_loop_proxy]: crate::event_loop::EventLoopProxy
+//! [send_event]: crate::event_loop::EventLoopProxy::send_event
 use instant::Instant;
 use std::ops::Deref;
 use std::{error, fmt};
@@ -59,7 +59,7 @@ impl<T> fmt::Debug for EventLoopWindowTarget<T> {
 
 /// Set by the user callback given to the `EventLoop::run` method.
 ///
-/// Indicates the desired behavior of the event loop after [`Event::EventsCleared`][events_cleared]
+/// Indicates the desired behavior of the event loop after [`Event::RedrawEventsCleared`][events_cleared]
 /// is emitted. Defaults to `Poll`.
 ///
 /// ## Persistency
@@ -68,7 +68,7 @@ impl<T> fmt::Debug for EventLoopWindowTarget<T> {
 /// are **not** persistent between multiple calls to `run_return` - issuing a new call will reset
 /// the control flow to `Poll`.
 ///
-/// [events_cleared]: ../event/enum.Event.html#variant.EventsCleared
+/// [events_cleared]: crate::event::Event::RedrawEventsCleared
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum ControlFlow {
     /// When the current loop iteration finishes, immediately begin a new iteration regardless of
@@ -139,7 +139,7 @@ impl<T> EventLoop<T> {
     ///
     /// Any values not passed to this function will *not* be dropped.
     ///
-    /// [`ControlFlow`]: ./enum.ControlFlow.html
+    /// [`ControlFlow`]: crate::event_loop::ControlFlow
     #[inline]
     pub fn run<F>(self, event_handler: F) -> !
     where
@@ -199,7 +199,7 @@ impl<T: 'static> EventLoopProxy<T> {
     /// function.
     ///
     /// Returns an `Err` if the associated `EventLoop` no longer exists.
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
         self.event_loop_proxy.send_event(event)
     }
 }
@@ -211,17 +211,17 @@ impl<T: 'static> fmt::Debug for EventLoopProxy<T> {
 }
 
 /// The error that is returned when an `EventLoopProxy` attempts to wake up an `EventLoop` that
-/// no longer exists.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct EventLoopClosed;
+/// no longer exists. Contains the original event given to `send_event`.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub struct EventLoopClosed<T>(pub T);
 
-impl fmt::Display for EventLoopClosed {
+impl<T: fmt::Debug> fmt::Display for EventLoopClosed<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", error::Error::description(self))
     }
 }
 
-impl error::Error for EventLoopClosed {
+impl<T: fmt::Debug> error::Error for EventLoopClosed<T> {
     fn description(&self) -> &str {
         "Tried to wake up a closed `EventLoop`"
     }

src/lib.rs

@@ -48,19 +48,16 @@
 //!
 //! event_loop.run(move |event, _, control_flow| {
 //!     match event {
-//!         Event::EventsCleared => {
+//!         Event::MainEventsCleared => {
 //!             // Application update code.
 //!
 //!             // Queue a RedrawRequested event.
 //!             window.request_redraw();
 //!         },
-//!         Event::WindowEvent {
-//!             event: WindowEvent::RedrawRequested,
-//!             ..
-//!         } => {
+//!         Event::RedrawRequested(_) => {
 //!             // Redraw the application.
 //!             //
-//!             // It's preferrable to render in this event rather than in EventsCleared, since
+//!             // It's preferrable to render in this event rather than in MainEventsCleared, since
 //!             // rendering in here allows the program to gracefully handle redraws requested
 //!             // by the OS.
 //!         },
@@ -92,25 +89,26 @@
 //! retrieve the raw handle of the window (see the [`platform`] module), which in turn allows you
 //! to create an OpenGL/Vulkan/DirectX/Metal/etc. context that will draw on the [`Window`].
 //!
-//! [`EventLoop`]: ./event_loop/struct.EventLoop.html
-//! [`EventLoop::new()`]: ./event_loop/struct.EventLoop.html#method.new
-//! [event_loop_run]: ./event_loop/struct.EventLoop.html#method.run
-//! [`ControlFlow`]: ./event_loop/enum.ControlFlow.html
-//! [`Exit`]: ./event_loop/enum.ControlFlow.html#variant.Exit
-//! [`Window`]: ./window/struct.Window.html
-//! [`WindowBuilder`]: ./window/struct.WindowBuilder.html
-//! [window_new]: ./window/struct.Window.html#method.new
-//! [window_builder_new]: ./window/struct.WindowBuilder.html#method.new
-//! [window_builder_build]: ./window/struct.WindowBuilder.html#method.build
-//! [window_id_fn]: ./window/struct.Window.html#method.id
-//! [`Event`]: ./event/enum.Event.html
-//! [`WindowEvent`]: ./event/enum.WindowEvent.html
-//! [`DeviceEvent`]: ./event/enum.DeviceEvent.html
-//! [`UserEvent`]: ./event/enum.Event.html#variant.UserEvent
-//! [`LoopDestroyed`]: ./event/enum.Event.html#variant.LoopDestroyed
-//! [`platform`]: ./platform/index.html
+//! [`EventLoop`]: event_loop::EventLoop
+//! [`EventLoop::new()`]: event_loop::EventLoop::new
+//! [event_loop_run]: event_loop::EventLoop::run
+//! [`ControlFlow`]: event_loop::ControlFlow
+//! [`Exit`]: event_loop::ControlFlow::Exit
+//! [`Window`]: window::Window
+//! [`WindowBuilder`]: window::WindowBuilder
+//! [window_new]: window::Window::new
+//! [window_builder_new]: window::WindowBuilder::new
+//! [window_builder_build]: window::WindowBuilder::build
+//! [window_id_fn]: window::Window::id
+//! [`Event`]: event::Event
+//! [`WindowEvent`]: event::WindowEvent
+//! [`DeviceEvent`]: event::DeviceEvent
+//! [`UserEvent`]: event::Event::UserEvent
+//! [`LoopDestroyed`]: event::Event::LoopDestroyed
+//! [`platform`]: platform
 
 #![deny(rust_2018_idioms)]
+#![deny(intra_doc_link_resolution_failure)]
 
 #[allow(unused_imports)]
 #[macro_use]
@@ -121,12 +119,11 @@ extern crate log;
 #[macro_use]
 extern crate serde;
 #[macro_use]
-#[cfg(any(target_os = "ios", target_os = "windows"))]
 extern crate bitflags;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[macro_use]
 extern crate objc;
-#[cfg(feature = "std_web")]
+#[cfg(all(target_arch = "wasm32", feature = "std_web"))]
 extern crate std_web as stdweb;
 
 pub mod dpi;

src/monitor.rs

@@ -1,14 +1,14 @@
 //! Types useful for interacting with a user's monitors.
 //!
-//! If you want to get basic information about a monitor, you can use the [`MonitorHandle`][monitor_id]
+//! If you want to get basic information about a monitor, you can use the [`MonitorHandle`][monitor_handle]
 //! type. This is retreived from one of the following methods, which return an iterator of
-//! [`MonitorHandle`][monitor_id]:
+//! [`MonitorHandle`][monitor_handle]:
 //! - [`EventLoop::available_monitors`][loop_get]
 //! - [`Window::available_monitors`][window_get].
 //!
-//! [monitor_id]: ./struct.MonitorHandle.html
-//! [loop_get]: ../event_loop/struct.EventLoop.html#method.available_monitors
-//! [window_get]: ../window/struct.Window.html#method.available_monitors
+//! [monitor_handle]: crate::monitor::MonitorHandle
+//! [loop_get]: crate::event_loop::EventLoop::available_monitors
+//! [window_get]: crate::window::Window::available_monitors
 use crate::{
     dpi::{PhysicalPosition, PhysicalSize},
     platform_impl,
@@ -19,7 +19,7 @@ use crate::{
 /// Can be acquired with:
 /// - [`MonitorHandle::video_modes`][monitor_get].
 ///
-/// [monitor_get]: ../monitor/struct.MonitorHandle.html#method.video_modes
+/// [monitor_get]: crate::monitor::MonitorHandle::video_modes
 #[derive(Clone, PartialEq, Eq, Hash)]
 pub struct VideoMode {
     pub(crate) video_mode: platform_impl::VideoMode,
@@ -108,7 +108,7 @@ impl std::fmt::Display for VideoMode {
 ///
 /// Allows you to retrieve information about a given monitor and can be used in [`Window`] creation.
 ///
-/// [`Window`]: ../window/struct.Window.html
+/// [`Window`]: crate::window::Window
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct MonitorHandle {
     pub(crate) inner: platform_impl::MonitorHandle,
@@ -150,7 +150,7 @@ impl MonitorHandle {
 
     /// Returns the DPI factor that can be used to map logical pixels to physical pixels, and vice versa.
     ///
-    /// See the [`dpi`](../dpi/index.html) module for more information.
+    /// See the [`dpi`](crate::dpi) module for more information.
     ///
     /// ## Platform-specific
     ///

src/platform/windows.rs

@@ -77,6 +77,9 @@ pub trait WindowExtWindows {
 
     /// This sets `ICON_BIG`. A good ceiling here is 256x256.
     fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>);
+
+    /// Whether the system theme is currently Windows 10's "Dark Mode".
+    fn is_dark_mode(&self) -> bool;
 }
 
 impl WindowExtWindows for Window {
@@ -94,6 +97,11 @@ impl WindowExtWindows for Window {
     fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>) {
         self.window.set_taskbar_icon(taskbar_icon)
     }
+
+    #[inline]
+    fn is_dark_mode(&self) -> bool {
+        self.window.is_dark_mode()
+    }
 }
 
 /// Additional methods on `WindowBuilder` that are specific to Windows.

src/platform_impl/android/mod.rs

@@ -157,7 +157,7 @@ impl EventLoop {
 }
 
 impl EventLoopProxy {
-    pub fn wakeup(&self) -> Result<(), ::EventLoopClosed> {
+    pub fn wakeup(&self) -> Result<(), ::EventLoopClosed<()>> {
         android_glue::wake_event_loop();
         Ok(())
     }
@@ -360,6 +360,11 @@ impl Window {
         Err(ExternalError::NotSupported(NotSupportedError::new()))
     }
 
+    #[inline]
+    pub fn set_minimized(&self, _minimized: bool) {
+        unimplemented!()
+    }
+
     #[inline]
     pub fn set_maximized(&self, _maximized: bool) {
         // N/A

src/platform_impl/ios/app_state.rs

@@ -12,7 +12,7 @@ use std::{
 use objc::runtime::{BOOL, YES};
 
 use crate::{
-    event::{Event, StartCause, WindowEvent},
+    event::{Event, StartCause},
     event_loop::ControlFlow,
     platform_impl::platform::{
         event_loop::{EventHandler, Never},
@@ -51,11 +51,7 @@ enum UserCallbackTransitionResult<'a> {
 
 impl Event<Never> {
     fn is_redraw(&self) -> bool {
-        if let Event::WindowEvent {
-            window_id: _,
-            event: WindowEvent::RedrawRequested,
-        } = self
-        {
+        if let Event::RedrawRequested(_) = self {
             true
         } else {
             false
@@ -776,16 +772,18 @@ pub unsafe fn handle_main_events_cleared() {
 
     // User events are always sent out at the end of the "MainEventLoop"
     handle_user_events();
-    handle_nonuser_event(Event::EventsCleared);
+    handle_nonuser_event(Event::MainEventsCleared);
 
     let mut this = AppState::get_mut();
-    let redraw_events = this
+    let mut redraw_events: Vec<Event<Never>> = this
         .main_events_cleared_transition()
         .into_iter()
-        .map(|window| Event::WindowEvent {
-            window_id: RootWindowId(window.into()),
-            event: WindowEvent::RedrawRequested,
-        });
+        .map(|window| Event::RedrawRequested(RootWindowId(window.into())))
+        .collect();
+
+    if !redraw_events.is_empty() {
+        redraw_events.push(Event::RedrawEventsCleared);
+    }
     drop(this);
 
     handle_nonuser_events(redraw_events);

src/platform_impl/ios/event_loop.rs

@@ -165,8 +165,10 @@ impl<T> EventLoopProxy<T> {
         }
     }
 
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
-        self.sender.send(event).map_err(|_| EventLoopClosed)?;
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        self.sender
+            .send(event)
+            .map_err(|::std::sync::mpsc::SendError(x)| EventLoopClosed(x))?;
         unsafe {
             // let the main thread know there's a new event
             CFRunLoopSourceSignal(self.source);

src/platform_impl/ios/monitor.rs

@@ -18,31 +18,44 @@ pub struct VideoMode {
     pub(crate) size: (u32, u32),
     pub(crate) bit_depth: u16,
     pub(crate) refresh_rate: u16,
-    pub(crate) screen_mode: id,
+    pub(crate) screen_mode: NativeDisplayMode,
     pub(crate) monitor: MonitorHandle,
 }
 
+#[derive(Debug, PartialEq, Eq, Hash)]
+pub struct NativeDisplayMode(pub id);
+
+unsafe impl Send for NativeDisplayMode {}
+
+impl Drop for NativeDisplayMode {
+    fn drop(&mut self) {
+        unsafe {
+            let () = msg_send![self.0, release];
+        }
+    }
+}
+
+impl Clone for NativeDisplayMode {
+    fn clone(&self) -> Self {
+        unsafe {
+            let _: id = msg_send![self.0, retain];
+        }
+        NativeDisplayMode(self.0)
+    }
+}
+
 impl Clone for VideoMode {
     fn clone(&self) -> VideoMode {
         VideoMode {
             size: self.size,
             bit_depth: self.bit_depth,
             refresh_rate: self.refresh_rate,
-            screen_mode: unsafe { msg_send![self.screen_mode, retain] },
+            screen_mode: self.screen_mode.clone(),
             monitor: self.monitor.clone(),
         }
     }
 }
 
-impl Drop for VideoMode {
-    fn drop(&mut self) {
-        unsafe {
-            assert_main_thread!("`VideoMode` can only be dropped on the main thread on iOS");
-            let () = msg_send![self.screen_mode, release];
-        }
-    }
-}
-
 impl VideoMode {
     unsafe fn retained_new(uiscreen: id, screen_mode: id) -> VideoMode {
         assert_main_thread!("`VideoMode` can only be created on the main thread on iOS");
@@ -64,11 +77,13 @@ impl VideoMode {
             60
         };
         let size: CGSize = msg_send![screen_mode, size];
+        let screen_mode: id = msg_send![screen_mode, retain];
+        let screen_mode = NativeDisplayMode(screen_mode);
         VideoMode {
             size: (size.width as u32, size.height as u32),
             bit_depth: 32,
             refresh_rate: refresh_rate as u16,
-            screen_mode: msg_send![screen_mode, retain],
+            screen_mode,
             monitor: MonitorHandle::retained_new(uiscreen),
         }
     }

src/platform_impl/ios/view.rs

@@ -102,10 +102,10 @@ unsafe fn get_view_class(root_view_class: &'static Class) -> &'static Class {
             unsafe {
                 let window: id = msg_send![object, window];
                 assert!(!window.is_null());
-                app_state::handle_nonuser_event(Event::WindowEvent {
-                    window_id: RootWindowId(window.into()),
-                    event: WindowEvent::RedrawRequested,
-                });
+                app_state::handle_nonuser_events(
+                    std::iter::once(Event::RedrawRequested(RootWindowId(window.into())))
+                        .chain(std::iter::once(Event::RedrawEventsCleared)),
+                );
                 let superclass: &'static Class = msg_send![object, superclass];
                 let () = msg_send![super(object, superclass), drawRect: rect];
             }
@@ -497,10 +497,12 @@ pub unsafe fn create_window(
     match window_attributes.fullscreen {
         Some(Fullscreen::Exclusive(ref video_mode)) => {
             let uiscreen = video_mode.monitor().ui_screen() as id;
-            let () = msg_send![uiscreen, setCurrentMode: video_mode.video_mode.screen_mode];
+            let () = msg_send![uiscreen, setCurrentMode: video_mode.video_mode.screen_mode.0];
             msg_send![window, setScreen:video_mode.monitor().ui_screen()]
         }
-        Some(Fullscreen::Borderless(ref monitor)) => msg_send![window, setScreen:monitor.ui_screen()],
+        Some(Fullscreen::Borderless(ref monitor)) => {
+            msg_send![window, setScreen:monitor.ui_screen()]
+        }
         None => (),
     }
 

src/platform_impl/ios/window.rs

@@ -169,6 +169,10 @@ impl Inner {
         debug!("`Window::set_cursor_visible` is ignored on iOS")
     }
 
+    pub fn set_minimized(&self, _minimized: bool) {
+        warn!("`Window::set_minimized` is ignored on iOS")
+    }
+
     pub fn set_maximized(&self, _maximized: bool) {
         warn!("`Window::set_maximized` is ignored on iOS")
     }

src/platform_impl/linux/mod.rs

@@ -367,6 +367,14 @@ impl Window {
         }
     }
 
+    #[inline]
+    pub fn set_minimized(&self, minimized: bool) {
+        match self {
+            &Window::X(ref w) => w.set_minimized(minimized),
+            &Window::Wayland(ref w) => w.set_minimized(minimized),
+        }
+    }
+
     #[inline]
     pub fn fullscreen(&self) -> Option<Fullscreen> {
         match self {
@@ -650,7 +658,7 @@ impl<T: 'static> EventLoop<T> {
 }
 
 impl<T: 'static> EventLoopProxy<T> {
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
         match *self {
             EventLoopProxy::Wayland(ref proxy) => proxy.send_event(event),
             EventLoopProxy::X(ref proxy) => proxy.send_event(event),

src/platform_impl/linux/wayland/event_loop.rs

@@ -54,6 +54,10 @@ impl<T> WindowEventsSink<T> {
         }
     }
 
+    pub fn send_event(&mut self, evt: crate::event::Event<T>) {
+        self.buffer.push_back(evt);
+    }
+
     pub fn send_window_event(&mut self, evt: crate::event::WindowEvent, wid: WindowId) {
         self.buffer.push_back(crate::event::Event::WindowEvent {
             event: evt,
@@ -240,9 +244,7 @@ pub struct EventLoop<T: 'static> {
     // Utility for grabbing the cursor and changing visibility
     _user_source: ::calloop::Source<::calloop::channel::Channel<T>>,
     user_sender: ::calloop::channel::Sender<T>,
-    _kbd_source: ::calloop::Source<
-        ::calloop::channel::Channel<(crate::event::WindowEvent, super::WindowId)>,
-    >,
+    _kbd_source: ::calloop::Source<::calloop::channel::Channel<crate::event::Event<()>>>,
     window_target: RootELW<T>,
 }
 
@@ -280,8 +282,14 @@ impl<T: 'static> Clone for EventLoopProxy<T> {
 }
 
 impl<T: 'static> EventLoopProxy<T> {
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
-        self.user_sender.send(event).map_err(|_| EventLoopClosed)
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        self.user_sender.send(event).map_err(|e| {
+            EventLoopClosed(if let ::calloop::channel::SendError::Disconnected(x) = e {
+                x
+            } else {
+                unreachable!()
+            })
+        })
     }
 }
 
@@ -296,13 +304,14 @@ impl<T: 'static> EventLoop<T> {
 
         let inner_loop = ::calloop::EventLoop::new().unwrap();
 
-        let (kbd_sender, kbd_channel) = ::calloop::channel::channel();
+        let (kbd_sender, kbd_channel) = ::calloop::channel::channel::<crate::event::Event<()>>();
         let kbd_sink = sink.clone();
         let kbd_source = inner_loop
             .handle()
             .insert_source(kbd_channel, move |evt, &mut ()| {
-                if let ::calloop::channel::Event::Msg((evt, wid)) = evt {
-                    kbd_sink.lock().unwrap().send_window_event(evt, wid);
+                if let ::calloop::channel::Event::Msg(evt) = evt {
+                    let evt = evt.map_nonuser_event().ok().unwrap();
+                    kbd_sink.lock().unwrap().send_event(evt);
                 }
             })
             .unwrap();
@@ -500,24 +509,34 @@ impl<T: 'static> EventLoop<T> {
                     );
                 }
             }
-            // do a second run of post-dispatch-triggers, to handle user-generated "request-redraw"
-            // in response of resize & friends
-            self.post_dispatch_triggers();
+            // send Events cleared
             {
-                let mut guard = sink.lock().unwrap();
-                guard.empty_with(|evt| {
+                sticky_exit_callback(
+                    crate::event::Event::MainEventsCleared,
+                    &self.window_target,
+                    &mut control_flow,
+                    &mut callback,
+                );
+            }
+
+            // handle request-redraw
+            {
+                self.redraw_triggers(|wid, window_target| {
                     sticky_exit_callback(
-                        evt,
-                        &self.window_target,
+                        crate::event::Event::RedrawRequested(crate::window::WindowId(
+                            crate::platform_impl::WindowId::Wayland(wid),
+                        )),
+                        window_target,
                         &mut control_flow,
                         &mut callback,
                     );
                 });
             }
-            // send Events cleared
+
+            // send RedrawEventsCleared
             {
                 sticky_exit_callback(
-                    crate::event::Event::EventsCleared,
+                    crate::event::Event::RedrawEventsCleared,
                     &self.window_target,
                     &mut control_flow,
                     &mut callback,
@@ -643,6 +662,31 @@ impl<T> EventLoopWindowTarget<T> {
  */
 
 impl<T> EventLoop<T> {
+    fn redraw_triggers<F>(&mut self, mut callback: F)
+    where
+        F: FnMut(WindowId, &RootELW<T>),
+    {
+        let window_target = match self.window_target.p {
+            crate::platform_impl::EventLoopWindowTarget::Wayland(ref wt) => wt,
+            _ => unreachable!(),
+        };
+        window_target.store.lock().unwrap().for_each_redraw_trigger(
+            |refresh, frame_refresh, wid, frame| {
+                if let Some(frame) = frame {
+                    if frame_refresh {
+                        frame.refresh();
+                        if !refresh {
+                            frame.surface().commit()
+                        }
+                    }
+                }
+                if refresh {
+                    callback(wid, &self.window_target);
+                }
+            },
+        )
+    }
+
     fn post_dispatch_triggers(&mut self) {
         let mut sink = self.sink.lock().unwrap();
         let window_target = match self.window_target.p {
@@ -661,53 +705,47 @@ impl<T> EventLoop<T> {
             }
         }
         // process pending resize/refresh
-        window_target.store.lock().unwrap().for_each(
-            |newsize,
-             size,
-             new_dpi,
-             refresh,
-             frame_refresh,
-             closed,
-             grab_cursor,
-             surface,
-             wid,
-             frame| {
-                if let Some(frame) = frame {
-                    if let Some((w, h)) = newsize {
-                        frame.resize(w, h);
-                        frame.refresh();
+        window_target.store.lock().unwrap().for_each(|window| {
+            if let Some(frame) = window.frame {
+                if let Some(newsize) = window.newsize {
+                    let (w, h) = newsize;
+                    // mutter (GNOME Wayland) relies on `set_geometry` to reposition window in case
+                    // it overlaps mutter's `bounding box`, so we can't avoid this resize call,
+                    // which calls `set_geometry` under the hood, for now.
+                    frame.resize(w, h);
+                    frame.refresh();
+                    // Don't send resize event downstream if the new size is identical to the
+                    // current one.
+                    if newsize != *window.size {
                         let logical_size = crate::dpi::LogicalSize::new(w as f64, h as f64);
                         sink.send_window_event(
                             crate::event::WindowEvent::Resized(logical_size),
-                            wid,
+                            window.wid,
                         );
-                        *size = (w, h);
-                    } else if frame_refresh {
-                        frame.refresh();
-                        if !refresh {
-                            frame.surface().commit()
-                        }
+
+                        *window.size = (w, h);
                     }
                 }
-                if let Some(dpi) = new_dpi {
-                    sink.send_window_event(
-                        crate::event::WindowEvent::HiDpiFactorChanged(dpi as f64),
-                        wid,
-                    );
-                }
-                if refresh {
-                    sink.send_window_event(crate::event::WindowEvent::RedrawRequested, wid);
-                }
-                if closed {
-                    sink.send_window_event(crate::event::WindowEvent::CloseRequested, wid);
-                }
+            }
+            if let Some(dpi) = window.new_dpi {
+                sink.send_window_event(
+                    crate::event::WindowEvent::HiDpiFactorChanged(dpi as f64),
+                    window.wid,
+                );
+            }
+            if window.closed {
+                sink.send_window_event(crate::event::WindowEvent::CloseRequested, window.wid);
+            }
 
-                if let Some(grab_cursor) = grab_cursor {
-                    let surface = if grab_cursor { Some(surface) } else { None };
-                    self.cursor_manager.lock().unwrap().grab_pointer(surface);
-                }
-            },
-        )
+            if let Some(grab_cursor) = window.grab_cursor {
+                let surface = if grab_cursor {
+                    Some(window.surface)
+                } else {
+                    None
+                };
+                self.cursor_manager.lock().unwrap().grab_pointer(surface);
+            }
+        })
     }
 }
 
@@ -719,7 +757,7 @@ struct SeatManager<T: 'static> {
     sink: Arc<Mutex<WindowEventsSink<T>>>,
     store: Arc<Mutex<WindowStore>>,
     seats: Arc<Mutex<Vec<(u32, wl_seat::WlSeat)>>>,
-    kbd_sender: ::calloop::channel::Sender<(crate::event::WindowEvent, super::WindowId)>,
+    kbd_sender: ::calloop::channel::Sender<crate::event::Event<()>>,
     relative_pointer_manager_proxy: Rc<RefCell<Option<ZwpRelativePointerManagerV1>>>,
     pointer_constraints_proxy: Arc<Mutex<Option<ZwpPointerConstraintsV1>>>,
     cursor_manager: Arc<Mutex<CursorManager>>,
@@ -764,7 +802,7 @@ impl<T: 'static> SeatManager<T> {
 struct SeatData<T> {
     sink: Arc<Mutex<WindowEventsSink<T>>>,
     store: Arc<Mutex<WindowStore>>,
-    kbd_sender: ::calloop::channel::Sender<(crate::event::WindowEvent, super::WindowId)>,
+    kbd_sender: ::calloop::channel::Sender<crate::event::Event<()>>,
     pointer: Option<wl_pointer::WlPointer>,
     relative_pointer: Option<ZwpRelativePointerV1>,
     relative_pointer_manager_proxy: Rc<RefCell<Option<ZwpRelativePointerManagerV1>>>,

src/platform_impl/linux/wayland/keyboard.rs

@@ -8,11 +8,13 @@ use smithay_client_toolkit::{
     reexports::client::protocol::{wl_keyboard, wl_seat},
 };
 
-use crate::event::{ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
+use crate::event::{
+    DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent,
+};
 
 pub fn init_keyboard(
     seat: &wl_seat::WlSeat,
-    sink: ::calloop::channel::Sender<(crate::event::WindowEvent, super::WindowId)>,
+    sink: ::calloop::channel::Sender<crate::event::Event<()>>,
     modifiers_tracker: Arc<Mutex<ModifiersState>>,
 ) -> wl_keyboard::WlKeyboard {
     // { variables to be captured by the closures
@@ -29,12 +31,22 @@ pub fn init_keyboard(
             match evt {
                 KbEvent::Enter { surface, .. } => {
                     let wid = make_wid(&surface);
-                    my_sink.send((WindowEvent::Focused(true), wid)).unwrap();
+                    my_sink
+                        .send(Event::WindowEvent {
+                            window_id: mk_root_wid(wid),
+                            event: WindowEvent::Focused(true),
+                        })
+                        .unwrap();
                     *target.lock().unwrap() = Some(wid);
                 }
                 KbEvent::Leave { surface, .. } => {
                     let wid = make_wid(&surface);
-                    my_sink.send((WindowEvent::Focused(false), wid)).unwrap();
+                    my_sink
+                        .send(Event::WindowEvent {
+                            window_id: mk_root_wid(wid),
+                            event: WindowEvent::Focused(false),
+                        })
+                        .unwrap();
                     *target.lock().unwrap() = None;
                 }
                 KbEvent::Key {
@@ -52,20 +64,19 @@ pub fn init_keyboard(
                         };
                         let vkcode = key_to_vkey(rawkey, keysym);
                         my_sink
-                            .send((
-                                WindowEvent::KeyboardInput {
-                                    device_id: crate::event::DeviceId(
-                                        crate::platform_impl::DeviceId::Wayland(DeviceId),
-                                    ),
+                            .send(Event::WindowEvent {
+                                window_id: mk_root_wid(wid),
+                                event: WindowEvent::KeyboardInput {
+                                    device_id: device_id(),
                                     input: KeyboardInput {
                                         state,
                                         scancode: rawkey,
                                         virtual_keycode: vkcode,
                                         modifiers: modifiers_tracker.lock().unwrap().clone(),
                                     },
+                                    is_synthetic: false,
                                 },
-                                wid,
-                            ))
+                            })
                             .unwrap();
                         // send char event only on key press, not release
                         if let ElementState::Released = state {
@@ -74,7 +85,10 @@ pub fn init_keyboard(
                         if let Some(txt) = utf8 {
                             for chr in txt.chars() {
                                 my_sink
-                                    .send((WindowEvent::ReceivedCharacter(chr), wid))
+                                    .send(Event::WindowEvent {
+                                        window_id: mk_root_wid(wid),
+                                        event: WindowEvent::ReceivedCharacter(chr),
+                                    })
                                     .unwrap();
                             }
                         }
@@ -84,15 +98,16 @@ pub fn init_keyboard(
                 KbEvent::Modifiers {
                     modifiers: event_modifiers,
                 } => {
-                    let modifiers = event_modifiers.into();
+                    let modifiers = ModifiersState::from_wayland(event_modifiers);
 
                     *modifiers_tracker.lock().unwrap() = modifiers;
 
-                    if let Some(wid) = *target.lock().unwrap() {
-                        my_sink
-                            .send((WindowEvent::ModifiersChanged { modifiers }, wid))
-                            .unwrap();
-                    }
+                    my_sink
+                        .send(Event::DeviceEvent {
+                            device_id: device_id(),
+                            event: DeviceEvent::ModifiersChanged(modifiers),
+                        })
+                        .unwrap();
                 }
             }
         },
@@ -101,25 +116,27 @@ pub fn init_keyboard(
                 let state = ElementState::Pressed;
                 let vkcode = key_to_vkey(repeat_event.rawkey, repeat_event.keysym);
                 repeat_sink
-                    .send((
-                        WindowEvent::KeyboardInput {
-                            device_id: crate::event::DeviceId(
-                                crate::platform_impl::DeviceId::Wayland(DeviceId),
-                            ),
+                    .send(Event::WindowEvent {
+                        window_id: mk_root_wid(wid),
+                        event: WindowEvent::KeyboardInput {
+                            device_id: device_id(),
                             input: KeyboardInput {
                                 state,
                                 scancode: repeat_event.rawkey,
                                 virtual_keycode: vkcode,
                                 modifiers: my_modifiers.lock().unwrap().clone(),
                             },
+                            is_synthetic: false,
                         },
-                        wid,
-                    ))
+                    })
                     .unwrap();
                 if let Some(txt) = repeat_event.utf8 {
                     for chr in txt.chars() {
                         repeat_sink
-                            .send((WindowEvent::ReceivedCharacter(chr), wid))
+                            .send(Event::WindowEvent {
+                                window_id: mk_root_wid(wid),
+                                event: WindowEvent::ReceivedCharacter(chr),
+                            })
                             .unwrap();
                     }
                 }
@@ -147,12 +164,22 @@ pub fn init_keyboard(
                     move |evt, _| match evt {
                         wl_keyboard::Event::Enter { surface, .. } => {
                             let wid = make_wid(&surface);
-                            my_sink.send((WindowEvent::Focused(true), wid)).unwrap();
+                            my_sink
+                                .send(Event::WindowEvent {
+                                    window_id: mk_root_wid(wid),
+                                    event: WindowEvent::Focused(true),
+                                })
+                                .unwrap();
                             target = Some(wid);
                         }
                         wl_keyboard::Event::Leave { surface, .. } => {
                             let wid = make_wid(&surface);
-                            my_sink.send((WindowEvent::Focused(false), wid)).unwrap();
+                            my_sink
+                                .send(Event::WindowEvent {
+                                    window_id: mk_root_wid(wid),
+                                    event: WindowEvent::Focused(false),
+                                })
+                                .unwrap();
                             target = None;
                         }
                         wl_keyboard::Event::Key { key, state, .. } => {
@@ -163,20 +190,19 @@ pub fn init_keyboard(
                                     _ => unreachable!(),
                                 };
                                 my_sink
-                                    .send((
-                                        WindowEvent::KeyboardInput {
-                                            device_id: crate::event::DeviceId(
-                                                crate::platform_impl::DeviceId::Wayland(DeviceId),
-                                            ),
+                                    .send(Event::WindowEvent {
+                                        window_id: mk_root_wid(wid),
+                                        event: WindowEvent::KeyboardInput {
+                                            device_id: device_id(),
                                             input: KeyboardInput {
                                                 state,
                                                 scancode: key,
                                                 virtual_keycode: None,
                                                 modifiers: ModifiersState::default(),
                                             },
+                                            is_synthetic: false,
                                         },
-                                        wid,
-                                    ))
+                                    })
                                     .unwrap();
                             }
                         }
@@ -376,13 +402,21 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
     }
 }
 
-impl From<keyboard::ModifiersState> for ModifiersState {
-    fn from(mods: keyboard::ModifiersState) -> ModifiersState {
-        ModifiersState {
-            shift: mods.shift,
-            ctrl: mods.ctrl,
-            alt: mods.alt,
-            logo: mods.logo,
-        }
+impl ModifiersState {
+    pub(crate) fn from_wayland(mods: keyboard::ModifiersState) -> ModifiersState {
+        let mut m = ModifiersState::empty();
+        m.set(ModifiersState::SHIFT, mods.shift);
+        m.set(ModifiersState::CTRL, mods.ctrl);
+        m.set(ModifiersState::ALT, mods.alt);
+        m.set(ModifiersState::LOGO, mods.logo);
+        m
     }
 }
+
+fn device_id() -> crate::event::DeviceId {
+    crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(DeviceId))
+}
+
+fn mk_root_wid(wid: crate::platform_impl::wayland::WindowId) -> crate::window::WindowId {
+    crate::window::WindowId(crate::platform_impl::WindowId::Wayland(wid))
+}

src/platform_impl/linux/wayland/pointer.rs

@@ -56,6 +56,13 @@ pub fn implement_pointer<T: 'static>(
                         let wid = store.find_wid(&surface);
                         if let Some(wid) = wid {
                             mouse_focus = Some(wid);
+
+                            // Reload cursor style only when we enter winit's surface. Calling
+                            // this function every time on `PtrEvent::Enter` could interfere with
+                            // SCTK CSD handling, since it changes cursor icons when you hover
+                            // cursor over the window borders.
+                            cursor_manager.reload_cursor_style();
+
                             sink.send_window_event(
                                 WindowEvent::CursorEntered {
                                     device_id: crate::event::DeviceId(
@@ -75,8 +82,6 @@ pub fn implement_pointer<T: 'static>(
                                 wid,
                             );
                         }
-
-                        cursor_manager.reload_cursor_style();
                     }
                     PtrEvent::Leave { surface, .. } => {
                         mouse_focus = None;

src/platform_impl/linux/wayland/window.rs

@@ -259,6 +259,13 @@ impl Window {
         *(self.need_frame_refresh.lock().unwrap()) = true;
     }
 
+    pub fn set_minimized(&self, minimized: bool) {
+        // An app cannot un-minimize itself on Wayland
+        if minimized {
+            self.frame.lock().unwrap().set_minimized();
+        }
+    }
+
     pub fn set_maximized(&self, maximized: bool) {
         if maximized {
             self.frame.lock().unwrap().set_maximized();
@@ -385,6 +392,17 @@ pub struct WindowStore {
     windows: Vec<InternalWindow>,
 }
 
+pub struct WindowStoreForEach<'a> {
+    pub newsize: Option<(u32, u32)>,
+    pub size: &'a mut (u32, u32),
+    pub new_dpi: Option<i32>,
+    pub closed: bool,
+    pub grab_cursor: Option<bool>,
+    pub surface: &'a wl_surface::WlSurface,
+    pub wid: WindowId,
+    pub frame: Option<&'a mut SWindow<ConceptFrame>>,
+}
+
 impl WindowStore {
     pub fn new() -> WindowStore {
         WindowStore {
@@ -434,34 +452,21 @@ impl WindowStore {
 
     pub fn for_each<F>(&mut self, mut f: F)
     where
-        F: FnMut(
-            Option<(u32, u32)>,
-            &mut (u32, u32),
-            Option<i32>,
-            bool,
-            bool,
-            bool,
-            Option<bool>,
-            &wl_surface::WlSurface,
-            WindowId,
-            Option<&mut SWindow<ConceptFrame>>,
-        ),
+        F: FnMut(WindowStoreForEach<'_>),
     {
         for window in &mut self.windows {
             let opt_arc = window.frame.upgrade();
             let mut opt_mutex_lock = opt_arc.as_ref().map(|m| m.lock().unwrap());
-            f(
-                window.newsize.take(),
-                &mut *(window.size.lock().unwrap()),
-                window.new_dpi,
-                replace(&mut *window.need_refresh.lock().unwrap(), false),
-                replace(&mut *window.need_frame_refresh.lock().unwrap(), false),
-                window.closed,
-                window.cursor_grab_changed.lock().unwrap().take(),
-                &window.surface,
-                make_wid(&window.surface),
-                opt_mutex_lock.as_mut().map(|m| &mut **m),
-            );
+            f(WindowStoreForEach {
+                newsize: window.newsize.take(),
+                size: &mut *(window.size.lock().unwrap()),
+                new_dpi: window.new_dpi,
+                closed: window.closed,
+                grab_cursor: window.cursor_grab_changed.lock().unwrap().take(),
+                surface: &window.surface,
+                wid: make_wid(&window.surface),
+                frame: opt_mutex_lock.as_mut().map(|m| &mut **m),
+            });
             if let Some(dpi) = window.new_dpi.take() {
                 window.current_dpi = dpi;
             }
@@ -469,4 +474,20 @@ impl WindowStore {
             window.closed = false;
         }
     }
+
+    pub fn for_each_redraw_trigger<F>(&mut self, mut f: F)
+    where
+        F: FnMut(bool, bool, WindowId, Option<&mut SWindow<ConceptFrame>>),
+    {
+        for window in &mut self.windows {
+            let opt_arc = window.frame.upgrade();
+            let mut opt_mutex_lock = opt_arc.as_ref().map(|m| m.lock().unwrap());
+            f(
+                replace(&mut *window.need_refresh.lock().unwrap(), false),
+                replace(&mut *window.need_frame_refresh.lock().unwrap(), false),
+                make_wid(&window.surface),
+                opt_mutex_lock.as_mut().map(|m| &mut **m),
+            );
+        }
+    }
 }

src/platform_impl/linux/x11/event_processor.rs

@@ -1,4 +1,4 @@
-use std::{cell::RefCell, collections::HashMap, ptr, rc::Rc, slice};
+use std::{cell::RefCell, collections::HashMap, rc::Rc, slice};
 
 use libc::{c_char, c_int, c_long, c_uint, c_ulong};
 
@@ -12,7 +12,9 @@ use util::modifiers::{ModifierKeyState, ModifierKeymap};
 
 use crate::{
     dpi::{LogicalPosition, LogicalSize},
-    event::{DeviceEvent, Event, KeyboardInput, ModifiersState, WindowEvent},
+    event::{
+        DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, TouchPhase, WindowEvent,
+    },
     event_loop::EventLoopWindowTarget as RootELW,
 };
 
@@ -25,7 +27,9 @@ pub(super) struct EventProcessor<T: 'static> {
     pub(super) target: Rc<RootELW<T>>,
     pub(super) mod_keymap: ModifierKeymap,
     pub(super) device_mod_state: ModifierKeyState,
-    pub(super) window_mod_state: ModifierKeyState,
+    // Number of touch events currently in progress
+    pub(super) num_touch: u32,
+    pub(super) first_touch: Option<u64>,
 }
 
 impl<T: 'static> EventProcessor<T> {
@@ -67,6 +71,13 @@ impl<T: 'static> EventProcessor<T> {
         self.with_window(window_id, |_| ()).is_some()
     }
 
+    pub(super) fn poll(&self) -> bool {
+        let wt = get_xtarget(&self.target);
+        let result = unsafe { (wt.xconn.xlib.XPending)(wt.xconn.display) };
+
+        result != 0
+    }
+
     pub(super) unsafe fn poll_one_event(&mut self, event_ptr: *mut ffi::XEvent) -> bool {
         let wt = get_xtarget(&self.target);
         // This function is used to poll and remove a single event
@@ -114,6 +125,26 @@ impl<T: 'static> EventProcessor<T> {
             return;
         }
 
+        // We can't call a `&mut self` method because of the above borrow,
+        // so we use this macro for repeated modifier state updates.
+        macro_rules! update_modifiers {
+            ( $state:expr , $modifier:expr ) => {{
+                match ($state, $modifier) {
+                    (state, modifier) => {
+                        if let Some(modifiers) =
+                            self.device_mod_state.update_state(&state, modifier)
+                        {
+                            let device_id = mkdid(util::VIRTUAL_CORE_KEYBOARD);
+                            callback(Event::DeviceEvent {
+                                device_id,
+                                event: DeviceEvent::ModifiersChanged(modifiers),
+                            });
+                        }
+                    }
+                }
+            }};
+        }
+
         let event_type = xev.get_type();
         match event_type {
             ffi::MappingNotify => {
@@ -130,8 +161,7 @@ impl<T: 'static> EventProcessor<T> {
                         .expect("Failed to call XRefreshKeyboardMapping");
 
                     self.mod_keymap.reset_from_x_connection(&wt.xconn);
-                    self.device_mod_state.update(&self.mod_keymap);
-                    self.window_mod_state.update(&self.mod_keymap);
+                    self.device_mod_state.update_keymap(&self.mod_keymap);
                 }
             }
 
@@ -377,24 +407,20 @@ impl<T: 'static> EventProcessor<T> {
                         let (width, height) = shared_state_lock
                             .dpi_adjusted
                             .unwrap_or_else(|| (xev.width as f64, xev.height as f64));
-                        let last_hidpi_factor =
-                            shared_state_lock.guessed_dpi.take().unwrap_or_else(|| {
-                                shared_state_lock
-                                    .last_monitor
-                                    .as_ref()
-                                    .map(|last_monitor| last_monitor.hidpi_factor)
-                                    .unwrap_or(1.0)
-                            });
+
+                        let last_hidpi_factor = shared_state_lock.last_monitor.hidpi_factor;
                         let new_hidpi_factor = {
                             let window_rect = util::AaRect::new(new_outer_position, new_inner_size);
-                            monitor = wt.xconn.get_monitor_for_window(Some(window_rect));
-                            let new_hidpi_factor = monitor.hidpi_factor;
+                            let new_monitor = wt.xconn.get_monitor_for_window(Some(window_rect));
 
-                            // Avoid caching an invalid dummy monitor handle
-                            if monitor.id != 0 {
-                                shared_state_lock.last_monitor = Some(monitor.clone());
+                            if new_monitor.is_dummy() {
+                                // Avoid updating monitor using a dummy monitor handle
+                                last_hidpi_factor
+                            } else {
+                                monitor = new_monitor;
+                                shared_state_lock.last_monitor = monitor.clone();
+                                monitor.hidpi_factor
                             }
-                            new_hidpi_factor
                         };
                         if last_hidpi_factor != new_hidpi_factor {
                             events.dpi_changed =
@@ -498,16 +524,24 @@ impl<T: 'static> EventProcessor<T> {
                 });
             }
 
+            ffi::VisibilityNotify => {
+                let xev: &ffi::XVisibilityEvent = xev.as_ref();
+                let xwindow = xev.window;
+
+                self.with_window(xwindow, |window| window.visibility_notify());
+            }
+
             ffi::Expose => {
                 let xev: &ffi::XExposeEvent = xev.as_ref();
 
-                let window = xev.window;
-                let window_id = mkwid(window);
+                // Multiple Expose events may be received for subareas of a window.
+                // We issue `RedrawRequested` only for the last event of such a series.
+                if xev.count == 0 {
+                    let window = xev.window;
+                    let window_id = mkwid(window);
 
-                callback(Event::WindowEvent {
-                    window_id,
-                    event: WindowEvent::RedrawRequested,
-                });
+                    callback(Event::RedrawRequested(window_id));
+                }
             }
 
             ffi::KeyPress | ffi::KeyRelease => {
@@ -529,25 +563,21 @@ impl<T: 'static> EventProcessor<T> {
                 // value, though this should only be an issue under multiseat configurations.
                 let device = util::VIRTUAL_CORE_KEYBOARD;
                 let device_id = mkdid(device);
+                let keycode = xkev.keycode;
 
                 // When a compose sequence or IME pre-edit is finished, it ends in a KeyPress with
                 // a keycode of 0.
-                if xkev.keycode != 0 {
-                    let keysym = unsafe {
-                        let mut keysym = 0;
-                        (wt.xconn.xlib.XLookupString)(
-                            xkev,
-                            ptr::null_mut(),
-                            0,
-                            &mut keysym,
-                            ptr::null_mut(),
-                        );
-                        wt.xconn.check_errors().expect("Failed to lookup keysym");
-                        keysym
-                    };
+                if keycode != 0 {
+                    let scancode = keycode - 8;
+                    let keysym = wt.xconn.lookup_keysym(xkev);
                     let virtual_keycode = events::keysym_to_element(keysym as c_uint);
 
-                    let modifiers = self.window_mod_state.modifiers();
+                    update_modifiers!(
+                        ModifiersState::from_x11_mask(xkev.state),
+                        self.mod_keymap.get_modifier(xkev.keycode as ffi::KeyCode)
+                    );
+
+                    let modifiers = self.device_mod_state.modifiers();
 
                     callback(Event::WindowEvent {
                         window_id,
@@ -555,33 +585,13 @@ impl<T: 'static> EventProcessor<T> {
                             device_id,
                             input: KeyboardInput {
                                 state,
-                                scancode: xkev.keycode - 8,
+                                scancode,
                                 virtual_keycode,
                                 modifiers,
                             },
+                            is_synthetic: false,
                         },
                     });
-
-                    if let Some(modifier) =
-                        self.mod_keymap.get_modifier(xkev.keycode as ffi::KeyCode)
-                    {
-                        self.window_mod_state.key_event(
-                            state,
-                            xkev.keycode as ffi::KeyCode,
-                            modifier,
-                        );
-
-                        let new_modifiers = self.window_mod_state.modifiers();
-
-                        if modifiers != new_modifiers {
-                            callback(Event::WindowEvent {
-                                window_id,
-                                event: WindowEvent::ModifiersChanged {
-                                    modifiers: new_modifiers,
-                                },
-                            });
-                        }
-                    }
                 }
 
                 if state == Pressed {
@@ -616,7 +626,7 @@ impl<T: 'static> EventProcessor<T> {
                     ElementState::{Pressed, Released},
                     MouseButton::{Left, Middle, Other, Right},
                     MouseScrollDelta::LineDelta,
-                    Touch, TouchPhase,
+                    Touch,
                     WindowEvent::{
                         AxisMotion, CursorEntered, CursorLeft, CursorMoved, Focused, MouseInput,
                         MouseWheel,
@@ -633,7 +643,8 @@ impl<T: 'static> EventProcessor<T> {
                             return;
                         }
 
-                        let modifiers = ModifiersState::from(xev.mods);
+                        let modifiers = ModifiersState::from_x11(&xev.mods);
+                        update_modifiers!(modifiers, None);
 
                         let state = if xev.evtype == ffi::XI_ButtonPress {
                             Pressed
@@ -709,7 +720,8 @@ impl<T: 'static> EventProcessor<T> {
                         let window_id = mkwid(xev.event);
                         let new_cursor_pos = (xev.event_x, xev.event_y);
 
-                        let modifiers = ModifiersState::from(xev.mods);
+                        let modifiers = ModifiersState::from_x11(&xev.mods);
+                        update_modifiers!(modifiers, None);
 
                         let cursor_moved = self.with_window(xev.event, |window| {
                             let mut shared_state_lock = window.shared_state.lock();
@@ -823,14 +835,15 @@ impl<T: 'static> EventProcessor<T> {
                                 }
                             }
                         }
-                        callback(Event::WindowEvent {
-                            window_id,
-                            event: CursorEntered { device_id },
-                        });
 
                         if let Some(dpi_factor) =
                             self.with_window(xev.event, |window| window.hidpi_factor())
                         {
+                            callback(Event::WindowEvent {
+                                window_id,
+                                event: CursorEntered { device_id },
+                            });
+
                             let position = LogicalPosition::from_physical(
                                 (xev.event_x as f64, xev.event_y as f64),
                                 dpi_factor,
@@ -894,20 +907,9 @@ impl<T: 'static> EventProcessor<T> {
                             event: Focused(true),
                         });
 
-                        // When focus is gained, send any existing modifiers
-                        // to the window in a ModifiersChanged event. This is
-                        // done to compensate for modifier keys that may be
-                        // changed while a window is out of focus.
-                        if !self.device_mod_state.is_empty() {
-                            self.window_mod_state = self.device_mod_state.clone();
+                        let modifiers = ModifiersState::from_x11(&xev.mods);
 
-                            let modifiers = self.window_mod_state.modifiers();
-
-                            callback(Event::WindowEvent {
-                                window_id,
-                                event: WindowEvent::ModifiersChanged { modifiers },
-                            });
-                        }
+                        update_modifiers!(modifiers, None);
 
                         // The deviceid for this event is for a keyboard instead of a pointer,
                         // so we have to do a little extra work.
@@ -927,9 +929,12 @@ impl<T: 'static> EventProcessor<T> {
                             event: CursorMoved {
                                 device_id: mkdid(pointer_id),
                                 position,
-                                modifiers: ModifiersState::from(xev.mods),
+                                modifiers,
                             },
                         });
+
+                        // Issue key press events for all pressed keys
+                        self.handle_pressed_keys(window_id, ElementState::Pressed, &mut callback);
                     }
                     ffi::XI_FocusOut => {
                         let xev: &ffi::XIFocusOutEvent = unsafe { &*(xev.data as *const _) };
@@ -941,23 +946,13 @@ impl<T: 'static> EventProcessor<T> {
                             .unfocus(xev.event)
                             .expect("Failed to unfocus input context");
 
-                        // When focus is lost, send a ModifiersChanged event
-                        // containing no modifiers set. This is done to compensate
-                        // for modifier keys that may be changed while a window
-                        // is out of focus.
-                        if !self.window_mod_state.is_empty() {
-                            self.window_mod_state.clear();
+                        let window_id = mkwid(xev.event);
 
-                            callback(Event::WindowEvent {
-                                window_id: mkwid(xev.event),
-                                event: WindowEvent::ModifiersChanged {
-                                    modifiers: ModifiersState::default(),
-                                },
-                            });
-                        }
+                        // Issue key release events for all pressed keys
+                        self.handle_pressed_keys(window_id, ElementState::Released, &mut callback);
 
                         callback(Event::WindowEvent {
-                            window_id: mkwid(xev.event),
+                            window_id,
                             event: Focused(false),
                         })
                     }
@@ -974,10 +969,27 @@ impl<T: 'static> EventProcessor<T> {
                         let dpi_factor =
                             self.with_window(xev.event, |window| window.hidpi_factor());
                         if let Some(dpi_factor) = dpi_factor {
+                            let id = xev.detail as u64;
+                            let modifiers = self.device_mod_state.modifiers();
                             let location = LogicalPosition::from_physical(
                                 (xev.event_x as f64, xev.event_y as f64),
                                 dpi_factor,
                             );
+
+                            // Mouse cursor position changes when touch events are received.
+                            // Only the first concurrently active touch ID moves the mouse cursor.
+                            if is_first_touch(&mut self.first_touch, &mut self.num_touch, id, phase)
+                            {
+                                callback(Event::WindowEvent {
+                                    window_id,
+                                    event: WindowEvent::CursorMoved {
+                                        device_id: mkdid(util::VIRTUAL_CORE_POINTER),
+                                        position: location,
+                                        modifiers,
+                                    },
+                                });
+                            }
+
                             callback(Event::WindowEvent {
                                 window_id,
                                 event: WindowEvent::Touch(Touch {
@@ -985,7 +997,7 @@ impl<T: 'static> EventProcessor<T> {
                                     phase,
                                     location,
                                     force: None, // TODO
-                                    id: xev.detail as u64,
+                                    id,
                                 }),
                             })
                         }
@@ -1068,25 +1080,25 @@ impl<T: 'static> EventProcessor<T> {
                             _ => unreachable!(),
                         };
 
-                        let device_id = xev.sourceid;
+                        let device_id = mkdid(xev.sourceid);
                         let keycode = xev.detail;
                         if keycode < 8 {
                             return;
                         }
                         let scancode = (keycode - 8) as u32;
-
-                        let keysym = unsafe {
-                            (wt.xconn.xlib.XKeycodeToKeysym)(
-                                wt.xconn.display,
-                                xev.detail as ffi::KeyCode,
-                                0,
-                            )
-                        };
-                        wt.xconn
-                            .check_errors()
-                            .expect("Failed to lookup raw keysym");
-
+                        let keysym = wt.xconn.keycode_to_keysym(keycode as ffi::KeyCode);
                         let virtual_keycode = events::keysym_to_element(keysym as c_uint);
+                        let modifiers = self.device_mod_state.modifiers();
+
+                        callback(Event::DeviceEvent {
+                            device_id,
+                            event: DeviceEvent::Key(KeyboardInput {
+                                scancode,
+                                virtual_keycode,
+                                state,
+                                modifiers,
+                            }),
+                        });
 
                         if let Some(modifier) =
                             self.mod_keymap.get_modifier(keycode as ffi::KeyCode)
@@ -1096,19 +1108,16 @@ impl<T: 'static> EventProcessor<T> {
                                 keycode as ffi::KeyCode,
                                 modifier,
                             );
+
+                            let new_modifiers = self.device_mod_state.modifiers();
+
+                            if modifiers != new_modifiers {
+                                callback(Event::DeviceEvent {
+                                    device_id,
+                                    event: DeviceEvent::ModifiersChanged(new_modifiers),
+                                });
+                            }
                         }
-
-                        let modifiers = self.device_mod_state.modifiers();
-
-                        callback(Event::DeviceEvent {
-                            device_id: mkdid(device_id),
-                            event: DeviceEvent::Key(KeyboardInput {
-                                scancode,
-                                virtual_keycode,
-                                state,
-                                modifiers,
-                            }),
-                        });
                     }
 
                     ffi::XI_HierarchyChanged => {
@@ -1187,4 +1196,65 @@ impl<T: 'static> EventProcessor<T> {
             Err(_) => (),
         }
     }
+
+    fn handle_pressed_keys<F>(
+        &self,
+        window_id: crate::window::WindowId,
+        state: ElementState,
+        callback: &mut F,
+    ) where
+        F: FnMut(Event<T>),
+    {
+        let wt = get_xtarget(&self.target);
+
+        let device_id = mkdid(util::VIRTUAL_CORE_KEYBOARD);
+        let modifiers = self.device_mod_state.modifiers();
+
+        // Get the set of keys currently pressed and apply Key events to each
+        let keys = wt.xconn.query_keymap();
+
+        for keycode in &keys {
+            if keycode < 8 {
+                continue;
+            }
+
+            let scancode = (keycode - 8) as u32;
+            let keysym = wt.xconn.keycode_to_keysym(keycode);
+            let virtual_keycode = events::keysym_to_element(keysym as c_uint);
+
+            callback(Event::WindowEvent {
+                window_id,
+                event: WindowEvent::KeyboardInput {
+                    device_id,
+                    input: KeyboardInput {
+                        scancode,
+                        state,
+                        virtual_keycode,
+                        modifiers,
+                    },
+                    is_synthetic: true,
+                },
+            });
+        }
+    }
+}
+
+fn is_first_touch(first: &mut Option<u64>, num: &mut u32, id: u64, phase: TouchPhase) -> bool {
+    match phase {
+        TouchPhase::Started => {
+            if *num == 0 {
+                *first = Some(id);
+            }
+            *num += 1;
+        }
+        TouchPhase::Cancelled | TouchPhase::Ended => {
+            if *first == Some(id) {
+                *first = None;
+            }
+            *num = num.saturating_sub(1);
+        }
+        _ => (),
+    }
+
+    *first == Some(id)
 }

src/platform_impl/linux/x11/mod.rs

@@ -1,4 +1,10 @@
-#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+#![cfg(any(
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
 
 mod dnd;
 mod event_processor;
@@ -26,6 +32,7 @@ use std::{
     rc::Rc,
     slice,
     sync::{mpsc, Arc, Mutex, Weak},
+    time::{Duration, Instant},
 };
 
 use libc::{self, setlocale, LC_CTYPE};
@@ -38,7 +45,7 @@ use self::{
 };
 use crate::{
     error::OsError as RootOsError,
-    event::{Event, WindowEvent},
+    event::{Event, StartCause},
     event_loop::{ControlFlow, EventLoopClosed, EventLoopWindowTarget as RootELW},
     platform_impl::{platform::sticky_exit_callback, PlatformSpecificWindowBuilderAttributes},
     window::WindowAttributes,
@@ -144,6 +151,8 @@ impl<T: 'static> EventLoop<T> {
 
         xconn.update_cached_wm_info(root);
 
+        let pending_redraws: Arc<Mutex<HashSet<WindowId>>> = Default::default();
+
         let mut mod_keymap = ModifierKeymap::new();
         mod_keymap.reset_from_x_connection(&xconn);
 
@@ -157,7 +166,7 @@ impl<T: 'static> EventLoop<T> {
                 xconn,
                 wm_delete_window,
                 net_wm_ping,
-                pending_redraws: Default::default(),
+                pending_redraws: pending_redraws.clone(),
             }),
             _marker: ::std::marker::PhantomData,
         });
@@ -192,7 +201,8 @@ impl<T: 'static> EventLoop<T> {
             xi2ext,
             mod_keymap,
             device_mod_state: Default::default(),
-            window_mod_state: Default::default(),
+            num_touch: 0,
+            first_touch: None,
         };
 
         // Register for device hotplug events
@@ -219,7 +229,9 @@ impl<T: 'static> EventLoop<T> {
                     if evt.readiness.is_readable() {
                         let mut processor = processor.borrow_mut();
                         let mut pending_events = pending_events.borrow_mut();
-                        drain_events(&mut processor, &mut pending_events);
+                        let mut pending_redraws = pending_redraws.lock().unwrap();
+
+                        drain_events(&mut processor, &mut pending_events, &mut pending_redraws);
                     }
                 }
             })
@@ -263,6 +275,8 @@ impl<T: 'static> EventLoop<T> {
         );
 
         loop {
+            self.drain_events();
+
             // Empty the event buffer
             {
                 let mut guard = self.pending_events.borrow_mut();
@@ -283,6 +297,15 @@ impl<T: 'static> EventLoop<T> {
                     );
                 }
             }
+            // send MainEventsCleared
+            {
+                sticky_exit_callback(
+                    crate::event::Event::MainEventsCleared,
+                    &self.target,
+                    &mut control_flow,
+                    &mut callback,
+                );
+            }
             // Empty the redraw requests
             {
                 // Release the lock to prevent deadlock
@@ -290,89 +313,75 @@ impl<T: 'static> EventLoop<T> {
 
                 for wid in windows {
                     sticky_exit_callback(
-                        Event::WindowEvent {
-                            window_id: crate::window::WindowId(super::WindowId::X(wid)),
-                            event: WindowEvent::RedrawRequested,
-                        },
+                        Event::RedrawRequested(crate::window::WindowId(super::WindowId::X(wid))),
                         &self.target,
                         &mut control_flow,
                         &mut callback,
                     );
                 }
             }
-            // send Events cleared
+            // send RedrawEventsCleared
             {
                 sticky_exit_callback(
-                    crate::event::Event::EventsCleared,
+                    crate::event::Event::RedrawEventsCleared,
                     &self.target,
                     &mut control_flow,
                     &mut callback,
                 );
             }
 
+            let start = Instant::now();
+            let (mut cause, deadline, mut timeout);
+
             match control_flow {
                 ControlFlow::Exit => break,
                 ControlFlow::Poll => {
-                    // non-blocking dispatch
-                    self.inner_loop
-                        .dispatch(Some(::std::time::Duration::from_millis(0)), &mut ())
-                        .unwrap();
-                    callback(
-                        crate::event::Event::NewEvents(crate::event::StartCause::Poll),
-                        &self.target,
-                        &mut control_flow,
-                    );
+                    cause = StartCause::Poll;
+                    deadline = None;
+                    timeout = Some(Duration::from_millis(0));
                 }
                 ControlFlow::Wait => {
-                    self.inner_loop.dispatch(None, &mut ()).unwrap();
-                    callback(
-                        crate::event::Event::NewEvents(crate::event::StartCause::WaitCancelled {
-                            start: ::std::time::Instant::now(),
-                            requested_resume: None,
-                        }),
-                        &self.target,
-                        &mut control_flow,
-                    );
-                }
-                ControlFlow::WaitUntil(deadline) => {
-                    let start = ::std::time::Instant::now();
-                    // compute the blocking duration
-                    let duration = if deadline > start {
-                        deadline - start
-                    } else {
-                        ::std::time::Duration::from_millis(0)
+                    cause = StartCause::WaitCancelled {
+                        start,
+                        requested_resume: None,
                     };
-                    self.inner_loop.dispatch(Some(duration), &mut ()).unwrap();
-                    let now = std::time::Instant::now();
-                    if now < deadline {
-                        callback(
-                            crate::event::Event::NewEvents(
-                                crate::event::StartCause::WaitCancelled {
-                                    start,
-                                    requested_resume: Some(deadline),
-                                },
-                            ),
-                            &self.target,
-                            &mut control_flow,
-                        );
+                    deadline = None;
+                    timeout = None;
+                }
+                ControlFlow::WaitUntil(wait_deadline) => {
+                    cause = StartCause::ResumeTimeReached {
+                        start,
+                        requested_resume: wait_deadline,
+                    };
+                    timeout = if wait_deadline > start {
+                        Some(wait_deadline - start)
                     } else {
-                        callback(
-                            crate::event::Event::NewEvents(
-                                crate::event::StartCause::ResumeTimeReached {
-                                    start,
-                                    requested_resume: deadline,
-                                },
-                            ),
-                            &self.target,
-                            &mut control_flow,
-                        );
-                    }
+                        Some(Duration::from_millis(0))
+                    };
+                    deadline = Some(wait_deadline);
                 }
             }
 
-            // If the user callback had any interaction with the X server,
-            // it may have received and buffered some user input events.
-            self.drain_events();
+            if self.events_waiting() {
+                timeout = Some(Duration::from_millis(0));
+            }
+
+            self.inner_loop.dispatch(timeout, &mut ()).unwrap();
+
+            if let Some(deadline) = deadline {
+                if deadline > Instant::now() {
+                    cause = StartCause::WaitCancelled {
+                        start,
+                        requested_resume: Some(deadline),
+                    };
+                }
+            }
+
+            callback(
+                crate::event::Event::NewEvents(cause),
+                &self.target,
+                &mut control_flow,
+            );
         }
 
         callback(
@@ -393,17 +402,28 @@ impl<T: 'static> EventLoop<T> {
     fn drain_events(&self) {
         let mut processor = self.event_processor.borrow_mut();
         let mut pending_events = self.pending_events.borrow_mut();
+        let wt = get_xtarget(&self.target);
+        let mut pending_redraws = wt.pending_redraws.lock().unwrap();
 
-        drain_events(&mut processor, &mut pending_events);
+        drain_events(&mut processor, &mut pending_events, &mut pending_redraws);
+    }
+
+    fn events_waiting(&self) -> bool {
+        !self.pending_events.borrow().is_empty() || self.event_processor.borrow().poll()
     }
 }
 
 fn drain_events<T: 'static>(
     processor: &mut EventProcessor<T>,
     pending_events: &mut VecDeque<Event<T>>,
+    pending_redraws: &mut HashSet<WindowId>,
 ) {
     let mut callback = |event| {
-        pending_events.push_back(event);
+        if let Event::RedrawRequested(crate::window::WindowId(super::WindowId::X(wid))) = event {
+            pending_redraws.insert(wid);
+        } else {
+            pending_events.push_back(event);
+        }
     };
 
     // process all pending events
@@ -430,8 +450,14 @@ impl<T> EventLoopWindowTarget<T> {
 }
 
 impl<T: 'static> EventLoopProxy<T> {
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
-        self.user_sender.send(event).map_err(|_| EventLoopClosed)
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        self.user_sender.send(event).map_err(|e| {
+            EventLoopClosed(if let ::calloop::channel::SendError::Disconnected(x) = e {
+                x
+            } else {
+                unreachable!()
+            })
+        })
     }
 }
 

src/platform_impl/linux/x11/monitor.rs

@@ -130,7 +130,7 @@ impl MonitorHandle {
         })
     }
 
-    fn dummy() -> Self {
+    pub fn dummy() -> Self {
         MonitorHandle {
             id: 0,
             name: "<dummy monitor>".into(),
@@ -143,6 +143,11 @@ impl MonitorHandle {
         }
     }
 
+    pub(crate) fn is_dummy(&self) -> bool {
+        // Zero is an invalid XID value; no real monitor will have it
+        self.id == 0
+    }
+
     pub fn name(&self) -> Option<String> {
         Some(self.name.clone())
     }

src/platform_impl/linux/x11/util/input.rs

@@ -11,15 +11,18 @@ pub const VIRTUAL_CORE_KEYBOARD: c_int = 3;
 // To test if `lookup_utf8` works correctly, set this to 1.
 const TEXT_BUFFER_SIZE: usize = 1024;
 
-impl From<ffi::XIModifierState> for ModifiersState {
-    fn from(mods: ffi::XIModifierState) -> Self {
-        let state = mods.effective as c_uint;
-        ModifiersState {
-            alt: state & ffi::Mod1Mask != 0,
-            shift: state & ffi::ShiftMask != 0,
-            ctrl: state & ffi::ControlMask != 0,
-            logo: state & ffi::Mod4Mask != 0,
-        }
+impl ModifiersState {
+    pub(crate) fn from_x11(state: &ffi::XIModifierState) -> Self {
+        ModifiersState::from_x11_mask(state.effective as c_uint)
+    }
+
+    pub(crate) fn from_x11_mask(mask: c_uint) -> Self {
+        let mut m = ModifiersState::empty();
+        m.set(ModifiersState::SHIFT, mask & ffi::Mod1Mask != 0);
+        m.set(ModifiersState::CTRL, mask & ffi::ShiftMask != 0);
+        m.set(ModifiersState::ALT, mask & ffi::ControlMask != 0);
+        m.set(ModifiersState::LOGO, mask & ffi::Mod4Mask != 0);
+        m
     }
 }
 
@@ -40,7 +43,7 @@ pub struct PointerState<'a> {
 
 impl<'a> PointerState<'a> {
     pub fn get_modifier_state(&self) -> ModifiersState {
-        self.modifiers.into()
+        ModifiersState::from_x11(&self.modifiers)
     }
 }
 

src/platform_impl/linux/x11/util/keys.rs

@@ -0,0 +1,92 @@
+use std::{iter::Enumerate, ptr, slice::Iter};
+
+use super::*;
+
+pub struct Keymap {
+    keys: [u8; 32],
+}
+
+pub struct KeymapIter<'a> {
+    iter: Enumerate<Iter<'a, u8>>,
+    index: usize,
+    item: Option<u8>,
+}
+
+impl Keymap {
+    pub fn iter(&self) -> KeymapIter<'_> {
+        KeymapIter {
+            iter: self.keys.iter().enumerate(),
+            index: 0,
+            item: None,
+        }
+    }
+}
+
+impl<'a> IntoIterator for &'a Keymap {
+    type Item = ffi::KeyCode;
+    type IntoIter = KeymapIter<'a>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl Iterator for KeymapIter<'_> {
+    type Item = ffi::KeyCode;
+
+    fn next(&mut self) -> Option<ffi::KeyCode> {
+        if self.item.is_none() {
+            while let Some((index, &item)) = self.iter.next() {
+                if item != 0 {
+                    self.index = index;
+                    self.item = Some(item);
+                    break;
+                }
+            }
+        }
+
+        self.item.take().map(|item| {
+            debug_assert!(item != 0);
+
+            let bit = first_bit(item);
+
+            if item != bit {
+                // Remove the first bit; save the rest for further iterations
+                self.item = Some(item ^ bit);
+            }
+
+            let shift = bit.trailing_zeros() + (self.index * 8) as u32;
+            shift as ffi::KeyCode
+        })
+    }
+}
+
+impl XConnection {
+    pub fn keycode_to_keysym(&self, keycode: ffi::KeyCode) -> ffi::KeySym {
+        unsafe { (self.xlib.XKeycodeToKeysym)(self.display, keycode, 0) }
+    }
+
+    pub fn lookup_keysym(&self, xkev: &mut ffi::XKeyEvent) -> ffi::KeySym {
+        let mut keysym = 0;
+
+        unsafe {
+            (self.xlib.XLookupString)(xkev, ptr::null_mut(), 0, &mut keysym, ptr::null_mut());
+        }
+
+        keysym
+    }
+
+    pub fn query_keymap(&self) -> Keymap {
+        let mut keys = [0; 32];
+
+        unsafe {
+            (self.xlib.XQueryKeymap)(self.display, keys.as_mut_ptr() as *mut c_char);
+        }
+
+        Keymap { keys }
+    }
+}
+
+fn first_bit(b: u8) -> u8 {
+    1 << b.trailing_zeros()
+}

src/platform_impl/linux/x11/util/mod.rs

@@ -9,6 +9,7 @@ mod geometry;
 mod hint;
 mod icon;
 mod input;
+pub mod keys;
 mod memory;
 pub mod modifiers;
 mod randr;

src/platform_impl/linux/x11/util/modifiers.rs

@@ -35,6 +35,7 @@ pub struct ModifierKeymap {
 pub struct ModifierKeyState {
     // Contains currently pressed modifier keys and their corresponding modifiers
     keys: HashMap<ffi::KeyCode, Modifier>,
+    state: ModifiersState,
 }
 
 impl ModifierKeymap {
@@ -94,15 +95,7 @@ impl ModifierKeymap {
 }
 
 impl ModifierKeyState {
-    pub fn clear(&mut self) {
-        self.keys.clear();
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.keys.is_empty()
-    }
-
-    pub fn update(&mut self, mods: &ModifierKeymap) {
+    pub fn update_keymap(&mut self, mods: &ModifierKeymap) {
         self.keys.retain(|k, v| {
             if let Some(m) = mods.get_modifier(*k) {
                 *v = m;
@@ -111,16 +104,36 @@ impl ModifierKeyState {
                 false
             }
         });
+
+        self.reset_state();
+    }
+
+    pub fn update_state(
+        &mut self,
+        state: &ModifiersState,
+        except: Option<Modifier>,
+    ) -> Option<ModifiersState> {
+        let mut new_state = *state;
+
+        match except {
+            Some(Modifier::Alt) => new_state.set(ModifiersState::ALT, self.state.alt()),
+            Some(Modifier::Ctrl) => new_state.set(ModifiersState::CTRL, self.state.ctrl()),
+            Some(Modifier::Shift) => new_state.set(ModifiersState::SHIFT, self.state.shift()),
+            Some(Modifier::Logo) => new_state.set(ModifiersState::LOGO, self.state.logo()),
+            None => (),
+        }
+
+        if self.state == new_state {
+            None
+        } else {
+            self.keys.retain(|_k, v| get_modifier(&new_state, *v));
+            self.state = new_state;
+            Some(new_state)
+        }
     }
 
     pub fn modifiers(&self) -> ModifiersState {
-        let mut state = ModifiersState::default();
-
-        for &m in self.keys.values() {
-            set_modifier(&mut state, m);
-        }
-
-        state
+        self.state
     }
 
     pub fn key_event(&mut self, state: ElementState, keycode: ffi::KeyCode, modifier: Modifier) {
@@ -132,18 +145,43 @@ impl ModifierKeyState {
 
     pub fn key_press(&mut self, keycode: ffi::KeyCode, modifier: Modifier) {
         self.keys.insert(keycode, modifier);
+
+        set_modifier(&mut self.state, modifier, true);
     }
 
     pub fn key_release(&mut self, keycode: ffi::KeyCode) {
-        self.keys.remove(&keycode);
+        if let Some(modifier) = self.keys.remove(&keycode) {
+            if self.keys.values().find(|&&m| m == modifier).is_none() {
+                set_modifier(&mut self.state, modifier, false);
+            }
+        }
+    }
+
+    fn reset_state(&mut self) {
+        let mut new_state = ModifiersState::default();
+
+        for &m in self.keys.values() {
+            set_modifier(&mut new_state, m, true);
+        }
+
+        self.state = new_state;
     }
 }
 
-fn set_modifier(state: &mut ModifiersState, modifier: Modifier) {
+fn get_modifier(state: &ModifiersState, modifier: Modifier) -> bool {
     match modifier {
-        Modifier::Alt => state.alt = true,
-        Modifier::Ctrl => state.ctrl = true,
-        Modifier::Shift => state.shift = true,
-        Modifier::Logo => state.logo = true,
+        Modifier::Alt => state.alt(),
+        Modifier::Ctrl => state.ctrl(),
+        Modifier::Shift => state.shift(),
+        Modifier::Logo => state.logo(),
+    }
+}
+
+fn set_modifier(state: &mut ModifiersState, modifier: Modifier, value: bool) {
+    match modifier {
+        Modifier::Alt => state.set(ModifiersState::ALT, value),
+        Modifier::Ctrl => state.set(ModifiersState::CTRL, value),
+        Modifier::Shift => state.set(ModifiersState::SHIFT, value),
+        Modifier::Logo => state.set(ModifiersState::LOGO, value),
     }
 }

src/platform_impl/linux/x11/util/randr.rs

@@ -6,24 +6,17 @@ use super::{
 };
 use crate::{dpi::validate_hidpi_factor, platform_impl::platform::x11::VideoMode};
 
+/// Represents values of `WINIT_HIDPI_FACTOR`.
+pub enum EnvVarDPI {
+    Randr,
+    Scale(f64),
+    NotSet,
+}
+
 pub fn calc_dpi_factor(
     (width_px, height_px): (u32, u32),
     (width_mm, height_mm): (u64, u64),
 ) -> f64 {
-    // Override DPI if `WINIT_HIDPI_FACTOR` variable is set
-    let dpi_override = env::var("WINIT_HIDPI_FACTOR")
-        .ok()
-        .and_then(|var| f64::from_str(&var).ok());
-    if let Some(dpi_override) = dpi_override {
-        if !validate_hidpi_factor(dpi_override) {
-            panic!(
-                "`WINIT_HIDPI_FACTOR` invalid; DPI factors must be normal floats greater than 0. Got `{}`",
-                dpi_override,
-            );
-        }
-        return dpi_override;
-    }
-
     // See http://xpra.org/trac/ticket/728 for more information.
     if width_mm == 0 || height_mm == 0 {
         warn!("XRandR reported that the display's 0mm in size, which is certifiably insane");
@@ -107,16 +100,55 @@ impl XConnection {
             (*output_info).nameLen as usize,
         );
         let name = String::from_utf8_lossy(name_slice).into();
-        let hidpi_factor = if let Some(dpi) = self.get_xft_dpi() {
-            dpi / 96.
-        } else {
-            calc_dpi_factor(
+        // Override DPI if `WINIT_HIDPI_FACTOR` variable is set
+        let dpi_env = env::var("WINIT_HIDPI_FACTOR").ok().map_or_else(
+            || EnvVarDPI::NotSet,
+            |var| {
+                if var.to_lowercase() == "randr" {
+                    EnvVarDPI::Randr
+                } else if let Ok(dpi) = f64::from_str(&var) {
+                    EnvVarDPI::Scale(dpi)
+                } else if var.is_empty() {
+                    EnvVarDPI::NotSet
+                } else {
+                    panic!(
+                        "`WINIT_HIDPI_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{}`",
+                        var
+                    );
+                }
+            },
+        );
+
+        let hidpi_factor = match dpi_env {
+            EnvVarDPI::Randr => calc_dpi_factor(
                 ((*crtc).width as u32, (*crtc).height as u32),
                 (
                     (*output_info).mm_width as u64,
                     (*output_info).mm_height as u64,
                 ),
-            )
+            ),
+            EnvVarDPI::Scale(dpi_override) => {
+                if !validate_hidpi_factor(dpi_override) {
+                    panic!(
+                        "`WINIT_HIDPI_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{}`",
+                        dpi_override,
+                    );
+                }
+                dpi_override
+            }
+            EnvVarDPI::NotSet => {
+                if let Some(dpi) = self.get_xft_dpi() {
+                    dpi / 96.
+                } else {
+                    calc_dpi_factor(
+                        ((*crtc).width as u32, (*crtc).height as u32),
+                        (
+                            (*output_info).mm_width as u64,
+                            (*output_info).mm_height as u64,
+                        ),
+                    )
+                }
+            }
         };
 
         (self.xrandr.XRRFreeOutputInfo)(output_info);

src/platform_impl/linux/x11/window.rs

@@ -28,27 +28,18 @@ use crate::{
 
 use super::{ffi, util, EventLoopWindowTarget, ImeSender, WindowId, XConnection, XError};
 
-unsafe extern "C" fn visibility_predicate(
-    _display: *mut ffi::Display,
-    event: *mut ffi::XEvent,
-    arg: ffi::XPointer, // We populate this with the window ID (by value) when we call XIfEvent
-) -> ffi::Bool {
-    let event: &ffi::XAnyEvent = (*event).as_ref();
-    let window = arg as ffi::Window;
-    (event.window == window && event.type_ == ffi::VisibilityNotify) as _
-}
-
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct SharedState {
     pub cursor_pos: Option<(f64, f64)>,
     pub size: Option<(u32, u32)>,
     pub position: Option<(i32, i32)>,
     pub inner_position: Option<(i32, i32)>,
     pub inner_position_rel_parent: Option<(i32, i32)>,
-    pub guessed_dpi: Option<f64>,
-    pub last_monitor: Option<X11MonitorHandle>,
+    pub last_monitor: X11MonitorHandle,
     pub dpi_adjusted: Option<(f64, f64)>,
     pub fullscreen: Option<Fullscreen>,
+    // Set when application calls `set_fullscreen` when window is not visible
+    pub desired_fullscreen: Option<Option<Fullscreen>>,
     // Used to restore position after exiting fullscreen
     pub restore_position: Option<(i32, i32)>,
     // Used to restore video mode after exiting fullscreen
@@ -56,15 +47,43 @@ pub struct SharedState {
     pub frame_extents: Option<util::FrameExtentsHeuristic>,
     pub min_inner_size: Option<LogicalSize>,
     pub max_inner_size: Option<LogicalSize>,
-    pub is_visible: bool,
+    pub visibility: Visibility,
+}
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub enum Visibility {
+    No,
+    Yes,
+    // Waiting for VisibilityNotify
+    YesWait,
 }
 
 impl SharedState {
-    fn new(dpi_factor: f64, is_visible: bool) -> Mutex<Self> {
-        let mut shared_state = SharedState::default();
-        shared_state.guessed_dpi = Some(dpi_factor);
-        shared_state.is_visible = is_visible;
-        Mutex::new(shared_state)
+    fn new(last_monitor: X11MonitorHandle, is_visible: bool) -> Mutex<Self> {
+        let visibility = if is_visible {
+            Visibility::YesWait
+        } else {
+            Visibility::No
+        };
+
+        Mutex::new(SharedState {
+            last_monitor,
+            visibility,
+
+            cursor_pos: None,
+            size: None,
+            position: None,
+            inner_position: None,
+            inner_position_rel_parent: None,
+            dpi_adjusted: None,
+            fullscreen: None,
+            desired_fullscreen: None,
+            restore_position: None,
+            desktop_video_mode: None,
+            frame_extents: None,
+            min_inner_size: None,
+            max_inner_size: None,
+        })
     }
 }
 
@@ -93,34 +112,27 @@ impl UnownedWindow {
         let xconn = &event_loop.xconn;
         let root = event_loop.root;
 
-        let monitors = xconn.available_monitors();
-        let dpi_factor = if !monitors.is_empty() {
-            let mut dpi_factor = Some(monitors[0].hidpi_factor());
-            for monitor in &monitors {
-                if Some(monitor.hidpi_factor()) != dpi_factor {
-                    dpi_factor = None;
-                }
-            }
-            dpi_factor.unwrap_or_else(|| {
-                xconn
-                    .query_pointer(root, util::VIRTUAL_CORE_POINTER)
-                    .ok()
-                    .and_then(|pointer_state| {
-                        let (x, y) = (pointer_state.root_x as i64, pointer_state.root_y as i64);
-                        let mut dpi_factor = None;
-                        for monitor in &monitors {
-                            if monitor.rect.contains_point(x, y) {
-                                dpi_factor = Some(monitor.hidpi_factor());
-                                break;
-                            }
-                        }
-                        dpi_factor
-                    })
-                    .unwrap_or(1.0)
-            })
+        let mut monitors = xconn.available_monitors();
+        let guessed_monitor = if monitors.is_empty() {
+            X11MonitorHandle::dummy()
         } else {
-            1.0
+            xconn
+                .query_pointer(root, util::VIRTUAL_CORE_POINTER)
+                .ok()
+                .and_then(|pointer_state| {
+                    let (x, y) = (pointer_state.root_x as i64, pointer_state.root_y as i64);
+
+                    for i in 0..monitors.len() {
+                        if monitors[i].rect.contains_point(x, y) {
+                            return Some(monitors.swap_remove(i));
+                        }
+                    }
+
+                    None
+                })
+                .unwrap_or_else(|| monitors.swap_remove(0))
         };
+        let dpi_factor = guessed_monitor.hidpi_factor();
 
         info!("Guessed window DPI factor: {}", dpi_factor);
 
@@ -232,7 +244,7 @@ impl UnownedWindow {
             cursor_grabbed: Mutex::new(false),
             cursor_visible: Mutex::new(true),
             ime_sender: Mutex::new(event_loop.ime_sender.clone()),
-            shared_state: SharedState::new(dpi_factor, window_attrs.visible),
+            shared_state: SharedState::new(guessed_monitor, window_attrs.visible),
             pending_redraws: event_loop.pending_redraws.clone(),
         };
 
@@ -355,8 +367,6 @@ impl UnownedWindow {
                 unsafe {
                     (xconn.xlib.XMapRaised)(xconn.display, window.xwindow);
                 } //.queue();
-
-                window.wait_for_visibility_notify();
             }
 
             // Attempt to make keyboard input repeat detectable
@@ -414,8 +424,7 @@ impl UnownedWindow {
             if window_attrs.fullscreen.is_some() {
                 window
                     .set_fullscreen_inner(window_attrs.fullscreen.clone())
-                    .unwrap()
-                    .queue();
+                    .map(|flusher| flusher.queue());
             }
             if window_attrs.always_on_top {
                 window
@@ -572,9 +581,13 @@ impl UnownedWindow {
     fn set_fullscreen_inner(&self, fullscreen: Option<Fullscreen>) -> Option<util::Flusher<'_>> {
         let mut shared_state_lock = self.shared_state.lock();
 
-        if !shared_state_lock.is_visible {
+        match shared_state_lock.visibility {
             // Setting fullscreen on a window that is not visible will generate an error.
-            return None;
+            Visibility::No | Visibility::YesWait => {
+                shared_state_lock.desired_fullscreen = Some(fullscreen);
+                return None;
+            }
+            Visibility::Yes => (),
         }
 
         let old_fullscreen = shared_state_lock.fullscreen.clone();
@@ -638,7 +651,7 @@ impl UnownedWindow {
                 };
 
                 // Don't set fullscreen on an invalid dummy monitor handle
-                if monitor.id == 0 {
+                if monitor.is_dummy() {
                     return None;
                 }
 
@@ -685,7 +698,12 @@ impl UnownedWindow {
 
     #[inline]
     pub fn fullscreen(&self) -> Option<Fullscreen> {
-        self.shared_state.lock().fullscreen.clone()
+        let shared_state = self.shared_state.lock();
+
+        shared_state
+            .desired_fullscreen
+            .clone()
+            .unwrap_or_else(|| shared_state.fullscreen.clone())
     }
 
     #[inline]
@@ -698,24 +716,29 @@ impl UnownedWindow {
         }
     }
 
-    fn get_rect(&self) -> util::AaRect {
-        // TODO: This might round-trip more times than needed.
-        let position = self.outer_position_physical();
-        let size = self.outer_size_physical();
-        util::AaRect::new(position, size)
+    // Called by EventProcessor when a VisibilityNotify event is received
+    pub(crate) fn visibility_notify(&self) {
+        let mut shared_state = self.shared_state.lock();
+
+        match shared_state.visibility {
+            Visibility::No => unsafe {
+                (self.xconn.xlib.XUnmapWindow)(self.xconn.display, self.xwindow);
+            },
+            Visibility::Yes => (),
+            Visibility::YesWait => {
+                shared_state.visibility = Visibility::Yes;
+
+                if let Some(fullscreen) = shared_state.desired_fullscreen.take() {
+                    drop(shared_state);
+                    self.set_fullscreen(fullscreen);
+                }
+            }
+        }
     }
 
     #[inline]
     pub fn current_monitor(&self) -> X11MonitorHandle {
-        let monitor = self.shared_state.lock().last_monitor.as_ref().cloned();
-        monitor.unwrap_or_else(|| {
-            let monitor = self.xconn.get_monitor_for_window(Some(self.get_rect()));
-            // Avoid caching an invalid dummy monitor handle
-            if monitor.id != 0 {
-                self.shared_state.lock().last_monitor = Some(monitor.clone());
-            }
-            monitor
-        })
+        self.shared_state.lock().last_monitor.clone()
     }
 
     pub fn available_monitors(&self) -> Vec<X11MonitorHandle> {
@@ -726,6 +749,35 @@ impl UnownedWindow {
         self.xconn.primary_monitor()
     }
 
+    fn set_minimized_inner(&self, minimized: bool) -> util::Flusher<'_> {
+        unsafe {
+            if minimized {
+                let screen = (self.xconn.xlib.XDefaultScreen)(self.xconn.display);
+
+                (self.xconn.xlib.XIconifyWindow)(self.xconn.display, self.xwindow, screen);
+
+                util::Flusher::new(&self.xconn)
+            } else {
+                let atom = self.xconn.get_atom_unchecked(b"_NET_ACTIVE_WINDOW\0");
+
+                self.xconn.send_client_msg(
+                    self.xwindow,
+                    self.root,
+                    atom,
+                    Some(ffi::SubstructureRedirectMask | ffi::SubstructureNotifyMask),
+                    [1, ffi::CurrentTime as c_long, 0, 0, 0],
+                )
+            }
+        }
+    }
+
+    #[inline]
+    pub fn set_minimized(&self, minimized: bool) {
+        self.set_minimized_inner(minimized)
+            .flush()
+            .expect("Failed to change window minimization");
+    }
+
     fn set_maximized_inner(&self, maximized: bool) -> util::Flusher<'_> {
         let horz_atom = unsafe {
             self.xconn
@@ -848,44 +900,31 @@ impl UnownedWindow {
 
     #[inline]
     pub fn set_visible(&self, visible: bool) {
-        let is_visible = self.shared_state.lock().is_visible;
+        let mut shared_state = self.shared_state.lock();
 
-        if visible == is_visible {
-            return;
+        match (visible, shared_state.visibility) {
+            (true, Visibility::Yes) | (true, Visibility::YesWait) | (false, Visibility::No) => {
+                return
+            }
+            _ => (),
         }
 
-        match visible {
-            true => unsafe {
+        if visible {
+            unsafe {
                 (self.xconn.xlib.XMapRaised)(self.xconn.display, self.xwindow);
-                self.xconn
-                    .flush_requests()
-                    .expect("Failed to call XMapRaised");
-
-                // Some X requests may generate an error if the window is not
-                // visible, so we must wait until the window becomes visible.
-                self.wait_for_visibility_notify();
-            },
-            false => unsafe {
+            }
+            self.xconn
+                .flush_requests()
+                .expect("Failed to call XMapRaised");
+            shared_state.visibility = Visibility::YesWait;
+        } else {
+            unsafe {
                 (self.xconn.xlib.XUnmapWindow)(self.xconn.display, self.xwindow);
-                self.xconn
-                    .flush_requests()
-                    .expect("Failed to call XUnmapWindow");
-            },
-        }
-
-        self.shared_state.lock().is_visible = visible;
-    }
-
-    fn wait_for_visibility_notify(&self) {
-        unsafe {
-            let mut event = MaybeUninit::uninit();
-
-            (self.xconn.xlib.XIfEvent)(
-                self.xconn.display,
-                event.as_mut_ptr(),
-                Some(visibility_predicate),
-                self.xwindow as _,
-            );
+            }
+            self.xconn
+                .flush_requests()
+                .expect("Failed to call XUnmapWindow");
+            shared_state.visibility = Visibility::No;
         }
     }
 
@@ -982,17 +1021,6 @@ impl UnownedWindow {
         self.logicalize_size(self.inner_size_physical())
     }
 
-    pub(crate) fn outer_size_physical(&self) -> (u32, u32) {
-        let extents = self.shared_state.lock().frame_extents.clone();
-        if let Some(extents) = extents {
-            let (w, h) = self.inner_size_physical();
-            extents.inner_size_to_outer(w, h)
-        } else {
-            self.update_cached_frame_extents();
-            self.outer_size_physical()
-        }
-    }
-
     #[inline]
     pub fn outer_size(&self) -> LogicalSize {
         let extents = self.shared_state.lock().frame_extents.clone();

src/platform_impl/macos/app_state.rs

@@ -11,14 +11,19 @@ use std::{
     time::Instant,
 };
 
-use cocoa::{appkit::NSApp, base::nil};
+use cocoa::{
+    appkit::NSApp,
+    base::nil,
+    foundation::{NSAutoreleasePool, NSString},
+};
 
 use crate::{
-    event::{Event, StartCause, WindowEvent},
+    event::{Event, StartCause},
     event_loop::{ControlFlow, EventLoopWindowTarget as RootWindowTarget},
     platform_impl::platform::{observer::EventLoopWaker, util::Never},
     window::WindowId,
 };
+use objc::runtime::Object;
 
 lazy_static! {
     static ref HANDLER: Handler = Default::default();
@@ -265,18 +270,37 @@ impl AppState {
             for event in HANDLER.take_events() {
                 HANDLER.handle_nonuser_event(event);
             }
+            HANDLER.handle_nonuser_event(Event::MainEventsCleared);
             for window_id in HANDLER.should_redraw() {
-                HANDLER.handle_nonuser_event(Event::WindowEvent {
-                    window_id,
-                    event: WindowEvent::RedrawRequested,
-                });
+                HANDLER.handle_nonuser_event(Event::RedrawRequested(window_id));
             }
-            HANDLER.handle_nonuser_event(Event::EventsCleared);
+            HANDLER.handle_nonuser_event(Event::RedrawEventsCleared);
             HANDLER.set_in_callback(false);
         }
         if HANDLER.should_exit() {
-            let _: () = unsafe { msg_send![NSApp(), stop: nil] };
-            return;
+            unsafe {
+                let _: () = msg_send![NSApp(), stop: nil];
+
+                let pool = NSAutoreleasePool::new(nil);
+
+                let windows: *const Object = msg_send![NSApp(), windows];
+                let window: *const Object = msg_send![windows, objectAtIndex:0];
+                assert_ne!(window, nil);
+
+                let title: *const Object = msg_send![window, title];
+                assert_ne!(title, nil);
+                let postfix = NSString::alloc(nil).init_str("*");
+                let some_unique_title: *const Object =
+                    msg_send![title, stringByAppendingString: postfix];
+                assert_ne!(some_unique_title, nil);
+
+                // To stop event loop immediately, we need to send some UI event here.
+                let _: () = msg_send![window, setTitle: some_unique_title];
+                // And restore it.
+                let _: () = msg_send![window, setTitle: title];
+
+                pool.drain();
+            };
         }
         HANDLER.update_start_time();
         match HANDLER.get_old_and_new_control_flow() {

src/platform_impl/macos/event.rs

@@ -208,7 +208,7 @@ pub fn scancode_to_keycode(scancode: c_ushort) -> Option<VirtualKeyCode> {
 // While F1-F20 have scancodes we can match on, we have to check against UTF-16
 // constants for the rest.
 // https://developer.apple.com/documentation/appkit/1535851-function-key_unicodes?preferredLanguage=occ
-pub fn check_function_keys(string: &String) -> Option<VirtualKeyCode> {
+pub fn check_function_keys(string: &str) -> Option<VirtualKeyCode> {
     if let Some(ch) = string.encode_utf16().next() {
         return Some(match ch {
             0xf718 => VirtualKeyCode::F21,
@@ -224,12 +224,24 @@ pub fn check_function_keys(string: &String) -> Option<VirtualKeyCode> {
 
 pub fn event_mods(event: id) -> ModifiersState {
     let flags = unsafe { NSEvent::modifierFlags(event) };
-    ModifiersState {
-        shift: flags.contains(NSEventModifierFlags::NSShiftKeyMask),
-        ctrl: flags.contains(NSEventModifierFlags::NSControlKeyMask),
-        alt: flags.contains(NSEventModifierFlags::NSAlternateKeyMask),
-        logo: flags.contains(NSEventModifierFlags::NSCommandKeyMask),
-    }
+    let mut m = ModifiersState::empty();
+    m.set(
+        ModifiersState::SHIFT,
+        flags.contains(NSEventModifierFlags::NSShiftKeyMask),
+    );
+    m.set(
+        ModifiersState::CTRL,
+        flags.contains(NSEventModifierFlags::NSControlKeyMask),
+    );
+    m.set(
+        ModifiersState::ALT,
+        flags.contains(NSEventModifierFlags::NSAlternateKeyMask),
+    );
+    m.set(
+        ModifiersState::LOGO,
+        flags.contains(NSEventModifierFlags::NSCommandKeyMask),
+    );
+    m
 }
 
 pub fn get_scancode(event: cocoa::base::id) -> c_ushort {
@@ -264,6 +276,7 @@ pub unsafe fn modifier_event(
                 virtual_keycode,
                 modifiers: event_mods(ns_event),
             },
+            is_synthetic: false,
         })
     } else {
         None

src/platform_impl/macos/event_loop.rs

@@ -95,12 +95,13 @@ impl<T> EventLoop<T> {
         F: FnMut(Event<T>, &RootWindowTarget<T>, &mut ControlFlow),
     {
         unsafe {
-            let _pool = NSAutoreleasePool::new(nil);
+            let pool = NSAutoreleasePool::new(nil);
             let app = NSApp();
             assert_ne!(app, nil);
             AppState::set_callback(callback, Rc::clone(&self.window_target));
             let _: () = msg_send![app, run];
             AppState::exit();
+            pool.drain();
         }
     }
 
@@ -132,7 +133,7 @@ impl<T> Proxy<T> {
             // process user events through the normal OS EventLoop mechanisms.
             let rl = CFRunLoopGetMain();
             let mut context: CFRunLoopSourceContext = mem::zeroed();
-            context.perform = event_loop_proxy_handler;
+            context.perform = Some(event_loop_proxy_handler);
             let source =
                 CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::max_value() - 1, &mut context);
             CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes);
@@ -142,8 +143,10 @@ impl<T> Proxy<T> {
         }
     }
 
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
-        self.sender.send(event).map_err(|_| EventLoopClosed)?;
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        self.sender
+            .send(event)
+            .map_err(|mpsc::SendError(x)| EventLoopClosed(x))?;
         unsafe {
             // let the main thread know there's a new event
             CFRunLoopSourceSignal(self.source);

src/platform_impl/macos/monitor.rs

@@ -248,7 +248,6 @@ impl MonitorHandle {
                 assert!(!array.is_null(), "failed to get list of display modes");
                 let array_count = CFArrayGetCount(array);
                 let modes: Vec<_> = (0..array_count)
-                    .into_iter()
                     .map(move |i| {
                         let mode = CFArrayGetValueAtIndex(array, i) as *mut _;
                         ffi::CGDisplayModeRetain(mode);

src/platform_impl/macos/observer.rs

@@ -93,14 +93,14 @@ pub enum CFRunLoopTimerContext {}
 pub struct CFRunLoopSourceContext {
     pub version: CFIndex,
     pub info: *mut c_void,
-    pub retain: extern "C" fn(*const c_void) -> *const c_void,
-    pub release: extern "C" fn(*const c_void),
-    pub copyDescription: extern "C" fn(*const c_void) -> CFStringRef,
-    pub equal: extern "C" fn(*const c_void, *const c_void) -> ffi::Boolean,
-    pub hash: extern "C" fn(*const c_void) -> CFHashCode,
-    pub schedule: extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode),
-    pub cancel: extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode),
-    pub perform: extern "C" fn(*mut c_void),
+    pub retain: Option<extern "C" fn(*const c_void) -> *const c_void>,
+    pub release: Option<extern "C" fn(*const c_void)>,
+    pub copyDescription: Option<extern "C" fn(*const c_void) -> CFStringRef>,
+    pub equal: Option<extern "C" fn(*const c_void, *const c_void) -> ffi::Boolean>,
+    pub hash: Option<extern "C" fn(*const c_void) -> CFHashCode>,
+    pub schedule: Option<extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode)>,
+    pub cancel: Option<extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode)>,
+    pub perform: Option<extern "C" fn(*mut c_void)>,
 }
 
 // begin is queued with the highest priority to ensure it is processed before other observers

src/platform_impl/macos/util/async.rs

@@ -60,11 +60,15 @@ pub unsafe fn set_style_mask_async(ns_window: id, ns_view: id, mask: NSWindowSty
 }
 pub unsafe fn set_style_mask_sync(ns_window: id, ns_view: id, mask: NSWindowStyleMask) {
     let context = SetStyleMaskData::new_ptr(ns_window, ns_view, mask);
-    dispatch_sync_f(
-        dispatch_get_main_queue(),
-        context as *mut _,
-        set_style_mask_callback,
-    );
+    if msg_send![class!(NSThread), isMainThread] {
+        set_style_mask_callback(context as *mut _);
+    } else {
+        dispatch_sync_f(
+            dispatch_get_main_queue(),
+            context as *mut _,
+            set_style_mask_callback,
+        );
+    }
 }
 
 struct SetContentSizeData {

src/platform_impl/macos/util/cursor.rs

@@ -3,7 +3,8 @@ use cocoa::{
     base::{id, nil},
     foundation::{NSDictionary, NSPoint, NSString},
 };
-use objc::runtime::Sel;
+use objc::{runtime::Sel, runtime::NO};
+use std::cell::RefCell;
 
 use crate::window::CursorIcon;
 
@@ -126,3 +127,38 @@ pub unsafe fn load_webkit_cursor(cursor_name: &str) -> id {
         hotSpot:point
     ]
 }
+
+pub unsafe fn invisible_cursor() -> id {
+    // 16x16 GIF data for invisible cursor
+    // You can reproduce this via ImageMagick.
+    // $ convert -size 16x16 xc:none cursor.gif
+    static CURSOR_BYTES: &[u8] = &[
+        0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x10, 0x00, 0x10, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x21, 0xF9, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00,
+        0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x02, 0x0E, 0x84, 0x8F, 0xA9, 0xCB, 0xED, 0x0F,
+        0xA3, 0x9C, 0xB4, 0xDA, 0x8B, 0xB3, 0x3E, 0x05, 0x00, 0x3B,
+    ];
+
+    thread_local! {
+        // We can't initialize this at startup.
+        static CURSOR_OBJECT: RefCell<id> = RefCell::new(nil);
+    }
+
+    CURSOR_OBJECT.with(|cursor_obj| {
+        if *cursor_obj.borrow() == nil {
+            // Create a cursor from `CURSOR_BYTES`
+            let cursor_data: id = msg_send![class!(NSData),
+                dataWithBytesNoCopy:CURSOR_BYTES as *const [u8]
+                length:CURSOR_BYTES.len()
+                freeWhenDone:NO
+            ];
+
+            let ns_image: id = msg_send![class!(NSImage), alloc];
+            let _: id = msg_send![ns_image, initWithData: cursor_data];
+            let cursor: id = msg_send![class!(NSCursor), alloc];
+            *cursor_obj.borrow_mut() =
+                msg_send![cursor, initWithImage:ns_image hotSpot: NSPoint::new(0.0, 0.0)];
+        }
+        *cursor_obj.borrow()
+    })
+}

src/platform_impl/macos/view.rs

@@ -9,7 +9,7 @@ use std::{
 use cocoa::{
     appkit::{NSApp, NSEvent, NSEventModifierFlags, NSEventPhase, NSView, NSWindow},
     base::{id, nil},
-    foundation::{NSPoint, NSRect, NSSize, NSString, NSUInteger},
+    foundation::{NSInteger, NSPoint, NSRect, NSSize, NSString, NSUInteger},
 };
 use objc::{
     declare::ClassDecl,
@@ -18,8 +18,8 @@ use objc::{
 
 use crate::{
     event::{
-        DeviceEvent, ElementState, Event, KeyboardInput, MouseButton, MouseScrollDelta, TouchPhase,
-        VirtualKeyCode, WindowEvent,
+        DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, MouseButton,
+        MouseScrollDelta, TouchPhase, VirtualKeyCode, WindowEvent,
     },
     platform_impl::platform::{
         app_state::AppState,
@@ -35,33 +35,41 @@ use crate::{
     window::WindowId,
 };
 
-#[derive(Default)]
-struct Modifiers {
-    shift_pressed: bool,
-    ctrl_pressed: bool,
-    win_pressed: bool,
-    alt_pressed: bool,
+pub struct CursorState {
+    pub visible: bool,
+    pub cursor: util::Cursor,
+}
+
+impl Default for CursorState {
+    fn default() -> Self {
+        Self {
+            visible: true,
+            cursor: Default::default(),
+        }
+    }
 }
 
 struct ViewState {
     ns_window: id,
-    pub cursor: Arc<Mutex<util::Cursor>>,
+    pub cursor_state: Arc<Mutex<CursorState>>,
     ime_spot: Option<(f64, f64)>,
     raw_characters: Option<String>,
     is_key_down: bool,
-    modifiers: Modifiers,
+    modifiers: ModifiersState,
+    tracking_rect: Option<NSInteger>,
 }
 
-pub fn new_view(ns_window: id) -> (IdRef, Weak<Mutex<util::Cursor>>) {
-    let cursor = Default::default();
-    let cursor_access = Arc::downgrade(&cursor);
+pub fn new_view(ns_window: id) -> (IdRef, Weak<Mutex<CursorState>>) {
+    let cursor_state = Default::default();
+    let cursor_access = Arc::downgrade(&cursor_state);
     let state = ViewState {
         ns_window,
-        cursor,
+        cursor_state,
         ime_spot: None,
         raw_characters: None,
         is_key_down: false,
         modifiers: Default::default(),
+        tracking_rect: None,
     };
     unsafe {
         // This is free'd in `dealloc`
@@ -236,6 +244,10 @@ lazy_static! {
             sel!(cancelOperation:),
             cancel_operation as extern "C" fn(&Object, Sel, id),
         );
+        decl.add_method(
+            sel!(frameDidChange:),
+            frame_did_change as extern "C" fn(&Object, Sel, id),
+        );
         decl.add_ivar::<*mut c_void>("winitState");
         decl.add_ivar::<id>("markedText");
         let protocol = Protocol::get("NSTextInputClient").unwrap();
@@ -261,6 +273,19 @@ extern "C" fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> i
             let marked_text =
                 <id as NSMutableAttributedString>::init(NSMutableAttributedString::alloc(nil));
             (*this).set_ivar("markedText", marked_text);
+            let _: () = msg_send![this, setPostsFrameChangedNotifications: YES];
+
+            let notification_center: &Object =
+                msg_send![class!(NSNotificationCenter), defaultCenter];
+            let notification_name =
+                NSString::alloc(nil).init_str("NSViewFrameDidChangeNotification");
+            let _: () = msg_send![
+                notification_center,
+                addObserver: this
+                selector: sel!(frameDidChange:)
+                name: notification_name
+                object: this
+            ];
         }
         this
     }
@@ -269,17 +294,46 @@ extern "C" fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> i
 extern "C" fn view_did_move_to_window(this: &Object, _sel: Sel) {
     trace!("Triggered `viewDidMoveToWindow`");
     unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        if let Some(tracking_rect) = state.tracking_rect.take() {
+            let _: () = msg_send![this, removeTrackingRect: tracking_rect];
+        }
+
         let rect: NSRect = msg_send![this, visibleRect];
-        let _: () = msg_send![this,
+        let tracking_rect: NSInteger = msg_send![this,
             addTrackingRect:rect
             owner:this
             userData:nil
             assumeInside:NO
         ];
+        state.tracking_rect = Some(tracking_rect);
     }
     trace!("Completed `viewDidMoveToWindow`");
 }
 
+extern "C" fn frame_did_change(this: &Object, _sel: Sel, _event: id) {
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        if let Some(tracking_rect) = state.tracking_rect.take() {
+            let _: () = msg_send![this, removeTrackingRect: tracking_rect];
+        }
+
+        let rect: NSRect = msg_send![this, visibleRect];
+        let tracking_rect: NSInteger = msg_send![this,
+            addTrackingRect:rect
+            owner:this
+            userData:nil
+            assumeInside:NO
+        ];
+
+        state.tracking_rect = Some(tracking_rect);
+    }
+}
+
 extern "C" fn draw_rect(this: &Object, _sel: Sel, rect: NSRect) {
     unsafe {
         let state_ptr: *mut c_void = *this.get_ivar("winitState");
@@ -309,7 +363,12 @@ extern "C" fn reset_cursor_rects(this: &Object, _sel: Sel) {
         let state = &mut *(state_ptr as *mut ViewState);
 
         let bounds: NSRect = msg_send![this, bounds];
-        let cursor = state.cursor.lock().unwrap().load();
+        let cursor_state = state.cursor_state.lock().unwrap();
+        let cursor = if cursor_state.visible {
+            cursor_state.cursor.load()
+        } else {
+            util::invisible_cursor()
+        };
         let _: () = msg_send![this,
             addCursorRect:bounds
             cursor:cursor
@@ -452,7 +511,7 @@ extern "C" fn insert_text(this: &Object, _sel: Sel, string: id, _replacement_ran
         //let event: id = msg_send![NSApp(), currentEvent];
 
         let mut events = VecDeque::with_capacity(characters.len());
-        for character in string.chars() {
+        for character in string.chars().filter(|c| !is_corporate_character(*c)) {
             events.push_back(Event::WindowEvent {
                 window_id: WindowId(get_window_id(state.ns_window)),
                 event: WindowEvent::ReceivedCharacter(character),
@@ -484,7 +543,10 @@ extern "C" fn do_command_by_selector(this: &Object, _sel: Sel, command: Sel) {
         } else {
             let raw_characters = state.raw_characters.take();
             if let Some(raw_characters) = raw_characters {
-                for character in raw_characters.chars() {
+                for character in raw_characters
+                    .chars()
+                    .filter(|c| !is_corporate_character(*c))
+                {
                     events.push_back(Event::WindowEvent {
                         window_id: WindowId(get_window_id(state.ns_window)),
                         event: WindowEvent::ReceivedCharacter(character),
@@ -515,15 +577,27 @@ fn get_characters(event: id, ignore_modifiers: bool) -> String {
     }
 }
 
+// As defined in: https://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CORPCHAR.TXT
+fn is_corporate_character(c: char) -> bool {
+    match c {
+        '\u{F700}'..='\u{F747}'
+        | '\u{F802}'..='\u{F84F}'
+        | '\u{F850}'
+        | '\u{F85C}'
+        | '\u{F85D}'
+        | '\u{F85F}'
+        | '\u{F860}'..='\u{F86B}'
+        | '\u{F870}'..='\u{F8FF}' => true,
+        _ => false,
+    }
+}
+
 // Retrieves a layout-independent keycode given an event.
 fn retrieve_keycode(event: id) -> Option<VirtualKeyCode> {
     #[inline]
     fn get_code(ev: id, raw: bool) -> Option<VirtualKeyCode> {
         let characters = get_characters(ev, raw);
-        characters
-            .chars()
-            .next()
-            .map_or(None, |c| char_to_keycode(c))
+        characters.chars().next().and_then(|c| char_to_keycode(c))
     }
 
     // Cmd switches Roman letters for Dvorak-QWERTY layout, so we try modified characters first.
@@ -567,6 +641,7 @@ extern "C" fn key_down(this: &Object, _sel: Sel, event: id) {
                     virtual_keycode,
                     modifiers: event_mods(event),
                 },
+                is_synthetic: false,
             },
         };
 
@@ -574,7 +649,7 @@ extern "C" fn key_down(this: &Object, _sel: Sel, event: id) {
             AppState::queue_event(window_event);
             // Emit `ReceivedCharacter` for key repeats
             if is_repeat && state.is_key_down {
-                for character in characters.chars() {
+                for character in characters.chars().filter(|c| !is_corporate_character(*c)) {
                     AppState::queue_event(Event::WindowEvent {
                         window_id,
                         event: WindowEvent::ReceivedCharacter(character),
@@ -618,6 +693,7 @@ extern "C" fn key_up(this: &Object, _sel: Sel, event: id) {
                     virtual_keycode,
                     modifiers: event_mods(event),
                 },
+                is_synthetic: false,
             },
         };
 
@@ -637,36 +713,36 @@ extern "C" fn flags_changed(this: &Object, _sel: Sel, event: id) {
         if let Some(window_event) = modifier_event(
             event,
             NSEventModifierFlags::NSShiftKeyMask,
-            state.modifiers.shift_pressed,
+            state.modifiers.shift(),
         ) {
-            state.modifiers.shift_pressed = !state.modifiers.shift_pressed;
+            state.modifiers.toggle(ModifiersState::SHIFT);
             events.push_back(window_event);
         }
 
         if let Some(window_event) = modifier_event(
             event,
             NSEventModifierFlags::NSControlKeyMask,
-            state.modifiers.ctrl_pressed,
+            state.modifiers.ctrl(),
         ) {
-            state.modifiers.ctrl_pressed = !state.modifiers.ctrl_pressed;
+            state.modifiers.toggle(ModifiersState::CTRL);
             events.push_back(window_event);
         }
 
         if let Some(window_event) = modifier_event(
             event,
             NSEventModifierFlags::NSCommandKeyMask,
-            state.modifiers.win_pressed,
+            state.modifiers.logo(),
         ) {
-            state.modifiers.win_pressed = !state.modifiers.win_pressed;
+            state.modifiers.toggle(ModifiersState::LOGO);
             events.push_back(window_event);
         }
 
         if let Some(window_event) = modifier_event(
             event,
             NSEventModifierFlags::NSAlternateKeyMask,
-            state.modifiers.alt_pressed,
+            state.modifiers.alt(),
         ) {
-            state.modifiers.alt_pressed = !state.modifiers.alt_pressed;
+            state.modifiers.toggle(ModifiersState::ALT);
             events.push_back(window_event);
         }
 
@@ -676,6 +752,11 @@ extern "C" fn flags_changed(this: &Object, _sel: Sel, event: id) {
                 event,
             });
         }
+
+        AppState::queue_event(Event::DeviceEvent {
+            device_id: DEVICE_ID,
+            event: DeviceEvent::ModifiersChanged(state.modifiers),
+        });
     }
     trace!("Completed `flagsChanged`");
 }
@@ -726,6 +807,7 @@ extern "C" fn cancel_operation(this: &Object, _sel: Sel, _sender: id) {
                     virtual_keycode,
                     modifiers: event_mods(event),
                 },
+                is_synthetic: false,
             },
         };
 

src/platform_impl/macos/window.rs

@@ -20,6 +20,7 @@ use crate::{
         ffi,
         monitor::{self, MonitorHandle, VideoMode},
         util::{self, IdRef},
+        view::CursorState,
         view::{self, new_view},
         window_delegate::new_delegate,
         OsError,
@@ -90,8 +91,8 @@ fn create_app(activation_policy: ActivationPolicy) -> Option<id> {
 unsafe fn create_view(
     ns_window: id,
     pl_attribs: &PlatformSpecificWindowBuilderAttributes,
-) -> Option<(IdRef, Weak<Mutex<util::Cursor>>)> {
-    let (ns_view, cursor) = new_view(ns_window);
+) -> Option<(IdRef, Weak<Mutex<CursorState>>)> {
+    let (ns_view, cursor_state) = new_view(ns_window);
     ns_view.non_nil().map(|ns_view| {
         if !pl_attribs.disallow_hidpi {
             ns_view.setWantsBestResolutionOpenGLSurface_(YES);
@@ -108,7 +109,7 @@ unsafe fn create_view(
 
         ns_window.setContentView_(*ns_view);
         ns_window.makeFirstResponder_(*ns_view);
-        (ns_view, cursor)
+        (ns_view, cursor_state)
     })
 }
 
@@ -243,6 +244,13 @@ lazy_static! {
 pub struct SharedState {
     pub resizable: bool,
     pub fullscreen: Option<Fullscreen>,
+    // This is true between windowWillEnterFullScreen and windowDidEnterFullScreen
+    // or windowWillExitFullScreen and windowDidExitFullScreen.
+    // We must not toggle fullscreen when this is true.
+    pub in_fullscreen_transition: bool,
+    // If it is attempted to toggle fullscreen when in_fullscreen_transition is true,
+    // Set target_fullscreen and do after fullscreen transition is end.
+    pub target_fullscreen: Option<Option<Fullscreen>>,
     pub maximized: bool,
     pub standard_frame: Option<NSRect>,
     is_simple_fullscreen: bool,
@@ -283,8 +291,7 @@ pub struct UnownedWindow {
     input_context: IdRef, // never changes
     pub shared_state: Arc<Mutex<SharedState>>,
     decorations: AtomicBool,
-    cursor: Weak<Mutex<util::Cursor>>,
-    cursor_visible: AtomicBool,
+    cursor_state: Weak<Mutex<CursorState>>,
 }
 
 unsafe impl Send for UnownedWindow {}
@@ -313,7 +320,7 @@ impl UnownedWindow {
             os_error!(OsError::CreationError("Couldn't create `NSWindow`"))
         })?;
 
-        let (ns_view, cursor) =
+        let (ns_view, cursor_state) =
             unsafe { create_view(*ns_window, &pl_attribs) }.ok_or_else(|| {
                 unsafe { pool.drain() };
                 os_error!(OsError::CreationError("Couldn't create `NSView`"))
@@ -361,8 +368,7 @@ impl UnownedWindow {
             input_context,
             shared_state: Arc::new(Mutex::new(win_attribs.into())),
             decorations: AtomicBool::new(decorations),
-            cursor,
-            cursor_visible: AtomicBool::new(true),
+            cursor_state,
         });
 
         let delegate = new_delegate(&window, fullscreen.is_some());
@@ -509,8 +515,8 @@ impl UnownedWindow {
 
     pub fn set_cursor_icon(&self, cursor: CursorIcon) {
         let cursor = util::Cursor::from(cursor);
-        if let Some(cursor_access) = self.cursor.upgrade() {
-            *cursor_access.lock().unwrap() = cursor;
+        if let Some(cursor_access) = self.cursor_state.upgrade() {
+            cursor_access.lock().unwrap().cursor = cursor;
         }
         unsafe {
             let _: () = msg_send![*self.ns_window,
@@ -528,16 +534,17 @@ impl UnownedWindow {
 
     #[inline]
     pub fn set_cursor_visible(&self, visible: bool) {
-        let cursor_class = class!(NSCursor);
-        // macOS uses a "hide counter" like Windows does, so we avoid incrementing it more than once.
-        // (otherwise, `hide_cursor(false)` would need to be called n times!)
-        if visible != self.cursor_visible.load(Ordering::Acquire) {
-            if visible {
-                let _: () = unsafe { msg_send![cursor_class, unhide] };
-            } else {
-                let _: () = unsafe { msg_send![cursor_class, hide] };
+        if let Some(cursor_access) = self.cursor_state.upgrade() {
+            let mut cursor_state = cursor_access.lock().unwrap();
+            if visible != cursor_state.visible {
+                cursor_state.visible = visible;
+                drop(cursor_state);
+                unsafe {
+                    let _: () = msg_send![*self.ns_window,
+                        invalidateCursorRectsForView:*self.ns_view
+                    ];
+                }
             }
-            self.cursor_visible.store(visible, Ordering::Release);
         }
     }
 
@@ -617,6 +624,25 @@ impl UnownedWindow {
         self.set_maximized(maximized);
     }
 
+    #[inline]
+    pub fn set_minimized(&self, minimized: bool) {
+        let is_minimized: BOOL = unsafe { msg_send![*self.ns_window, isMiniaturized] };
+        let is_minimized: bool = is_minimized == YES;
+        if is_minimized == minimized {
+            return;
+        }
+
+        if minimized {
+            unsafe {
+                NSWindow::miniaturize_(*self.ns_window, *self.ns_window);
+            }
+        } else {
+            unsafe {
+                NSWindow::deminiaturize_(*self.ns_window, *self.ns_window);
+            }
+        }
+    }
+
     #[inline]
     pub fn set_maximized(&self, maximized: bool) {
         let is_zoomed = self.is_zoomed();
@@ -642,11 +668,18 @@ impl UnownedWindow {
     #[inline]
     pub fn set_fullscreen(&self, fullscreen: Option<Fullscreen>) {
         trace!("Locked shared state in `set_fullscreen`");
-        let shared_state_lock = self.shared_state.lock().unwrap();
+        let mut shared_state_lock = self.shared_state.lock().unwrap();
         if shared_state_lock.is_simple_fullscreen {
             trace!("Unlocked shared state in `set_fullscreen`");
             return;
         }
+        if shared_state_lock.in_fullscreen_transition {
+            // We can't set fullscreen here.
+            // Set fullscreen after transition.
+            shared_state_lock.target_fullscreen = Some(fullscreen);
+            trace!("Unlocked shared state in `set_fullscreen`");
+            return;
+        }
         let old_fullscreen = shared_state_lock.fullscreen.clone();
         if fullscreen == old_fullscreen {
             trace!("Unlocked shared state in `set_fullscreen`");

src/platform_impl/macos/window_delegate.rs

@@ -195,6 +195,10 @@ lazy_static! {
             sel!(windowDidExitFullScreen:),
             window_did_exit_fullscreen as extern "C" fn(&Object, Sel, id),
         );
+        decl.add_method(
+            sel!(windowWillExitFullScreen:),
+            window_will_exit_fullscreen as extern "C" fn(&Object, Sel, id),
+        );
         decl.add_method(
             sel!(windowDidFailToEnterFullScreen:),
             window_did_fail_to_enter_fullscreen as extern "C" fn(&Object, Sel, id),
@@ -419,13 +423,27 @@ extern "C" fn window_will_enter_fullscreen(this: &Object, _: Sel, _: id) {
                     shared_state.fullscreen = Some(Fullscreen::Borderless(window.current_monitor()))
                 }
             }
-
+            shared_state.in_fullscreen_transition = true;
             trace!("Unlocked shared state in `window_will_enter_fullscreen`");
         })
     });
     trace!("Completed `windowWillEnterFullscreen:`");
 }
 
+/// Invoked when before exit fullscreen
+extern "C" fn window_will_exit_fullscreen(this: &Object, _: Sel, _: id) {
+    trace!("Triggered `windowWillExitFullScreen:`");
+    with_state(this, |state| {
+        state.with_window(|window| {
+            trace!("Locked shared state in `window_will_exit_fullscreen`");
+            let mut shared_state = window.shared_state.lock().unwrap();
+            shared_state.in_fullscreen_transition = true;
+            trace!("Unlocked shared state in `window_will_exit_fullscreen`");
+        });
+    });
+    trace!("Completed `windowWillExitFullScreen:`");
+}
+
 extern "C" fn window_will_use_fullscreen_presentation_options(
     _this: &Object,
     _: Sel,
@@ -451,6 +469,17 @@ extern "C" fn window_did_enter_fullscreen(this: &Object, _: Sel, _: id) {
     trace!("Triggered `windowDidEnterFullscreen:`");
     with_state(this, |state| {
         state.initial_fullscreen = false;
+        state.with_window(|window| {
+            trace!("Locked shared state in `window_did_enter_fullscreen`");
+            let mut shared_state = window.shared_state.lock().unwrap();
+            shared_state.in_fullscreen_transition = false;
+            let target_fullscreen = shared_state.target_fullscreen.take();
+            trace!("Unlocked shared state in `window_did_enter_fullscreen`");
+            drop(shared_state);
+            if let Some(target_fullscreen) = target_fullscreen {
+                window.set_fullscreen(target_fullscreen);
+            }
+        });
     });
     trace!("Completed `windowDidEnterFullscreen:`");
 }
@@ -461,6 +490,15 @@ extern "C" fn window_did_exit_fullscreen(this: &Object, _: Sel, _: id) {
     with_state(this, |state| {
         state.with_window(|window| {
             window.restore_state_from_fullscreen();
+            trace!("Locked shared state in `window_did_exit_fullscreen`");
+            let mut shared_state = window.shared_state.lock().unwrap();
+            shared_state.in_fullscreen_transition = false;
+            let target_fullscreen = shared_state.target_fullscreen.take();
+            trace!("Unlocked shared state in `window_did_exit_fullscreen`");
+            drop(shared_state);
+            if let Some(target_fullscreen) = target_fullscreen {
+                window.set_fullscreen(target_fullscreen);
+            }
         })
     });
     trace!("Completed `windowDidExitFullscreen:`");
@@ -485,6 +523,13 @@ extern "C" fn window_did_exit_fullscreen(this: &Object, _: Sel, _: id) {
 extern "C" fn window_did_fail_to_enter_fullscreen(this: &Object, _: Sel, _: id) {
     trace!("Triggered `windowDidFailToEnterFullscreen:`");
     with_state(this, |state| {
+        state.with_window(|window| {
+            trace!("Locked shared state in `window_did_fail_to_enter_fullscreen`");
+            let mut shared_state = window.shared_state.lock().unwrap();
+            shared_state.in_fullscreen_transition = false;
+            shared_state.target_fullscreen = None;
+            trace!("Unlocked shared state in `window_did_fail_to_enter_fullscreen`");
+        });
         if state.initial_fullscreen {
             let _: () = unsafe {
                 msg_send![*state.ns_window,

src/platform_impl/web/event_loop/proxy.rs

@@ -11,7 +11,7 @@ impl<T: 'static> Proxy<T> {
         Proxy { runner }
     }
 
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
         self.runner.send_event(Event::UserEvent(event));
         Ok(())
     }

src/platform_impl/web/event_loop/runner.rs

@@ -1,5 +1,5 @@
 use super::{backend, state::State};
-use crate::event::{Event, StartCause, WindowEvent};
+use crate::event::{Event, StartCause};
 use crate::event_loop as root;
 use crate::window::WindowId;
 
@@ -127,18 +127,15 @@ impl<T: 'static> Shared<T> {
         if !event_is_start {
             self.handle_event(event, &mut control);
         }
+        self.handle_event(Event::MainEventsCleared, &mut control);
+
         // Collect all of the redraw events to avoid double-locking the RefCell
         let redraw_events: Vec<WindowId> = self.0.redraw_pending.borrow_mut().drain().collect();
         for window_id in redraw_events {
-            self.handle_event(
-                Event::WindowEvent {
-                    window_id,
-                    event: WindowEvent::RedrawRequested,
-                },
-                &mut control,
-            );
+            self.handle_event(Event::RedrawRequested(window_id), &mut control);
         }
-        self.handle_event(Event::EventsCleared, &mut control);
+        self.handle_event(Event::RedrawEventsCleared, &mut control);
+
         self.apply_control_flow(control);
         // If the event loop is closed, it has been closed this iteration and now the closing
         // event should be emitted

src/platform_impl/web/event_loop/window_target.rs

@@ -67,6 +67,7 @@ impl<T> WindowTarget<T> {
                         virtual_keycode,
                         modifiers,
                     },
+                    is_synthetic: false,
                 },
             });
         });
@@ -83,6 +84,7 @@ impl<T> WindowTarget<T> {
                         virtual_keycode,
                         modifiers,
                     },
+                    is_synthetic: false,
                 },
             });
         });

src/platform_impl/web/mod.rs

@@ -16,6 +16,9 @@ mod backend;
 #[path = "stdweb/mod.rs"]
 mod backend;
 
+#[cfg(not(any(feature = "web-sys", feature = "stdweb")))]
+compile_error!("Please select a feature to build for web: `web-sys`, `stdweb`");
+
 pub use self::device::Id as DeviceId;
 pub use self::error::OsError;
 pub use self::event_loop::{

src/platform_impl/web/stdweb/event.rs

@@ -15,12 +15,12 @@ pub fn mouse_button(event: &impl IMouseEvent) -> MouseButton {
 }
 
 pub fn mouse_modifiers(event: &impl IMouseEvent) -> ModifiersState {
-    ModifiersState {
-        shift: event.shift_key(),
-        ctrl: event.ctrl_key(),
-        alt: event.alt_key(),
-        logo: event.meta_key(),
-    }
+    let mut m = ModifiersState::empty();
+    m.set(ModifiersState::SHIFT, event.shift_key());
+    m.set(ModifiersState::CTRL, event.ctrl_key());
+    m.set(ModifiersState::ALT, event.alt_key());
+    m.set(ModifiersState::LOGO, event.meta_key());
+    m
 }
 
 pub fn mouse_position(event: &impl IMouseEvent) -> LogicalPosition {
@@ -213,12 +213,12 @@ pub fn virtual_key_code(event: &impl IKeyboardEvent) -> Option<VirtualKeyCode> {
 }
 
 pub fn keyboard_modifiers(event: &impl IKeyboardEvent) -> ModifiersState {
-    ModifiersState {
-        shift: event.shift_key(),
-        ctrl: event.ctrl_key(),
-        alt: event.alt_key(),
-        logo: event.meta_key(),
-    }
+    let mut m = ModifiersState::empty();
+    m.set(ModifiersState::SHIFT, event.shift_key());
+    m.set(ModifiersState::CTRL, event.ctrl_key());
+    m.set(ModifiersState::ALT, event.alt_key());
+    m.set(ModifiersState::LOGO, event.meta_key());
+    m
 }
 
 pub fn codepoint(event: &impl IKeyboardEvent) -> char {

src/platform_impl/web/stdweb/timeout.rs

@@ -3,7 +3,7 @@ use stdweb::web::{window, IWindowOrWorker, TimeoutHandle};
 
 #[derive(Debug)]
 pub struct Timeout {
-    handle: TimeoutHandle,
+    handle: Option<TimeoutHandle>,
 }
 
 impl Timeout {
@@ -12,14 +12,14 @@ impl Timeout {
         F: 'static + FnMut(),
     {
         Timeout {
-            handle: window().set_clearable_timeout(f, duration.as_millis() as u32),
+            handle: Some(window().set_clearable_timeout(f, duration.as_millis() as u32)),
         }
     }
 }
 
 impl Drop for Timeout {
     fn drop(&mut self) {
-        let handle = std::mem::replace(&mut self.handle, unsafe { std::mem::uninitialized() });
+        let handle = self.handle.take().unwrap();
         handle.clear();
     }
 }

src/platform_impl/web/web_sys/event.rs

@@ -14,12 +14,12 @@ pub fn mouse_button(event: &MouseEvent) -> MouseButton {
 }
 
 pub fn mouse_modifiers(event: &MouseEvent) -> ModifiersState {
-    ModifiersState {
-        shift: event.shift_key(),
-        ctrl: event.ctrl_key(),
-        alt: event.alt_key(),
-        logo: event.meta_key(),
-    }
+    let mut m = ModifiersState::empty();
+    m.set(ModifiersState::SHIFT, event.shift_key());
+    m.set(ModifiersState::CTRL, event.ctrl_key());
+    m.set(ModifiersState::ALT, event.alt_key());
+    m.set(ModifiersState::LOGO, event.meta_key());
+    m
 }
 
 pub fn mouse_position(event: &MouseEvent) -> LogicalPosition {
@@ -211,12 +211,12 @@ pub fn virtual_key_code(event: &KeyboardEvent) -> Option<VirtualKeyCode> {
 }
 
 pub fn keyboard_modifiers(event: &KeyboardEvent) -> ModifiersState {
-    ModifiersState {
-        shift: event.shift_key(),
-        ctrl: event.ctrl_key(),
-        alt: event.alt_key(),
-        logo: event.meta_key(),
-    }
+    let mut m = ModifiersState::empty();
+    m.set(ModifiersState::SHIFT, event.shift_key());
+    m.set(ModifiersState::CTRL, event.ctrl_key());
+    m.set(ModifiersState::ALT, event.alt_key());
+    m.set(ModifiersState::LOGO, event.meta_key());
+    m
 }
 
 pub fn codepoint(event: &KeyboardEvent) -> char {

src/platform_impl/web/window.rs

@@ -199,6 +199,11 @@ impl Window {
         }
     }
 
+    #[inline]
+    pub fn set_minimized(&self, _minimized: bool) {
+        // Intentionally a no-op, as canvases cannot be 'minimized'
+    }
+
     #[inline]
     pub fn set_maximized(&self, _maximized: bool) {
         // Intentionally a no-op, as canvases cannot be 'maximized'

src/platform_impl/windows/dark_mode.rs

@@ -0,0 +1,216 @@
+/// This is a simple implementation of support for Windows Dark Mode,
+/// which is inspired by the solution in https://github.com/ysc3839/win32-darkmode
+use std::ffi::OsStr;
+use std::os::windows::ffi::OsStrExt;
+
+use winapi::{
+    shared::{
+        basetsd::SIZE_T,
+        minwindef::{BOOL, DWORD, UINT, ULONG, WORD},
+        ntdef::{LPSTR, NTSTATUS, NT_SUCCESS, PVOID, WCHAR},
+        windef::HWND,
+    },
+    um::{libloaderapi, uxtheme, winuser},
+};
+
+lazy_static! {
+    static ref WIN10_BUILD_VERSION: Option<DWORD> = {
+        // FIXME: RtlGetVersion is a documented windows API,
+        // should be part of winapi!
+
+        #[allow(non_snake_case)]
+        #[repr(C)]
+        struct OSVERSIONINFOW {
+            dwOSVersionInfoSize: ULONG,
+            dwMajorVersion: ULONG,
+            dwMinorVersion: ULONG,
+            dwBuildNumber: ULONG,
+            dwPlatformId: ULONG,
+            szCSDVersion: [WCHAR; 128],
+        }
+
+        type RtlGetVersion = unsafe extern "system" fn (*mut OSVERSIONINFOW) -> NTSTATUS;
+        let handle = get_function!("ntdll.dll", RtlGetVersion);
+
+        if let Some(rtl_get_version) = handle {
+            unsafe {
+                let mut vi = OSVERSIONINFOW {
+                    dwOSVersionInfoSize: 0,
+                    dwMajorVersion: 0,
+                    dwMinorVersion: 0,
+                    dwBuildNumber: 0,
+                    dwPlatformId: 0,
+                    szCSDVersion: [0; 128],
+                };
+
+                let status = (rtl_get_version)(&mut vi as _);
+                assert!(NT_SUCCESS(status));
+
+                if vi.dwMajorVersion == 10 && vi.dwMinorVersion == 0 {
+                    Some(vi.dwBuildNumber)
+                } else {
+                    None
+                }
+            }
+        } else {
+            None
+        }
+    };
+
+    static ref DARK_MODE_SUPPORTED: bool = {
+        // We won't try to do anything for windows versions < 17763
+        // (Windows 10 October 2018 update)
+        match *WIN10_BUILD_VERSION {
+            Some(v) => v >= 17763,
+            None => false
+        }
+    };
+
+    static ref DARK_THEME_NAME: Vec<u16> = widestring("DarkMode_Explorer");
+    static ref LIGHT_THEME_NAME: Vec<u16> = widestring("");
+}
+
+/// Attempt to set dark mode on a window, if necessary.
+/// Returns true if dark mode was set, false if not.
+pub fn try_dark_mode(hwnd: HWND) -> bool {
+    if *DARK_MODE_SUPPORTED {
+        let is_dark_mode = should_use_dark_mode();
+
+        let theme_name = if is_dark_mode {
+            DARK_THEME_NAME.as_ptr()
+        } else {
+            LIGHT_THEME_NAME.as_ptr()
+        };
+
+        unsafe {
+            assert_eq!(
+                0,
+                uxtheme::SetWindowTheme(hwnd, theme_name as _, std::ptr::null())
+            );
+
+            set_dark_mode_for_window(hwnd, is_dark_mode)
+        }
+
+        is_dark_mode
+    } else {
+        false
+    }
+}
+
+fn set_dark_mode_for_window(hwnd: HWND, is_dark_mode: bool) {
+    // Uses Windows undocumented API SetWindowCompositionAttribute,
+    // as seen in win32-darkmode example linked at top of file.
+
+    type SetWindowCompositionAttribute =
+        unsafe extern "system" fn(HWND, *mut WINDOWCOMPOSITIONATTRIBDATA) -> BOOL;
+
+    #[allow(non_snake_case)]
+    type WINDOWCOMPOSITIONATTRIB = u32;
+    const WCA_USEDARKMODECOLORS: WINDOWCOMPOSITIONATTRIB = 26;
+
+    #[allow(non_snake_case)]
+    #[repr(C)]
+    struct WINDOWCOMPOSITIONATTRIBDATA {
+        Attrib: WINDOWCOMPOSITIONATTRIB,
+        pvData: PVOID,
+        cbData: SIZE_T,
+    }
+
+    lazy_static! {
+        static ref SET_WINDOW_COMPOSITION_ATTRIBUTE: Option<SetWindowCompositionAttribute> =
+            get_function!("user32.dll", SetWindowCompositionAttribute);
+    }
+
+    if let Some(set_window_composition_attribute) = *SET_WINDOW_COMPOSITION_ATTRIBUTE {
+        unsafe {
+            // SetWindowCompositionAttribute needs a bigbool (i32), not bool.
+            let mut is_dark_mode_bigbool = is_dark_mode as BOOL;
+
+            let mut data = WINDOWCOMPOSITIONATTRIBDATA {
+                Attrib: WCA_USEDARKMODECOLORS,
+                pvData: &mut is_dark_mode_bigbool as *mut _ as _,
+                cbData: std::mem::size_of_val(&is_dark_mode_bigbool) as _,
+            };
+
+            assert_eq!(
+                1,
+                set_window_composition_attribute(hwnd, &mut data as *mut _)
+            );
+        }
+    }
+}
+
+fn should_use_dark_mode() -> bool {
+    should_apps_use_dark_mode() && !is_high_contrast()
+}
+
+fn should_apps_use_dark_mode() -> bool {
+    type ShouldAppsUseDarkMode = unsafe extern "system" fn() -> bool;
+    lazy_static! {
+        static ref SHOULD_APPS_USE_DARK_MODE: Option<ShouldAppsUseDarkMode> = {
+            unsafe {
+                const UXTHEME_SHOULDAPPSUSEDARKMODE_ORDINAL: WORD = 132;
+
+                let module = libloaderapi::LoadLibraryA("uxtheme.dll\0".as_ptr() as _);
+
+                if module.is_null() {
+                    return None;
+                }
+
+                let handle = libloaderapi::GetProcAddress(
+                    module,
+                    winuser::MAKEINTRESOURCEA(UXTHEME_SHOULDAPPSUSEDARKMODE_ORDINAL),
+                );
+
+                if handle.is_null() {
+                    None
+                } else {
+                    Some(std::mem::transmute(handle))
+                }
+            }
+        };
+    }
+
+    SHOULD_APPS_USE_DARK_MODE
+        .map(|should_apps_use_dark_mode| unsafe { (should_apps_use_dark_mode)() })
+        .unwrap_or(false)
+}
+
+// FIXME: This definition was missing from winapi. Can remove from
+// here and use winapi once the following PR is released:
+// https://github.com/retep998/winapi-rs/pull/815
+#[repr(C)]
+#[allow(non_snake_case)]
+struct HIGHCONTRASTA {
+    cbSize: UINT,
+    dwFlags: DWORD,
+    lpszDefaultScheme: LPSTR,
+}
+
+const HCF_HIGHCONTRASTON: DWORD = 1;
+
+fn is_high_contrast() -> bool {
+    let mut hc = HIGHCONTRASTA {
+        cbSize: 0,
+        dwFlags: 0,
+        lpszDefaultScheme: std::ptr::null_mut(),
+    };
+
+    let ok = unsafe {
+        winuser::SystemParametersInfoA(
+            winuser::SPI_GETHIGHCONTRAST,
+            std::mem::size_of_val(&hc) as _,
+            &mut hc as *mut _ as _,
+            0,
+        )
+    };
+
+    (ok > 0) && ((HCF_HIGHCONTRASTON & hc.dwFlags) == 1)
+}
+
+fn widestring(src: &'static str) -> Vec<u16> {
+    OsStr::new(src)
+        .encode_wide()
+        .chain(Some(0).into_iter())
+        .collect()
+}

src/platform_impl/windows/event.rs

@@ -17,16 +17,84 @@ fn key_pressed(vkey: c_int) -> bool {
 }
 
 pub fn get_key_mods() -> ModifiersState {
-    let mut mods = ModifiersState::default();
     let filter_out_altgr = layout_uses_altgr() && key_pressed(winuser::VK_RMENU);
 
-    mods.shift = key_pressed(winuser::VK_SHIFT);
-    mods.ctrl = key_pressed(winuser::VK_CONTROL) && !filter_out_altgr;
-    mods.alt = key_pressed(winuser::VK_MENU) && !filter_out_altgr;
-    mods.logo = key_pressed(winuser::VK_LWIN) || key_pressed(winuser::VK_RWIN);
+    let mut mods = ModifiersState::empty();
+    mods.set(ModifiersState::SHIFT, key_pressed(winuser::VK_SHIFT));
+    mods.set(
+        ModifiersState::CTRL,
+        key_pressed(winuser::VK_CONTROL) && !filter_out_altgr,
+    );
+    mods.set(
+        ModifiersState::ALT,
+        key_pressed(winuser::VK_MENU) && !filter_out_altgr,
+    );
+    mods.set(
+        ModifiersState::LOGO,
+        key_pressed(winuser::VK_LWIN) || key_pressed(winuser::VK_RWIN),
+    );
     mods
 }
 
+bitflags! {
+    #[derive(Default)]
+    pub struct ModifiersStateSide: u32 {
+        const LSHIFT = 0b010 << 0;
+        const RSHIFT = 0b001 << 0;
+
+        const LCTRL = 0b010 << 3;
+        const RCTRL = 0b001 << 3;
+
+        const LALT = 0b010 << 6;
+        const RALT = 0b001 << 6;
+
+        const LLOGO = 0b010 << 9;
+        const RLOGO = 0b001 << 9;
+    }
+}
+
+impl ModifiersStateSide {
+    pub fn filter_out_altgr(&self) -> ModifiersStateSide {
+        match layout_uses_altgr() && self.contains(Self::RALT) {
+            false => *self,
+            true => *self & !(Self::LCTRL | Self::RCTRL | Self::LALT | Self::RALT),
+        }
+    }
+}
+
+impl From<ModifiersStateSide> for ModifiersState {
+    fn from(side: ModifiersStateSide) -> Self {
+        let mut state = ModifiersState::default();
+        state.set(
+            Self::SHIFT,
+            side.intersects(ModifiersStateSide::LSHIFT | ModifiersStateSide::RSHIFT),
+        );
+        state.set(
+            Self::CTRL,
+            side.intersects(ModifiersStateSide::LCTRL | ModifiersStateSide::RCTRL),
+        );
+        state.set(
+            Self::ALT,
+            side.intersects(ModifiersStateSide::LALT | ModifiersStateSide::RALT),
+        );
+        state.set(
+            Self::LOGO,
+            side.intersects(ModifiersStateSide::LLOGO | ModifiersStateSide::RLOGO),
+        );
+        state
+    }
+}
+
+pub fn get_pressed_keys() -> impl Iterator<Item = c_int> {
+    let mut keyboard_state = vec![0u8; 256];
+    unsafe { winuser::GetKeyboardState(keyboard_state.as_mut_ptr()) };
+    keyboard_state
+        .into_iter()
+        .enumerate()
+        .filter(|(_, p)| (*p & (1 << 7)) != 0) // whether or not a key is pressed is communicated via the high-order bit
+        .map(|(i, _)| i as c_int)
+}
+
 unsafe fn get_char(keyboard_state: &[u8; 256], v_key: u32, hkl: HKL) -> Option<char> {
     let mut unicode_bytes = [0u16; 5];
     let len = winuser::ToUnicodeEx(
@@ -39,7 +107,7 @@ unsafe fn get_char(keyboard_state: &[u8; 256], v_key: u32, hkl: HKL) -> Option<c
         hkl,
     );
     if len >= 1 {
-        char::decode_utf16(unicode_bytes.into_iter().cloned())
+        char::decode_utf16(unicode_bytes.iter().cloned())
             .next()
             .and_then(|c| c.ok())
     } else {
@@ -177,8 +245,8 @@ pub fn vkey_to_winit_vkey(vkey: c_int) -> Option<VirtualKeyCode> {
         0x58 => Some(VirtualKeyCode::X),
         0x59 => Some(VirtualKeyCode::Y),
         0x5A => Some(VirtualKeyCode::Z),
-        //winuser::VK_LWIN => Some(VirtualKeyCode::Lwin),
-        //winuser::VK_RWIN => Some(VirtualKeyCode::Rwin),
+        winuser::VK_LWIN => Some(VirtualKeyCode::LWin),
+        winuser::VK_RWIN => Some(VirtualKeyCode::RWin),
         winuser::VK_APPS => Some(VirtualKeyCode::Apps),
         winuser::VK_SLEEP => Some(VirtualKeyCode::Sleep),
         winuser::VK_NUMPAD0 => Some(VirtualKeyCode::Numpad0),

src/platform_impl/windows/event_loop/runner.rs

@@ -0,0 +1,411 @@
+use std::{any::Any, cell::RefCell, collections::VecDeque, mem, panic, ptr, rc::Rc, time::Instant};
+
+use winapi::{shared::windef::HWND, um::winuser};
+
+use crate::{
+    event::{Event, StartCause},
+    event_loop::ControlFlow,
+    platform_impl::platform::event_loop::EventLoop,
+    window::WindowId,
+};
+
+pub(crate) type EventLoopRunnerShared<T> = Rc<ELRShared<T>>;
+pub(crate) struct ELRShared<T> {
+    runner: RefCell<Option<EventLoopRunner<T>>>,
+    buffer: RefCell<VecDeque<Event<T>>>,
+    redraw_buffer: Rc<RefCell<VecDeque<WindowId>>>,
+}
+struct EventLoopRunner<T> {
+    control_flow: ControlFlow,
+    runner_state: RunnerState,
+    modal_redraw_window: HWND,
+    in_modal_loop: bool,
+    event_handler: Box<dyn FnMut(Event<T>, &mut ControlFlow)>,
+    panic_error: Option<PanicError>,
+    redraw_buffer: Rc<RefCell<VecDeque<WindowId>>>,
+}
+pub type PanicError = Box<dyn Any + Send + 'static>;
+
+impl<T> ELRShared<T> {
+    pub(crate) fn new() -> ELRShared<T> {
+        ELRShared {
+            runner: RefCell::new(None),
+            buffer: RefCell::new(VecDeque::new()),
+            redraw_buffer: Default::default(),
+        }
+    }
+
+    pub(crate) unsafe fn set_runner<F>(&self, event_loop: &EventLoop<T>, f: F)
+    where
+        F: FnMut(Event<T>, &mut ControlFlow),
+    {
+        let mut runner = EventLoopRunner::new(event_loop, self.redraw_buffer.clone(), f);
+        {
+            let mut runner_ref = self.runner.borrow_mut();
+            loop {
+                let event = self.buffer.borrow_mut().pop_front();
+                match event {
+                    Some(e) => {
+                        runner.process_event(e);
+                    }
+                    None => break,
+                }
+            }
+            *runner_ref = Some(runner);
+        }
+    }
+
+    pub(crate) fn destroy_runner(&self) {
+        *self.runner.borrow_mut() = None;
+    }
+
+    pub(crate) fn new_events(&self) {
+        let mut runner_ref = self.runner.borrow_mut();
+        if let Some(ref mut runner) = *runner_ref {
+            runner.new_events();
+        }
+    }
+
+    pub(crate) unsafe fn send_event(&self, event: Event<T>) {
+        if let Ok(mut runner_ref) = self.runner.try_borrow_mut() {
+            if let Some(ref mut runner) = *runner_ref {
+                runner.process_event(event);
+
+                // Dispatch any events that were buffered during the call to `process_event`.
+                loop {
+                    // We do this instead of using a `while let` loop because if we use a `while let`
+                    // loop the reference returned `borrow_mut()` doesn't get dropped until the end
+                    // of the loop's body and attempts to add events to the event buffer while in
+                    // `process_event` will fail.
+                    let buffered_event_opt = self.buffer.borrow_mut().pop_front();
+                    match buffered_event_opt {
+                        Some(event) => runner.process_event(event),
+                        None => break,
+                    }
+                }
+
+                return;
+            }
+        }
+
+        // If the runner is already borrowed, we're in the middle of an event loop invocation. Add
+        // the event to a buffer to be processed later.
+        self.buffer_event(event);
+    }
+
+    pub(crate) unsafe fn call_event_handler(&self, event: Event<T>) {
+        if let Ok(mut runner_ref) = self.runner.try_borrow_mut() {
+            if let Some(ref mut runner) = *runner_ref {
+                runner.call_event_handler(event);
+                return;
+            }
+        }
+    }
+
+    pub(crate) fn events_cleared(&self) {
+        let mut runner_ref = self.runner.borrow_mut();
+        if let Some(ref mut runner) = *runner_ref {
+            runner.events_cleared();
+        }
+    }
+
+    pub(crate) fn take_panic_error(&self) -> Result<(), PanicError> {
+        let mut runner_ref = self.runner.borrow_mut();
+        if let Some(ref mut runner) = *runner_ref {
+            runner.take_panic_error()
+        } else {
+            Ok(())
+        }
+    }
+
+    pub(crate) fn set_modal_loop(&self, in_modal_loop: bool) {
+        let mut runner_ref = self.runner.borrow_mut();
+        if let Some(ref mut runner) = *runner_ref {
+            runner.in_modal_loop = in_modal_loop;
+        }
+    }
+
+    pub(crate) fn in_modal_loop(&self) -> bool {
+        let runner = self.runner.borrow();
+        if let Some(ref runner) = *runner {
+            runner.in_modal_loop
+        } else {
+            false
+        }
+    }
+
+    pub fn control_flow(&self) -> ControlFlow {
+        let runner_ref = self.runner.borrow();
+        if let Some(ref runner) = *runner_ref {
+            runner.control_flow
+        } else {
+            ControlFlow::Exit
+        }
+    }
+
+    fn buffer_event(&self, event: Event<T>) {
+        match event {
+            Event::RedrawRequested(window_id) => {
+                self.redraw_buffer.borrow_mut().push_back(window_id)
+            }
+            _ => self.buffer.borrow_mut().push_back(event),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum RunnerState {
+    /// The event loop has just been created, and an `Init` event must be sent.
+    New,
+    /// The event loop is idling, and began idling at the given instant.
+    Idle(Instant),
+    /// The event loop has received a signal from the OS that the loop may resume, but no winit
+    /// events have been generated yet. We're waiting for an event to be processed or the events
+    /// to be marked as cleared to send `NewEvents`, depending on the current `ControlFlow`.
+    DeferredNewEvents(Instant),
+    /// The event loop is handling the OS's events and sending them to the user's callback.
+    /// `NewEvents` has been sent, and `EventsCleared` hasn't.
+    HandlingEvents,
+    HandlingRedraw,
+}
+
+impl<T> EventLoopRunner<T> {
+    unsafe fn new<F>(
+        event_loop: &EventLoop<T>,
+        redraw_buffer: Rc<RefCell<VecDeque<WindowId>>>,
+        f: F,
+    ) -> EventLoopRunner<T>
+    where
+        F: FnMut(Event<T>, &mut ControlFlow),
+    {
+        EventLoopRunner {
+            control_flow: ControlFlow::default(),
+            runner_state: RunnerState::New,
+            in_modal_loop: false,
+            modal_redraw_window: event_loop.window_target.p.thread_msg_target,
+            event_handler: mem::transmute::<
+                Box<dyn FnMut(Event<T>, &mut ControlFlow)>,
+                Box<dyn FnMut(Event<T>, &mut ControlFlow)>,
+            >(Box::new(f)),
+            panic_error: None,
+            redraw_buffer,
+        }
+    }
+
+    fn take_panic_error(&mut self) -> Result<(), PanicError> {
+        match self.panic_error.take() {
+            Some(err) => Err(err),
+            None => Ok(()),
+        }
+    }
+
+    fn new_events(&mut self) {
+        self.runner_state = match self.runner_state {
+            // If we're already handling events or have deferred `NewEvents`, we don't need to do
+            // do any processing.
+            RunnerState::HandlingEvents
+            | RunnerState::HandlingRedraw
+            | RunnerState::DeferredNewEvents(..) => self.runner_state,
+
+            // Send the `Init` `NewEvents` and immediately move into event processing.
+            RunnerState::New => {
+                self.call_event_handler(Event::NewEvents(StartCause::Init));
+                RunnerState::HandlingEvents
+            }
+
+            // When `NewEvents` gets sent after an idle depends on the control flow...
+            RunnerState::Idle(wait_start) => {
+                match self.control_flow {
+                    // If we're polling, send `NewEvents` and immediately move into event processing.
+                    ControlFlow::Poll => {
+                        self.call_event_handler(Event::NewEvents(StartCause::Poll));
+                        RunnerState::HandlingEvents
+                    },
+                    // If the user was waiting until a specific time, the `NewEvents` call gets sent
+                    // at varying times depending on the current time.
+                    ControlFlow::WaitUntil(resume_time) => {
+                        match Instant::now() >= resume_time {
+                            // If the current time is later than the requested resume time, we can tell the
+                            // user that the resume time has been reached with `NewEvents` and immdiately move
+                            // into event processing.
+                            true => {
+                                self.call_event_handler(Event::NewEvents(StartCause::ResumeTimeReached {
+                                    start: wait_start,
+                                    requested_resume: resume_time,
+                                }));
+                                RunnerState::HandlingEvents
+                            },
+                            // However, if the current time is EARLIER than the requested resume time, we
+                            // don't want to send the `WaitCancelled` event until we know an event is being
+                            // sent. Defer.
+                            false => RunnerState::DeferredNewEvents(wait_start)
+                        }
+                    },
+                    // If we're waiting, `NewEvents` doesn't get sent until winit gets an event, so
+                    // we defer.
+                    ControlFlow::Wait |
+                    // `Exit` shouldn't really ever get sent here, but if it does do something somewhat sane.
+                    ControlFlow::Exit => RunnerState::DeferredNewEvents(wait_start),
+                }
+            }
+        };
+    }
+
+    fn process_event(&mut self, event: Event<T>) {
+        // If we're in the modal loop, we need to have some mechanism for finding when the event
+        // queue has been cleared so we can call `events_cleared`. Windows doesn't give any utilities
+        // for doing this, but it DOES guarantee that WM_PAINT will only occur after input events have
+        // been processed. So, we send WM_PAINT to a dummy window which calls `events_cleared` when
+        // the events queue has been emptied.
+        if self.in_modal_loop {
+            unsafe {
+                winuser::RedrawWindow(
+                    self.modal_redraw_window,
+                    ptr::null(),
+                    ptr::null_mut(),
+                    winuser::RDW_INTERNALPAINT,
+                );
+            }
+        }
+
+        // If new event processing has to be done (i.e. call NewEvents or defer), do it. If we're
+        // already in processing nothing happens with this call.
+        self.new_events();
+
+        // Now that an event has been received, we have to send any `NewEvents` calls that were
+        // deferred.
+        if let RunnerState::DeferredNewEvents(wait_start) = self.runner_state {
+            match self.control_flow {
+                ControlFlow::Exit | ControlFlow::Wait => {
+                    self.call_event_handler(Event::NewEvents(StartCause::WaitCancelled {
+                        start: wait_start,
+                        requested_resume: None,
+                    }))
+                }
+                ControlFlow::WaitUntil(resume_time) => {
+                    let start_cause = match Instant::now() >= resume_time {
+                        // If the current time is later than the requested resume time, the resume time
+                        // has been reached.
+                        true => StartCause::ResumeTimeReached {
+                            start: wait_start,
+                            requested_resume: resume_time,
+                        },
+                        // Otherwise, the requested resume time HASN'T been reached and we send a WaitCancelled.
+                        false => StartCause::WaitCancelled {
+                            start: wait_start,
+                            requested_resume: Some(resume_time),
+                        },
+                    };
+                    self.call_event_handler(Event::NewEvents(start_cause));
+                }
+                // This can be reached if the control flow is changed to poll during a `RedrawRequested`
+                // that was sent after `EventsCleared`.
+                ControlFlow::Poll => self.call_event_handler(Event::NewEvents(StartCause::Poll)),
+            }
+        }
+
+        match (self.runner_state, &event) {
+            (RunnerState::HandlingRedraw, Event::RedrawRequested(_)) => {
+                self.call_event_handler(event)
+            }
+            (_, Event::RedrawRequested(_)) => {
+                self.call_event_handler(Event::MainEventsCleared);
+                self.runner_state = RunnerState::HandlingRedraw;
+                self.call_event_handler(event);
+            }
+            (RunnerState::HandlingRedraw, _) => {
+                warn!("Non-redraw event dispatched durning redraw phase");
+                self.events_cleared();
+                self.new_events();
+                self.call_event_handler(event);
+            }
+            (_, _) => {
+                self.runner_state = RunnerState::HandlingEvents;
+                self.call_event_handler(event);
+            }
+        }
+    }
+
+    fn flush_redraws(&mut self) {
+        loop {
+            let redraw_window_opt = self.redraw_buffer.borrow_mut().pop_front();
+            match redraw_window_opt {
+                Some(window_id) => self.process_event(Event::RedrawRequested(window_id)),
+                None => break,
+            }
+        }
+    }
+
+    fn events_cleared(&mut self) {
+        match self.runner_state {
+            // If we were handling events, send the EventsCleared message.
+            RunnerState::HandlingEvents => {
+                self.call_event_handler(Event::MainEventsCleared);
+                self.flush_redraws();
+                self.call_event_handler(Event::RedrawEventsCleared);
+                self.runner_state = RunnerState::Idle(Instant::now());
+            }
+
+            RunnerState::HandlingRedraw => {
+                self.call_event_handler(Event::RedrawEventsCleared);
+                self.runner_state = RunnerState::Idle(Instant::now());
+            }
+
+            // If we *weren't* handling events, we don't have to do anything.
+            RunnerState::New | RunnerState::Idle(..) => (),
+
+            // Some control flows require a NewEvents call even if no events were received. This
+            // branch handles those.
+            RunnerState::DeferredNewEvents(wait_start) => {
+                match self.control_flow {
+                    // If we had deferred a Poll, send the Poll NewEvents and EventsCleared.
+                    ControlFlow::Poll => {
+                        self.call_event_handler(Event::NewEvents(StartCause::Poll));
+                        self.call_event_handler(Event::MainEventsCleared);
+                        self.flush_redraws();
+                        self.call_event_handler(Event::RedrawEventsCleared);
+                    }
+                    // If we had deferred a WaitUntil and the resume time has since been reached,
+                    // send the resume notification and EventsCleared event.
+                    ControlFlow::WaitUntil(resume_time) => {
+                        if Instant::now() >= resume_time {
+                            self.call_event_handler(Event::NewEvents(
+                                StartCause::ResumeTimeReached {
+                                    start: wait_start,
+                                    requested_resume: resume_time,
+                                },
+                            ));
+                            self.call_event_handler(Event::MainEventsCleared);
+                            self.flush_redraws();
+                            self.call_event_handler(Event::RedrawEventsCleared);
+                        }
+                    }
+                    // If we deferred a wait and no events were received, the user doesn't have to
+                    // get an event.
+                    ControlFlow::Wait | ControlFlow::Exit => (),
+                }
+                // Mark that we've entered an idle state.
+                self.runner_state = RunnerState::Idle(wait_start)
+            }
+        }
+    }
+
+    fn call_event_handler(&mut self, event: Event<T>) {
+        if self.panic_error.is_none() {
+            let EventLoopRunner {
+                ref mut panic_error,
+                ref mut event_handler,
+                ref mut control_flow,
+                ..
+            } = self;
+            *panic_error = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+                if *control_flow != ControlFlow::Exit {
+                    (*event_handler)(event, control_flow);
+                } else {
+                    (*event_handler)(event, &mut ControlFlow::Exit);
+                }
+            }))
+            .err();
+        }
+    }
+}

src/platform_impl/windows/mod.rs

@@ -69,6 +69,7 @@ impl WindowId {
 
 #[macro_use]
 mod util;
+mod dark_mode;
 mod dpi;
 mod drop_handler;
 mod event;

src/platform_impl/windows/window.rs

@@ -34,16 +34,12 @@ use crate::{
     error::{ExternalError, NotSupportedError, OsError as RootOsError},
     monitor::MonitorHandle as RootMonitorHandle,
     platform_impl::platform::{
+        dark_mode::try_dark_mode,
         dpi::{dpi_to_scale_factor, hwnd_dpi},
         drop_handler::FileDropHandler,
-        event_loop::{
-            self, EventLoopWindowTarget, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID,
-            REQUEST_REDRAW_NO_NEWEVENTS_MSG_ID,
-        },
+        event_loop::{self, EventLoopWindowTarget, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID},
         icon::{self, IconType, WinIcon},
-        monitor,
-        raw_input::register_all_mice_and_keyboards_for_raw_input,
-        util,
+        monitor, util,
         window_state::{CursorFlags, SavedWindow, WindowFlags, WindowState},
         PlatformSpecificWindowBuilderAttributes, WindowId,
     },
@@ -129,33 +125,24 @@ impl Window {
 
     #[inline]
     pub fn set_visible(&self, visible: bool) {
-        match visible {
-            true => unsafe {
-                winuser::ShowWindow(self.window.0, winuser::SW_SHOW);
-            },
-            false => unsafe {
-                winuser::ShowWindow(self.window.0, winuser::SW_HIDE);
-            },
-        }
+        let window_state = Arc::clone(&self.window_state);
+        let window = self.window.clone();
+        self.thread_executor.execute_in_thread(move || {
+            WindowState::set_window_flags(window_state.lock(), window.0, |f| {
+                f.set(WindowFlags::VISIBLE, visible)
+            });
+        });
     }
 
     #[inline]
     pub fn request_redraw(&self) {
         unsafe {
-            if self.thread_executor.trigger_newevents_on_redraw() {
-                winuser::RedrawWindow(
-                    self.window.0,
-                    ptr::null(),
-                    ptr::null_mut(),
-                    winuser::RDW_INTERNALPAINT,
-                );
-            } else {
-                let mut window_state = self.window_state.lock();
-                if !window_state.queued_out_of_band_redraw {
-                    window_state.queued_out_of_band_redraw = true;
-                    winuser::PostMessageW(self.window.0, *REQUEST_REDRAW_NO_NEWEVENTS_MSG_ID, 0, 0);
-                }
-            }
+            winuser::RedrawWindow(
+                self.window.0,
+                ptr::null(),
+                ptr::null_mut(),
+                winuser::RDW_INTERNALPAINT,
+            );
         }
     }
 
@@ -202,7 +189,10 @@ impl Window {
                 y as c_int,
                 0,
                 0,
-                winuser::SWP_ASYNCWINDOWPOS | winuser::SWP_NOZORDER | winuser::SWP_NOSIZE,
+                winuser::SWP_ASYNCWINDOWPOS
+                    | winuser::SWP_NOZORDER
+                    | winuser::SWP_NOSIZE
+                    | winuser::SWP_NOACTIVATE,
             );
             winuser::UpdateWindow(self.window.0);
         }
@@ -449,6 +439,18 @@ impl Window {
         WindowId(self.window.0)
     }
 
+    #[inline]
+    pub fn set_minimized(&self, minimized: bool) {
+        let window = self.window.clone();
+        let window_state = Arc::clone(&self.window_state);
+
+        self.thread_executor.execute_in_thread(move || {
+            WindowState::set_window_flags(window_state.lock(), window.0, |f| {
+                f.set(WindowFlags::MINIMIZED, minimized)
+            });
+        });
+    }
+
     #[inline]
     pub fn set_maximized(&self, maximized: bool) {
         let window = self.window.clone();
@@ -615,7 +617,9 @@ impl Window {
                                 client_rect.top,
                                 client_rect.right - client_rect.left,
                                 client_rect.bottom - client_rect.top,
-                                winuser::SWP_ASYNCWINDOWPOS | winuser::SWP_NOZORDER,
+                                winuser::SWP_ASYNCWINDOWPOS
+                                    | winuser::SWP_NOZORDER
+                                    | winuser::SWP_NOACTIVATE,
                             );
                             winuser::UpdateWindow(window.0);
                         }
@@ -690,6 +694,11 @@ impl Window {
     pub fn set_ime_position(&self, _logical_spot: LogicalPosition) {
         unimplemented!();
     }
+
+    #[inline]
+    pub fn is_dark_mode(&self) -> bool {
+        self.window_state.lock().is_dark_mode
+    }
 }
 
 impl Drop for Window {
@@ -834,9 +843,6 @@ unsafe fn init<T: 'static>(
         WindowWrapper(handle)
     };
 
-    // Set up raw input
-    register_all_mice_and_keyboards_for_raw_input(real_window.0);
-
     // Register for touch events if applicable
     {
         let digitizer = winuser::GetSystemMetrics(winuser::SM_DIGITIZER) as u32;
@@ -897,8 +903,19 @@ unsafe fn init<T: 'static>(
     window_flags.set(WindowFlags::VISIBLE, attributes.visible);
     window_flags.set(WindowFlags::MAXIMIZED, attributes.maximized);
 
+    // If the system theme is dark, we need to set the window theme now
+    // before we update the window flags (and possibly show the
+    // window for the first time).
+    let dark_mode = try_dark_mode(real_window.0);
+
     let window_state = {
-        let window_state = WindowState::new(&attributes, window_icon, taskbar_icon, dpi_factor);
+        let window_state = WindowState::new(
+            &attributes,
+            window_icon,
+            taskbar_icon,
+            dpi_factor,
+            dark_mode,
+        );
         let window_state = Arc::new(Mutex::new(window_state));
         WindowState::set_window_flags(window_state.lock(), real_window.0, |f| *f = window_flags);
         window_state

src/platform_impl/windows/window_state.rs

@@ -32,6 +32,7 @@ pub struct WindowState {
     /// Used to supress duplicate redraw attempts when calling `request_redraw` multiple
     /// times in `EventsCleared`.
     pub queued_out_of_band_redraw: bool,
+    pub is_dark_mode: bool,
     pub high_surrogate: Option<u16>,
     window_flags: WindowFlags,
 }
@@ -79,6 +80,8 @@ bitflags! {
         /// window's state to match our stored state. This controls whether to accept those changes.
         const MARKER_RETAIN_STATE_ON_SIZE = 1 << 10;
 
+        const MINIMIZED = 1 << 11;
+
         const FULLSCREEN_AND_MASK = !(
             WindowFlags::DECORATIONS.bits |
             WindowFlags::RESIZABLE.bits |
@@ -96,6 +99,7 @@ impl WindowState {
         window_icon: Option<WinIcon>,
         taskbar_icon: Option<WinIcon>,
         dpi_factor: f64,
+        is_dark_mode: bool,
     ) -> WindowState {
         WindowState {
             mouse: MouseProperties {
@@ -115,6 +119,7 @@ impl WindowState {
 
             fullscreen: None,
             queued_out_of_band_redraw: false,
+            is_dark_mode,
             high_surrogate: None,
             window_flags: WindowFlags::empty(),
         }
@@ -212,6 +217,9 @@ impl WindowFlags {
         if self.contains(WindowFlags::CHILD) {
             style |= WS_CHILD; // This is incompatible with WS_POPUP if that gets added eventually.
         }
+        if self.contains(WindowFlags::MINIMIZED) {
+            style |= WS_MINIMIZE;
+        }
         if self.contains(WindowFlags::MAXIMIZED) {
             style |= WS_MAXIMIZE;
         }
@@ -255,7 +263,10 @@ impl WindowFlags {
                     0,
                     0,
                     0,
-                    winuser::SWP_ASYNCWINDOWPOS | winuser::SWP_NOMOVE | winuser::SWP_NOSIZE,
+                    winuser::SWP_ASYNCWINDOWPOS
+                        | winuser::SWP_NOMOVE
+                        | winuser::SWP_NOSIZE
+                        | winuser::SWP_NOACTIVATE,
                 );
                 winuser::UpdateWindow(window);
             }
@@ -273,14 +284,30 @@ impl WindowFlags {
             }
         }
 
+        // Minimize operations should execute after maximize for proper window animations
+        if diff.contains(WindowFlags::MINIMIZED) {
+            unsafe {
+                winuser::ShowWindow(
+                    window,
+                    match new.contains(WindowFlags::MINIMIZED) {
+                        true => winuser::SW_MINIMIZE,
+                        false => winuser::SW_RESTORE,
+                    },
+                );
+            }
+        }
+
         if diff != WindowFlags::empty() {
             let (style, style_ex) = new.to_window_styles();
 
             unsafe {
                 winuser::SendMessageW(window, *event_loop::SET_RETAIN_STATE_ON_SIZE_MSG_ID, 1, 0);
 
-                winuser::SetWindowLongW(window, winuser::GWL_STYLE, style as _);
-                winuser::SetWindowLongW(window, winuser::GWL_EXSTYLE, style_ex as _);
+                // This condition is necessary to avoid having an unrestorable window
+                if !new.contains(WindowFlags::MINIMIZED) {
+                    winuser::SetWindowLongW(window, winuser::GWL_STYLE, style as _);
+                    winuser::SetWindowLongW(window, winuser::GWL_EXSTYLE, style_ex as _);
+                }
 
                 let mut flags = winuser::SWP_NOZORDER
                     | winuser::SWP_NOMOVE

src/window.rs

@@ -195,7 +195,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_inner_size`] for details.
     ///
-    /// [`Window::set_inner_size`]: struct.Window.html#method.set_inner_size
+    /// [`Window::set_inner_size`]: crate::window::Window::set_inner_size
     #[inline]
     pub fn with_inner_size(mut self, size: LogicalSize) -> Self {
         self.window.inner_size = Some(size);
@@ -206,7 +206,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_min_inner_size`] for details.
     ///
-    /// [`Window::set_min_inner_size`]: struct.Window.html#method.set_min_inner_size
+    /// [`Window::set_min_inner_size`]: crate::window::Window::set_min_inner_size
     #[inline]
     pub fn with_min_inner_size(mut self, min_size: LogicalSize) -> Self {
         self.window.min_inner_size = Some(min_size);
@@ -217,7 +217,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_max_inner_size`] for details.
     ///
-    /// [`Window::set_max_inner_size`]: struct.Window.html#method.set_max_inner_size
+    /// [`Window::set_max_inner_size`]: crate::window::Window::set_max_inner_size
     #[inline]
     pub fn with_max_inner_size(mut self, max_size: LogicalSize) -> Self {
         self.window.max_inner_size = Some(max_size);
@@ -228,7 +228,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_resizable`] for details.
     ///
-    /// [`Window::set_resizable`]: struct.Window.html#method.set_resizable
+    /// [`Window::set_resizable`]: crate::window::Window::set_resizable
     #[inline]
     pub fn with_resizable(mut self, resizable: bool) -> Self {
         self.window.resizable = resizable;
@@ -239,7 +239,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_title`] for details.
     ///
-    /// [`Window::set_title`]: struct.Window.html#method.set_title
+    /// [`Window::set_title`]: crate::window::Window::set_title
     #[inline]
     pub fn with_title<T: Into<String>>(mut self, title: T) -> Self {
         self.window.title = title.into();
@@ -250,7 +250,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_fullscreen`] for details.
     ///
-    /// [`Window::set_fullscreen`]: struct.Window.html#method.set_fullscreen
+    /// [`Window::set_fullscreen`]: crate::window::Window::set_fullscreen
     #[inline]
     pub fn with_fullscreen(mut self, monitor: Option<Fullscreen>) -> Self {
         self.window.fullscreen = monitor;
@@ -261,7 +261,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_maximized`] for details.
     ///
-    /// [`Window::set_maximized`]: struct.Window.html#method.set_maximized
+    /// [`Window::set_maximized`]: crate::window::Window::set_maximized
     #[inline]
     pub fn with_maximized(mut self, maximized: bool) -> Self {
         self.window.maximized = maximized;
@@ -272,7 +272,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_visible`] for details.
     ///
-    /// [`Window::set_visible`]: struct.Window.html#method.set_visible
+    /// [`Window::set_visible`]: crate::window::Window::set_visible
     #[inline]
     pub fn with_visible(mut self, visible: bool) -> Self {
         self.window.visible = visible;
@@ -290,7 +290,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_decorations`] for details.
     ///
-    /// [`Window::set_decorations`]: struct.Window.html#method.set_decorations
+    /// [`Window::set_decorations`]: crate::window::Window::set_decorations
     #[inline]
     pub fn with_decorations(mut self, decorations: bool) -> Self {
         self.window.decorations = decorations;
@@ -301,7 +301,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_always_on_top`] for details.
     ///
-    /// [`Window::set_always_on_top`]: struct.Window.html#method.set_always_on_top
+    /// [`Window::set_always_on_top`]: crate::window::Window::set_always_on_top
     #[inline]
     pub fn with_always_on_top(mut self, always_on_top: bool) -> Self {
         self.window.always_on_top = always_on_top;
@@ -312,7 +312,7 @@ impl WindowBuilder {
     ///
     /// See [`Window::set_window_icon`] for details.
     ///
-    /// [`Window::set_window_icon`]: struct.Window.html#method.set_window_icon
+    /// [`Window::set_window_icon`]: crate::window::Window::set_window_icon
     #[inline]
     pub fn with_window_icon(mut self, window_icon: Option<Icon>) -> Self {
         self.window.window_icon = window_icon;
@@ -353,7 +353,7 @@ impl Window {
     /// - **Web**: The window is created but not inserted into the web page automatically. Please
     /// see the web platform module for more information.
     ///
-    /// [`WindowBuilder::new().build(event_loop)`]: struct.WindowBuilder.html#method.build
+    /// [`WindowBuilder::new().build(event_loop)`]: crate::window::WindowBuilder::build
     #[inline]
     pub fn new<T: 'static>(event_loop: &EventLoopWindowTarget<T>) -> Result<Window, OsError> {
         let builder = WindowBuilder::new();
@@ -368,7 +368,7 @@ impl Window {
 
     /// Returns the DPI factor that can be used to map logical pixels to physical pixels, and vice versa.
     ///
-    /// See the [`dpi`](../dpi/index.html) module for more information.
+    /// See the [`dpi`](crate::dpi) module for more information.
     ///
     /// Note that this value can change depending on user action (for example if the window is
     /// moved to another screen); as such, tracking `WindowEvent::HiDpiFactorChanged` events is
@@ -572,6 +572,16 @@ impl Window {
         self.window.set_resizable(resizable)
     }
 
+    /// Sets the window to minimized or back
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **iOS:** Has no effect
+    #[inline]
+    pub fn set_minimized(&self, minimized: bool) {
+        self.window.set_minimized(minimized);
+    }
+
     /// Sets the window to maximized or back.
     ///
     /// ## Platform-specific
@@ -595,16 +605,13 @@ impl Window {
     ///
     ///   `Fullscreen::Borderless` provides a borderless fullscreen window on a
     ///   separate space. This is the idiomatic way for fullscreen games to work
-    ///   on macOS. See [`WindowExtMacOs::set_simple_fullscreen`][simple] if
+    ///   on macOS. See `WindowExtMacOs::set_simple_fullscreen` if
     ///   separate spaces are not preferred.
     ///
     ///   The dock and the menu bar are always disabled in fullscreen mode.
     /// - **iOS:** Can only be called on the main thread.
     /// - **Wayland:** Does not support exclusive fullscreen mode.
     /// - **Windows:** Screen saver is disabled in fullscreen mode.
-    ///
-    /// [simple]:
-    /// ../platform/macos/trait.WindowExtMacOS.html#tymethod.set_simple_fullscreen
     #[inline]
     pub fn set_fullscreen(&self, fullscreen: Option<Fullscreen>) {
         self.window.set_fullscreen(fullscreen)
@@ -850,3 +857,9 @@ pub enum Fullscreen {
     Exclusive(VideoMode),
     Borderless(MonitorHandle),
 }
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum Theme {
+    Light,
+    Dark,
+}