fix broken / missing raw-window-handle implementation on android (#1258)

* Add raw-window-handle support to Winit 0.19 and bump version

* Hopefully fix linux and ios builds

.circleci/config.yml

@@ -0,0 +1,56 @@
+version: 2
+
+jobs:
+
+  android-test:
+    working_directory: ~/winit
+    docker:
+      - image: tomaka/cargo-apk
+    steps:
+      - run: apt-get -qq update && apt-get install -y git
+      - checkout
+      - restore_cache:
+          key: android-test-cache-{{ checksum "Cargo.toml" }}
+      - run: cargo apk build --example window
+      - save_cache:
+          key: android-test-cache-{{ checksum "Cargo.toml" }}
+          paths:
+            - target
+
+  asmjs-test:
+    working_directory: ~/winit
+    docker:
+      - image: tomaka/rustc-emscripten
+    steps:
+      - run: apt-get -qq update && apt-get install -y git
+      - checkout
+      - restore_cache:
+          key: asmjs-test-cache-{{ checksum "Cargo.toml" }}
+      - run: cargo build --example window --target asmjs-unknown-emscripten
+      - save_cache:
+          key: asmjs-test-cache-{{ checksum "Cargo.toml" }}
+          paths:
+            - target
+
+  wasm-test:
+    working_directory: ~/winit
+    docker:
+      - image: tomaka/rustc-emscripten
+    steps:
+      - run: apt-get -qq update && apt-get install -y git
+      - checkout
+      - restore_cache:
+          key: wasm-test-cache-{{ checksum "Cargo.toml" }}
+      - run: cargo build --example window --target wasm32-unknown-emscripten
+      - save_cache:
+          key: wasm-test-cache-{{ checksum "Cargo.toml" }}
+          paths:
+            - target
+  
+workflows:
+  version: 2
+  build-test-and-deploy:
+    jobs:
+      - android-test
+      - asmjs-test
+      - wasm-test

.gitattributes

@@ -20,5 +20,3 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
-
-/CHANGELOG.md merge=union

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,5 @@
 - [ ] Tested on all platforms changed
-- [ ] `cargo fmt` has been run on this branch
 - [ ] 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 an example program if it would help users understand this functionality
-- [ ] Updated [feature matrix](https://github.com/tomaka/winit/blob/master/FEATURES.md), if new features were added or implemented
+- [ ] Updated [feature matrix](https://github.com/rust-windowing/winit/blob/master/FEATURES.md), if new features were added or implemented

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "deps/apk-builder"]
 	path = deps/apk-builder
-	url = https://github.com/tomaka/android-rs-glue
+	url = https://github.com/rust-windowing/android-rs-glue

.travis.yml

@@ -1,5 +1,7 @@
 language: rust
 
+cache: cargo
+
 matrix:
   include:
     # Linux 32bit
@@ -45,16 +47,15 @@ matrix:
 install:
   - rustup self update
   - rustup target add $TARGET; true
-  - rustup install nightly
-  - rustup component add rustfmt --toolchain nightly
 
 script:
-  - cargo +nightly fmt --all -- --check
   - cargo build --target $TARGET --verbose
   - cargo build --target $TARGET --features serde --verbose
+  - cargo build --target $TARGET --features icon_loading --verbose
   # Running iOS apps on OSX requires the simulator so we skip that for now
   - if [ "$TARGET" != "x86_64-apple-ios" ]; then cargo test --target $TARGET --verbose; fi
   - if [ "$TARGET" != "x86_64-apple-ios" ]; then cargo test --target $TARGET --features serde --verbose; fi
+  - if [ "$TARGET" != "x86_64-apple-ios" ]; then cargo test --target $TARGET --features icon_loading --verbose; fi
 
 after_success:
   - |

CHANGELOG.md

@@ -1,51 +1,20 @@
 # Unreleased
 
-# 0.20.0 Alpha 1
+# Version 0.19.5 (2019-11-04)
 
-- Changes below are considered **breaking**.
-- Change all occurrences of `EventsLoop` to `EventLoop`.
-- Previously flat API is now exposed through `event`, `event_loop`, `monitor`, and `window` modules.
-- `os` module changes:
-  - Renamed to `platform`.
-  - All traits now have platform-specific suffixes.
-  - Exposes new `desktop` module on Windows, Mac, and Linux.
-- Changes to event loop types:
-  - `EventLoopProxy::wakeup` has been removed in favor of `send_event`.
-  - **Major:** New `run` method drives winit event loop.
-    - Returns `!` to ensure API behaves identically across all supported platforms.
-      - This allows `emscripten` implementation to work without lying about the API.
-    - `ControlFlow`'s variants have been replaced with `Wait`, `WaitUntil(Instant)`, `Poll`, and `Exit`.
-      - Is read after `EventsCleared` is processed.
-      - `Wait` waits until new events are available.
-      - `WaitUntil` waits until either new events are available or the provided time has been reached.
-      - `Poll` instantly resumes the event loop.
-      - `Exit` aborts the event loop.
-    - Takes a closure that implements `'static + FnMut(Event<T>, &EventLoop<T>, &mut ControlFlow)`.
-      - `&EventLoop<T>` is provided to allow new `Window`s to be created.
-  - **Major:** `platform::desktop` module exposes `EventLoopExtDesktop` trait with `run_return` method.
-    - Behaves identically to `run`, but returns control flow to the calling context and can take non-`'static` closures.
-  - `EventLoop`'s `poll_events` and `run_forever` methods have been removed in favor of `run` and `run_return`.
-- Changes to events:
-  - Remove `Event::Awakened` in favor of `Event::UserEvent(T)`.
-    - Can be sent with `EventLoopProxy::send_event`.
-  - Rename `WindowEvent::Refresh` to `WindowEvent::RedrawRequested`.
-    - `RedrawRequested` can be sent by the user with the `Window::request_redraw` method.
-  - `EventLoop`, `EventLoopProxy`, and `Event` are now generic over `T`, for use in `UserEvent`.
-  - **Major:** Add `NewEvents(StartCause)`, `EventsCleared`, and `LoopDestroyed` variants to `Event`.
-    - `NewEvents` is emitted when new events are ready to be processed by event loop.
-      - `StartCause` describes why new events are available, with `ResumeTimeReached`, `Poll`, `WaitCancelled`, and `Init` (sent once at start of loop).
-    - `EventsCleared` is emitted when all available events have been processed.
-      - Can be used to perform logic that depends on all events being processed (e.g. an iteration of a game loop).
-    - `LoopDestroyed` is emitted when the `run` or `run_return` method is about to exit.
-- Rename `MonitorId` to `MonitorHandle`.
-- Removed `serde` implementations from `ControlFlow`.
-- Rename several functions to improve both internal consistency and compliance with Rust API guidelines.
-- Remove `WindowBuilder::multitouch` field, since it was only implemented on a few platforms. Multitouch is always enabled now.
-- **Breaking:** On macOS, change `ns` identifiers to use snake_case for consistency with iOS's `ui` identifiers.
-- Add `MonitorHandle::video_modes` method for retrieving supported video modes for the given monitor.
-- On Wayland, the window now exists even if nothing has been drawn.
-- On Windows, fix initial dimensions of a fullscreen window.
-- On Windows, Fix transparent borderless windows rendering wrong.
+- On Android, fix the missing `raw-window-handle` support
+
+# Version 0.19.4 (2019-10-16)
+
+- Add support for `raw-window-handle` 0.3.
+
+# Version 0.19.3 (2019-08-26)
+
+- Update parking_lot version.
+
+# Version 0.19.2 (2019-07-29)
+
+- On X11, fix sanity check which checks that a monitor's reported width and height (in millimeters) are non-zero when calculating the DPI factor.
 
 # Version 0.19.1 (2019-04-08)
 
@@ -63,7 +32,7 @@
 - On Wayland, fix `with_title()` not setting the windows title
 - On Wayland, add `set_wayland_theme()` to control client decoration color theme
 - Added serde serialization to `os::unix::XWindowType`.
-- **Breaking:** Remove the `icon_loading` feature and the associated `image` dependency.
+- **Breaking:** `image` crate upgraded to 0.21. This is exposed as part of the `icon_loading` API.
 - On X11, make event loop thread safe by replacing XNextEvent with select(2) and XCheckIfEvent
 - On Windows, fix malformed function pointer typecast that could invoke undefined behavior.
 - Refactored Windows state/flag-setting code.

CONTRIBUTING.md

@@ -1,3 +1,7 @@
+# PLEASE MAKE PRs AGAINST THE `eventloop-2.0` BRANCH.
+
+All development work for our next version is being done against that branch. Refer to [#459](https://github.com/rust-windowing/winit/issues/459) and [the associated milestone](https://github.com/rust-windowing/winit/milestone/2) for details on what that branch changes.
+
 # Winit Contributing Guidelines
 
 ## Scope
@@ -36,7 +40,19 @@ at least a maintainer of the platform (a maintainer making a PR themselves count
 
 ## Maintainers & Testers
 
-The current [list of testers and contributors](https://github.com/rust-windowing/winit/wiki/Testers-and-Contributors)
-can be found on the Wiki.
+Winit is managed by several people, each with their specialities, and each maintaining a subset of the
+backends of winit. As such, depending on your platform of interest, your contacts will be different.
 
-If you are interested in contributing or testing on a platform, please add yourself to that table!
+This table summarizes who can be contacted in which case, with the following legend:
+
+- `M` - Maintainer: is a main maintainer for this platform
+- `C` - Collaborator: can review code and address issues on this platform
+- `T` - Tester: has the ability of testing the platform
+- ` `: knows nothing of this platform
+
+| Platform            | Windows | macOS | X11   | Wayland | Android | iOS   | Emscripten |
+| :---                | :---:   | :---: | :---: | :---:   | :---:   | :---: | :---:      |
+| @mitchmindtree      | T       |       | T     | T       |         |       |            |
+| @Osspial            | M       |       | T     | T       | T       |       | T          |
+| @vberger            |         |       | T     | M       |         |       |            |
+| @mtak-              |         | T     |       |         | T       | M     |            |

Cargo.toml

@@ -1,29 +1,28 @@
 [package]
 name = "winit"
-version = "0.20.0-alpha1"
+version = "0.19.5"
 authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
-edition = "2018"
 keywords = ["windowing"]
 license = "Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/tomaka/winit"
+repository = "https://github.com/rust-windowing/winit"
 documentation = "https://docs.rs/winit"
 categories = ["gui"]
 
 [package.metadata.docs.rs]
-features = ["serde"]
+features = ["icon_loading", "serde"]
+
+[features]
+icon_loading = ["image"]
 
 [dependencies]
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
+image = { version = "0.21", optional = true }
 serde = { version = "1", optional = true, features = ["serde_derive"] }
-derivative = "1.0.2"
-
-[dev-dependencies]
-image = "0.21"
-env_logger = "0.5"
+raw-window-handle = "0.3"
 
 [target.'cfg(target_os = "android")'.dependencies.android_glue]
 version = "0.2"
@@ -32,21 +31,19 @@ version = "0.2"
 objc = "0.2.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
+objc = "0.2.3"
 cocoa = "0.18.4"
 core-foundation = "0.6"
 core-graphics = "0.17.3"
-core-video-sys = "0.1.2"
-dispatch = "0.1.4"
-objc = "0.2.3"
 
 [target.'cfg(target_os = "windows")'.dependencies]
+backtrace = "0.3"
 bitflags = "1"
 
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
 version = "0.3.6"
 features = [
     "combaseapi",
-    "commctrl",
     "dwmapi",
     "errhandlingapi",
     "hidusage",
@@ -67,11 +64,8 @@ features = [
 ]
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
-wayland-client = { version = "0.23.0", features = [ "dlopen", "egl", "cursor", "eventloop"] }
-calloop = "0.4.2"
-smithay-client-toolkit = "0.6.1"
+wayland-client = { version = "0.21", features = [ "dlopen", "egl", "cursor"] }
+smithay-client-toolkit = "0.4.3"
 x11-dl = "2.18.3"
-percent-encoding = "1.0"
-
-[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "windows"))'.dependencies.parking_lot]
-version = "0.8"
+parking_lot = "0.9"
+percent-encoding = "2.0"

FEATURES.md

@@ -92,7 +92,6 @@ If your PR makes notable changes to Winit's features, please update this section
 
 ### System Information
 - **Monitor list**: Retrieve the list of monitors and their metadata, including which one is primary.
-- **Video mode query**: Monitors can be queried for their supported fullscreen video modes (consisting of resolution, refresh rate, and bit depth).
 
 ### Input Handling
 - **Mouse events**: Generating mouse events associated with pointer motion, click, and scrolling events.
@@ -161,10 +160,9 @@ Legend:
 |Popup windows                    |❌     |❌     |❌         |❌             |❌    |❌     |❌        |
 
 ### System information
-|Feature          |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Emscripten|
-|---------------- | ----- | ---- | ------- | ----------- | ----- | ----- | -------- |
-|Monitor list     |✔️    |✔️    |✔️       |✔️          |**N/A**|**N/A**|**N/A**   |
-|Video mode query |✔️    |✔️    |✔️       |✔️          |❌      |✔️     |❌         |
+|Feature      |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Emscripten|
+|------------ | ----- | ---- | ------- | ----------- | ----- | ----- | -------- |
+|Monitor list |✔️    |✔️    |✔️       |✔️          |**N/A**|**N/A**|**N/A**   |
 
 ### Input handling
 |Feature                 |Windows   |MacOS   |Linux x11|Linux Wayland|Android|iOS    |Emscripten|
@@ -194,18 +192,18 @@ Changes in the API that have been agreed upon but aren't implemented across all
 |Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Emscripten|
 |------------------------------      | ----- | ---- | ------- | ----------- | ----- | ----- | -------- |
 
-[#165]: https://github.com/tomaka/winit/issues/165
-[#219]: https://github.com/tomaka/winit/issues/219
-[#242]: https://github.com/tomaka/winit/issues/242
-[#306]: https://github.com/tomaka/winit/issues/306
-[#315]: https://github.com/tomaka/winit/issues/315
-[#319]: https://github.com/tomaka/winit/issues/319
-[#33]: https://github.com/tomaka/winit/issues/33
-[#459]: https://github.com/tomaka/winit/issues/459
-[#5]: https://github.com/tomaka/winit/issues/5
-[#63]: https://github.com/tomaka/winit/issues/63
-[#720]: https://github.com/tomaka/winit/issues/720
-[#721]: https://github.com/tomaka/winit/issues/721
-[#750]: https://github.com/tomaka/winit/issues/750
-[#804]: https://github.com/tomaka/winit/issues/804
-[#812]: https://github.com/tomaka/winit/issues/812
+[#165]: https://github.com/rust-windowing/winit/issues/165
+[#219]: https://github.com/rust-windowing/winit/issues/219
+[#242]: https://github.com/rust-windowing/winit/issues/242
+[#306]: https://github.com/rust-windowing/winit/issues/306
+[#315]: https://github.com/rust-windowing/winit/issues/315
+[#319]: https://github.com/rust-windowing/winit/issues/319
+[#33]: https://github.com/rust-windowing/winit/issues/33
+[#459]: https://github.com/rust-windowing/winit/issues/459
+[#5]: https://github.com/rust-windowing/winit/issues/5
+[#63]: https://github.com/rust-windowing/winit/issues/63
+[#720]: https://github.com/rust-windowing/winit/issues/720
+[#721]: https://github.com/rust-windowing/winit/issues/721
+[#750]: https://github.com/rust-windowing/winit/issues/750
+[#804]: https://github.com/rust-windowing/winit/issues/804
+[#812]: https://github.com/rust-windowing/winit/issues/812

HALL_OF_CHAMPIONS.md

@@ -5,10 +5,7 @@ contributors, without whom Winit would not exist in its current form. We thank
 them deeply for their time and efforts, and wish them best of luck in their
 future endeavors:
 
-* [@tomaka]: For creating the Winit project and guiding it through its early
+* @tomaka: For creating the Winit project and guiding it through its early
   years of existence.
-* [@francesca64]: For taking over the responsibility of maintaining almost every
+* @francesca64: For taking over the responsibility of maintaining almost every
   Winit backend, and standardizing HiDPI support across all of them
-
-[@tomaka]: https://github.com/tomaka
-[@francesca64]: https://github.com/francesca64

README.md

@@ -1,17 +1,27 @@
+# This branch has been archived
+
+Please direct all work against `master`.
+
+--------
+
 # winit - Cross-platform window creation and management in Rust
 
-[![](http://meritbadge.herokuapp.com/winit)](https://crates.io/crates/winit)
+[![Crates.io](https://img.shields.io/crates/v/winit.svg)](https://crates.io/crates/winit)
 [![Docs.rs](https://docs.rs/winit/badge.svg)](https://docs.rs/winit)
 [![Build Status](https://travis-ci.org/rust-windowing/winit.svg?branch=master)](https://travis-ci.org/rust-windowing/winit)
 [![Build status](https://ci.appveyor.com/api/projects/status/hr89but4x1n3dphq/branch/master?svg=true)](https://ci.appveyor.com/project/Osspial/winit/branch/master)
 
 ```toml
 [dependencies]
-winit = "0.20.0-alpha1"
+winit = "0.19.5"
 ```
 
 ## [Documentation](https://docs.rs/winit)
 
+For features _within_ the scope of winit, see [FEATURES.md](FEATURES.md).
+
+For features _outside_ the scope of winit, see [Missing features provided by other crates](https://github.com/rust-windowing/winit/wiki/Missing-features-provided-by-other-crates) in the wiki.
+
 ## Contact Us
 
 Join us in any of these:
@@ -31,23 +41,19 @@ show something on the window you need to use the platform-specific getters provi
 another library.
 
 ```rust
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
 
 fn main() {
-    let event_loop = EventLoop::new();
-    let window = WindowBuilder::new().build(&event_loop).unwrap();
+    let mut events_loop = winit::EventsLoop::new();
+    let window = winit::Window::new(&events_loop).unwrap();
 
-    event_loop.run(move |event, _, control_flow| {
+    events_loop.run_forever(|event| {
         match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            winit::Event::WindowEvent {
+              event: winit::WindowEvent::CloseRequested,
+              ..
+            } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }
@@ -58,6 +64,7 @@ Winit is only officially supported on the latest stable version of the Rust comp
 ### Cargo Features
 
 Winit provides the following features, which can be enabled in your `Cargo.toml` file:
+* `icon_loading`: Enables loading window icons directly from files. Depends on the [`image` crate](https://crates.io/crates/image).
 * `serde`: Enables serialization/deserialization of certain types with [Serde](https://crates.io/crates/serde).
 
 ### Platform-specific usage

appveyor.yml

@@ -21,3 +21,4 @@ build: false
 test_script:
   - cargo test --verbose
   - cargo test --features serde --verbose
+  - cargo test --features icon_loading --verbose

examples/cursor.rs

@@ -1,85 +1,32 @@
-use winit::{
-    event::{ElementState, Event, KeyboardInput, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::{CursorIcon, WindowBuilder},
-};
+extern crate winit;
+
+use winit::{Event, ElementState, MouseCursor, WindowEvent, KeyboardInput, ControlFlow};
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let window = WindowBuilder::new().build(&event_loop).unwrap();
+    let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
     window.set_title("A fantastic window!");
 
+    let cursors = [MouseCursor::Default, MouseCursor::Crosshair, MouseCursor::Hand, MouseCursor::Arrow, MouseCursor::Move, MouseCursor::Text, MouseCursor::Wait, MouseCursor::Help, MouseCursor::Progress, MouseCursor::NotAllowed, MouseCursor::ContextMenu, MouseCursor::Cell, MouseCursor::VerticalText, MouseCursor::Alias, MouseCursor::Copy, MouseCursor::NoDrop, MouseCursor::Grab, MouseCursor::Grabbing, MouseCursor::AllScroll, MouseCursor::ZoomIn, MouseCursor::ZoomOut, MouseCursor::EResize, MouseCursor::NResize, MouseCursor::NeResize, MouseCursor::NwResize, MouseCursor::SResize, MouseCursor::SeResize, MouseCursor::SwResize, MouseCursor::WResize, MouseCursor::EwResize, MouseCursor::NsResize, MouseCursor::NeswResize, MouseCursor::NwseResize, MouseCursor::ColResize, MouseCursor::RowResize];
     let mut cursor_idx = 0;
 
-    event_loop.run(move |event, _, control_flow| {
+    events_loop.run_forever(|event| {
         match event {
-            Event::WindowEvent {
-                event:
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                state: ElementState::Pressed,
-                                ..
-                            },
-                        ..
-                    },
-                ..
-            } => {
-                println!("Setting cursor to \"{:?}\"", CURSORS[cursor_idx]);
-                window.set_cursor_icon(CURSORS[cursor_idx]);
-                if cursor_idx < CURSORS.len() - 1 {
+            Event::WindowEvent { event: WindowEvent::KeyboardInput { input: KeyboardInput { state: ElementState::Pressed, .. }, .. }, .. } => {
+                println!("Setting cursor to \"{:?}\"", cursors[cursor_idx]);
+                window.set_cursor(cursors[cursor_idx]);
+                if cursor_idx < cursors.len() - 1 {
                     cursor_idx += 1;
                 } else {
                     cursor_idx = 0;
                 }
             },
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => {
-                *control_flow = ControlFlow::Exit;
-                return;
+            Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
+                return ControlFlow::Break;
             },
-            _ => (),
+            _ => ()
         }
+        ControlFlow::Continue
     });
 }
-
-const CURSORS: &[CursorIcon] = &[
-    CursorIcon::Default,
-    CursorIcon::Crosshair,
-    CursorIcon::Hand,
-    CursorIcon::Arrow,
-    CursorIcon::Move,
-    CursorIcon::Text,
-    CursorIcon::Wait,
-    CursorIcon::Help,
-    CursorIcon::Progress,
-    CursorIcon::NotAllowed,
-    CursorIcon::ContextMenu,
-    CursorIcon::Cell,
-    CursorIcon::VerticalText,
-    CursorIcon::Alias,
-    CursorIcon::Copy,
-    CursorIcon::NoDrop,
-    CursorIcon::Grab,
-    CursorIcon::Grabbing,
-    CursorIcon::AllScroll,
-    CursorIcon::ZoomIn,
-    CursorIcon::ZoomOut,
-    CursorIcon::EResize,
-    CursorIcon::NResize,
-    CursorIcon::NeResize,
-    CursorIcon::NwResize,
-    CursorIcon::SResize,
-    CursorIcon::SeResize,
-    CursorIcon::SwResize,
-    CursorIcon::WResize,
-    CursorIcon::EwResize,
-    CursorIcon::NsResize,
-    CursorIcon::NeswResize,
-    CursorIcon::NwseResize,
-    CursorIcon::ColResize,
-    CursorIcon::RowResize,
-];

examples/cursor_grab.rs

@@ -1,42 +1,38 @@
-use winit::{
-    event::{ElementState, Event, KeyboardInput, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let window = WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("Super Cursor Grab'n'Hide Simulator 9000")
-        .build(&event_loop)
+        .build(&events_loop)
         .unwrap();
 
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-        if let Event::WindowEvent { event, .. } = event {
+    events_loop.run_forever(|event| {
+        if let winit::Event::WindowEvent { event, .. } = event {
+            use winit::WindowEvent::*;
             match event {
-                WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
-                WindowEvent::KeyboardInput {
-                    input:
-                        KeyboardInput {
-                            state: ElementState::Released,
-                            virtual_keycode: Some(key),
-                            modifiers,
-                            ..
-                        },
+                CloseRequested => return winit::ControlFlow::Break,
+                KeyboardInput {
+                    input: winit::KeyboardInput {
+                        state: winit::ElementState::Released,
+                        virtual_keycode: Some(key),
+                        modifiers,
+                        ..
+                    },
                     ..
                 } => {
-                    use winit::event::VirtualKeyCode::*;
+                    use winit::VirtualKeyCode::*;
                     match key {
-                        Escape => *control_flow = ControlFlow::Exit,
-                        G => window.set_cursor_grab(!modifiers.shift).unwrap(),
-                        H => window.set_cursor_visible(modifiers.shift),
+                        Escape => return winit::ControlFlow::Break,
+                        G => window.grab_cursor(!modifiers.shift).unwrap(),
+                        H => window.hide_cursor(!modifiers.shift),
                         _ => (),
                     }
-                },
+                }
                 _ => (),
             }
         }
+        winit::ControlFlow::Continue
     });
 }

examples/fullscreen.rs

@@ -1,13 +1,10 @@
+extern crate winit;
+
 use std::io::{self, Write};
-use winit::{
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    monitor::MonitorHandle,
-    window::WindowBuilder,
-};
+use winit::{ControlFlow, Event, WindowEvent};
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
     #[cfg(target_os = "macos")]
     let mut macos_use_simple_fullscreen = false;
@@ -24,107 +21,99 @@ fn main() {
             let num = num.trim().parse().ok().expect("Please enter a number");
             match num {
                 2 => macos_use_simple_fullscreen = true,
-                _ => {},
+                _ => {}
             }
 
             // Prompt for monitor when using native fullscreen
             if !macos_use_simple_fullscreen {
-                Some(prompt_for_monitor(&event_loop))
+                Some(prompt_for_monitor(&events_loop))
             } else {
                 None
             }
         }
 
         #[cfg(not(target_os = "macos"))]
-        Some(prompt_for_monitor(&event_loop))
+        Some(prompt_for_monitor(&events_loop))
     };
 
     let mut is_fullscreen = monitor.is_some();
     let mut is_maximized = false;
     let mut decorations = true;
 
-    let window = WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("Hello world!")
         .with_fullscreen(monitor)
-        .build(&event_loop)
+        .build(&events_loop)
         .unwrap();
 
-    event_loop.run(move |event, _, control_flow| {
+    events_loop.run_forever(|event| {
         println!("{:?}", event);
-        *control_flow = ControlFlow::Wait;
 
         match event {
-            Event::WindowEvent { event, .. } => {
-                match event {
-                    WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(virtual_code),
-                                state,
-                                ..
-                            },
-                        ..
-                    } => {
-                        match (virtual_code, state) {
-                            (VirtualKeyCode::Escape, _) => *control_flow = ControlFlow::Exit,
-                            (VirtualKeyCode::F, ElementState::Pressed) => {
-                                #[cfg(target_os = "macos")]
-                                {
-                                    if macos_use_simple_fullscreen {
-                                        use winit::platform::macos::WindowExtMacOS;
-                                        if WindowExtMacOS::set_simple_fullscreen(
-                                            &window,
-                                            !is_fullscreen,
-                                        ) {
-                                            is_fullscreen = !is_fullscreen;
-                                        }
-                                        return;
-                                    }
+            Event::WindowEvent { event, .. } => match event {
+                WindowEvent::CloseRequested => return ControlFlow::Break,
+                WindowEvent::KeyboardInput {
+                    input:
+                        winit::KeyboardInput {
+                            virtual_keycode: Some(virtual_code),
+                            state,
+                            ..
+                        },
+                    ..
+                } => match (virtual_code, state) {
+                    (winit::VirtualKeyCode::Escape, _) => return ControlFlow::Break,
+                    (winit::VirtualKeyCode::F, winit::ElementState::Pressed) => {
+                        #[cfg(target_os = "macos")]
+                        {
+                            if macos_use_simple_fullscreen {
+                                use winit::os::macos::WindowExt;
+                                if WindowExt::set_simple_fullscreen(&window, !is_fullscreen) {
+                                    is_fullscreen = !is_fullscreen;
                                 }
 
-                                is_fullscreen = !is_fullscreen;
-                                if !is_fullscreen {
-                                    window.set_fullscreen(None);
-                                } else {
-                                    window.set_fullscreen(Some(window.current_monitor()));
-                                }
-                            },
-                            (VirtualKeyCode::S, ElementState::Pressed) => {
-                                println!("window.fullscreen {:?}", window.fullscreen());
-
-                                #[cfg(target_os = "macos")]
-                                {
-                                    use winit::platform::macos::WindowExtMacOS;
-                                    println!(
-                                        "window.simple_fullscreen {:?}",
-                                        WindowExtMacOS::simple_fullscreen(&window)
-                                    );
-                                }
-                            },
-                            (VirtualKeyCode::M, ElementState::Pressed) => {
-                                is_maximized = !is_maximized;
-                                window.set_maximized(is_maximized);
-                            },
-                            (VirtualKeyCode::D, ElementState::Pressed) => {
-                                decorations = !decorations;
-                                window.set_decorations(decorations);
-                            },
-                            _ => (),
+                                return ControlFlow::Continue;
+                            }
                         }
-                    },
+
+                        is_fullscreen = !is_fullscreen;
+                        if !is_fullscreen {
+                            window.set_fullscreen(None);
+                        } else {
+                            window.set_fullscreen(Some(window.get_current_monitor()));
+                        }
+                    }
+                    (winit::VirtualKeyCode::S, winit::ElementState::Pressed) => {
+                        println!("window.get_fullscreen {:?}", window.get_fullscreen());
+
+                        #[cfg(target_os = "macos")]
+                        {
+                            use winit::os::macos::WindowExt;
+                            println!("window.get_simple_fullscreen {:?}", WindowExt::get_simple_fullscreen(&window));
+                        }
+                    }
+                    (winit::VirtualKeyCode::M, winit::ElementState::Pressed) => {
+                        is_maximized = !is_maximized;
+                        window.set_maximized(is_maximized);
+                    }
+                    (winit::VirtualKeyCode::D, winit::ElementState::Pressed) => {
+                        decorations = !decorations;
+                        window.set_decorations(decorations);
+                    }
                     _ => (),
-                }
+                },
+                _ => (),
             },
-            _ => {},
+            _ => {}
         }
+
+        ControlFlow::Continue
     });
 }
 
 // Enumerate monitors and prompt user to choose one
-fn prompt_for_monitor(event_loop: &EventLoop<()>) -> MonitorHandle {
-    for (num, monitor) in event_loop.available_monitors().enumerate() {
-        println!("Monitor #{}: {:?}", num, monitor.name());
+fn prompt_for_monitor(events_loop: &winit::EventsLoop) -> winit::MonitorId {
+    for (num, monitor) in events_loop.get_available_monitors().enumerate() {
+        println!("Monitor #{}: {:?}", num, monitor.get_name());
     }
 
     print!("Please write the number of the monitor to use: ");
@@ -133,12 +122,9 @@ fn prompt_for_monitor(event_loop: &EventLoop<()>) -> MonitorHandle {
     let mut num = String::new();
     io::stdin().read_line(&mut num).unwrap();
     let num = num.trim().parse().ok().expect("Please enter a number");
-    let monitor = event_loop
-        .available_monitors()
-        .nth(num)
-        .expect("Please enter a valid ID");
+    let monitor = events_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
 
-    println!("Using {:?}", monitor.name());
+    println!("Using {:?}", monitor.get_name());
 
     monitor
 }

examples/handling_close.rs

@@ -1,82 +1,74 @@
-use winit::{
-    event::{Event, KeyboardInput, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let _window = WindowBuilder::new()
+    let _window = winit::WindowBuilder::new()
         .with_title("Your faithful window")
-        .build(&event_loop)
+        .build(&events_loop)
         .unwrap();
 
     let mut close_requested = false;
 
-    event_loop.run(move |event, _, control_flow| {
-        use winit::event::{
-            ElementState::Released,
-            VirtualKeyCode::{N, Y},
-        };
-        *control_flow = ControlFlow::Wait;
+    events_loop.run_forever(|event| {
+        use winit::WindowEvent::*;
+        use winit::ElementState::Released;
+        use winit::VirtualKeyCode::{N, Y};
 
         match event {
-            Event::WindowEvent { event, .. } => {
-                match event {
-                    WindowEvent::CloseRequested => {
-                        // `CloseRequested` is sent when the close button on the window is pressed (or
-                        // through whatever other mechanisms the window manager provides for closing a
-                        // window). If you don't handle this event, the close button won't actually do
-                        // anything.
+            winit::Event::WindowEvent { event, .. } => match event {
+                CloseRequested => {
+                    // `CloseRequested` is sent when the close button on the window is pressed (or
+                    // through whatever other mechanisms the window manager provides for closing a
+                    // window). If you don't handle this event, the close button won't actually do
+                    // anything.
 
-                        // A common thing to do here is prompt the user if they have unsaved work.
-                        // Creating a proper dialog box for that is far beyond the scope of this
-                        // example, so here we'll just respond to the Y and N keys.
-                        println!("Are you ready to bid your window farewell? [Y/N]");
-                        close_requested = true;
+                    // A common thing to do here is prompt the user if they have unsaved work.
+                    // Creating a proper dialog box for that is far beyond the scope of this
+                    // example, so here we'll just respond to the Y and N keys.
+                    println!("Are you ready to bid your window farewell? [Y/N]");
+                    close_requested = true;
 
-                        // In applications where you can safely close the window without further
-                        // action from the user, this is generally where you'd handle cleanup before
-                        // closing the window. How to close the window is detailed in the handler for
-                        // the Y key.
-                    },
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(virtual_code),
-                                state: Released,
-                                ..
-                            },
-                        ..
-                    } => {
-                        match virtual_code {
-                            Y => {
-                                if close_requested {
-                                    // This is where you'll want to do any cleanup you need.
-                                    println!("Buh-bye!");
-
-                                    // For a single-window application like this, you'd normally just
-                                    // break out of the event loop here. If you wanted to keep running the
-                                    // event loop (i.e. if it's a multi-window application), you need to
-                                    // drop the window. That closes it, and results in `Destroyed` being
-                                    // sent.
-                                    *control_flow = ControlFlow::Exit;
-                                }
-                            },
-                            N => {
-                                if close_requested {
-                                    println!("Your window will continue to stay by your side.");
-                                    close_requested = false;
-                                }
-                            },
-                            _ => (),
-                        }
-                    },
-                    _ => (),
+                    // In applications where you can safely close the window without further
+                    // action from the user, this is generally where you'd handle cleanup before
+                    // closing the window. How to close the window is detailed in the handler for
+                    // the Y key.
                 }
+                KeyboardInput {
+                    input:
+                        winit::KeyboardInput {
+                            virtual_keycode: Some(virtual_code),
+                            state: Released,
+                            ..
+                        },
+                    ..
+                } => match virtual_code {
+                    Y => {
+                        if close_requested {
+                            // This is where you'll want to do any cleanup you need.
+                            println!("Buh-bye!");
+
+                            // For a single-window application like this, you'd normally just
+                            // break out of the event loop here. If you wanted to keep running the
+                            // event loop (i.e. if it's a multi-window application), you need to
+                            // drop the window. That closes it, and results in `Destroyed` being
+                            // sent.
+                            return winit::ControlFlow::Break;
+                        }
+                    }
+                    N => {
+                        if close_requested {
+                            println!("Your window will continue to stay by your side.");
+                            close_requested = false;
+                        }
+                    }
+                    _ => (),
+                },
+                _ => (),
             },
             _ => (),
         }
+
+        winit::ControlFlow::Continue
     });
 }

examples/min_max_size.rs

@@ -1,27 +1,23 @@
-use winit::{
-    dpi::LogicalSize,
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
+
+use winit::dpi::LogicalSize;
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let window = WindowBuilder::new().build(&event_loop).unwrap();
+    let window = winit::WindowBuilder::new()
+        .build(&events_loop)
+        .unwrap();
 
-    window.set_min_inner_size(Some(LogicalSize::new(400.0, 200.0)));
-    window.set_max_inner_size(Some(LogicalSize::new(800.0, 400.0)));
+    window.set_min_dimensions(Some(LogicalSize::new(400.0, 200.0)));
+    window.set_max_dimensions(Some(LogicalSize::new(800.0, 400.0)));
 
-    event_loop.run(move |event, _, control_flow| {
+    events_loop.run_forever(|event| {
         println!("{:?}", event);
 
         match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }

examples/monitor_list.rs

@@ -1,9 +1,7 @@
-use winit::{event_loop::EventLoop, window::WindowBuilder};
+extern crate winit;
 
 fn main() {
-    let event_loop = EventLoop::new();
-    let window = WindowBuilder::new().build(&event_loop).unwrap();
-
-    dbg!(window.available_monitors());
-    dbg!(window.primary_monitor());
+    let event_loop = winit::EventsLoop::new();
+    let window = winit::WindowBuilder::new().build(&event_loop).unwrap();
+    println!("{:#?}\nPrimary: {:#?}", window.get_available_monitors(), window.get_primary_monitor());
 }

examples/multithreaded.rs

@@ -1,141 +0,0 @@
-extern crate env_logger;
-use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
-
-use winit::{
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::{CursorIcon, WindowBuilder},
-};
-
-const WINDOW_COUNT: usize = 3;
-const WINDOW_SIZE: (u32, u32) = (600, 400);
-
-fn main() {
-    env_logger::init();
-    let event_loop = EventLoop::new();
-    let mut window_senders = HashMap::with_capacity(WINDOW_COUNT);
-    for _ in 0..WINDOW_COUNT {
-        let window = WindowBuilder::new()
-            .with_inner_size(WINDOW_SIZE.into())
-            .build(&event_loop)
-            .unwrap();
-        let (tx, rx) = mpsc::channel();
-        window_senders.insert(window.id(), tx);
-        thread::spawn(move || {
-            while let Ok(event) = rx.recv() {
-                match event {
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                state: ElementState::Released,
-                                virtual_keycode: Some(key),
-                                modifiers,
-                                ..
-                            },
-                        ..
-                    } => {
-                        window.set_title(&format!("{:?}", key));
-                        let state = !modifiers.shift;
-                        use self::VirtualKeyCode::*;
-                        match key {
-                            A => window.set_always_on_top(state),
-                            C => {
-                                window.set_cursor_icon(match state {
-                                    true => CursorIcon::Progress,
-                                    false => CursorIcon::Default,
-                                })
-                            },
-                            D => window.set_decorations(!state),
-                            F => {
-                                window.set_fullscreen(match state {
-                                    true => Some(window.current_monitor()),
-                                    false => None,
-                                })
-                            },
-                            G => window.set_cursor_grab(state).unwrap(),
-                            H => window.set_cursor_visible(!state),
-                            I => {
-                                println!("Info:");
-                                println!("-> outer_position : {:?}", window.outer_position());
-                                println!("-> inner_position : {:?}", window.inner_position());
-                                println!("-> outer_size     : {:?}", window.outer_size());
-                                println!("-> inner_size     : {:?}", window.inner_size());
-                            },
-                            L => {
-                                window.set_min_inner_size(match state {
-                                    true => Some(WINDOW_SIZE.into()),
-                                    false => None,
-                                })
-                            },
-                            M => window.set_maximized(state),
-                            P => {
-                                window.set_outer_position({
-                                    let mut position = window.outer_position().unwrap();
-                                    let sign = if state { 1.0 } else { -1.0 };
-                                    position.x += 10.0 * sign;
-                                    position.y += 10.0 * sign;
-                                    position
-                                })
-                            },
-                            Q => window.request_redraw(),
-                            R => window.set_resizable(state),
-                            S => {
-                                window.set_inner_size(
-                                    match state {
-                                        true => (WINDOW_SIZE.0 + 100, WINDOW_SIZE.1 + 100),
-                                        false => WINDOW_SIZE,
-                                    }
-                                    .into(),
-                                )
-                            },
-                            W => {
-                                window
-                                    .set_cursor_position(
-                                        (WINDOW_SIZE.0 as i32 / 2, WINDOW_SIZE.1 as i32 / 2).into(),
-                                    )
-                                    .unwrap()
-                            },
-                            Z => {
-                                window.set_visible(false);
-                                thread::sleep(Duration::from_secs(1));
-                                window.set_visible(true);
-                            },
-                            _ => (),
-                        }
-                    },
-                    _ => (),
-                }
-            }
-        });
-    }
-    event_loop.run(move |event, _event_loop, control_flow| {
-        *control_flow = match !window_senders.is_empty() {
-            true => ControlFlow::Wait,
-            false => ControlFlow::Exit,
-        };
-        match event {
-            Event::WindowEvent { event, window_id } => {
-                match event {
-                    WindowEvent::CloseRequested
-                    | WindowEvent::Destroyed
-                    | WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(VirtualKeyCode::Escape),
-                                ..
-                            },
-                        ..
-                    } => {
-                        window_senders.remove(&window_id);
-                    },
-                    _ => {
-                        if let Some(tx) = window_senders.get(&window_id) {
-                            tx.send(event).unwrap();
-                        }
-                    },
-                }
-            },
-            _ => (),
-        }
-    })
-}

examples/multiwindow.rs

@@ -1,49 +1,33 @@
+extern crate winit;
+
 use std::collections::HashMap;
-use winit::{
-    event::{ElementState, Event, KeyboardInput, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::Window,
-};
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
     let mut windows = HashMap::new();
     for _ in 0..3 {
-        let window = Window::new(&event_loop).unwrap();
+        let window = winit::Window::new(&events_loop).unwrap();
         windows.insert(window.id(), window);
     }
 
-    event_loop.run(move |event, event_loop, control_flow| {
-        *control_flow = ControlFlow::Wait;
+    events_loop.run_forever(|event| {
         match event {
-            Event::WindowEvent { event, window_id } => {
-                match event {
-                    WindowEvent::CloseRequested => {
-                        println!("Window {:?} has received the signal to close", window_id);
+            winit::Event::WindowEvent {
+                event: winit::WindowEvent::CloseRequested,
+                window_id,
+            } => {
+                println!("Window {:?} has received the signal to close", window_id);
 
-                        // This drops the window, causing it to close.
-                        windows.remove(&window_id);
+                // This drops the window, causing it to close.
+                windows.remove(&window_id);
 
-                        if windows.is_empty() {
-                            *control_flow = ControlFlow::Exit;
-                        }
-                    },
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                state: ElementState::Pressed,
-                                ..
-                            },
-                        ..
-                    } => {
-                        let window = Window::new(&event_loop).unwrap();
-                        windows.insert(window.id(), window);
-                    },
-                    _ => (),
+                if windows.is_empty() {
+                    return winit::ControlFlow::Break;
                 }
-            },
+            }
             _ => (),
         }
+        winit::ControlFlow::Continue
     })
 }

examples/proxy.rs

@@ -1,37 +1,29 @@
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
 
 fn main() {
-    let event_loop: EventLoop<i32> = EventLoop::new_user_event();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let _window = WindowBuilder::new()
+    let _window = winit::WindowBuilder::new()
         .with_title("A fantastic window!")
-        .build(&event_loop)
+        .build(&events_loop)
         .unwrap();
 
-    let proxy = event_loop.create_proxy();
+    let proxy = events_loop.create_proxy();
 
     std::thread::spawn(move || {
-        let mut counter = 0;
-        // Wake up the `event_loop` once every second.
+        // Wake up the `events_loop` once every second.
         loop {
             std::thread::sleep(std::time::Duration::from_secs(1));
-            proxy.send_event(counter).unwrap();
-            counter += 1;
+            proxy.wakeup().unwrap();
         }
     });
 
-    event_loop.run(move |event, _, control_flow| {
+    events_loop.run_forever(|event| {
         println!("{:?}", event);
         match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } =>
+                winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }

examples/request_redraw.rs

@@ -1,32 +0,0 @@
-use std::time::{Duration, Instant};
-
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    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| {
-        println!("{:?}", event);
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            Event::EventsCleared => {
-                window.request_redraw();
-                *control_flow = ControlFlow::WaitUntil(Instant::now() + Duration::new(1, 0))
-            },
-            _ => (),
-        }
-    });
-}

examples/resizable.rs

@@ -1,44 +1,38 @@
-use winit::{
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
     let mut resizable = false;
 
-    let window = WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("Hit space to toggle resizability.")
-        .with_inner_size((400, 200).into())
+        .with_dimensions((400, 200).into())
         .with_resizable(resizable)
-        .build(&event_loop)
+        .build(&events_loop)
         .unwrap();
 
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
+    events_loop.run_forever(|event| {
         match event {
-            Event::WindowEvent { event, .. } => {
-                match event {
-                    WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(VirtualKeyCode::Space),
-                                state: ElementState::Released,
-                                ..
-                            },
-                        ..
-                    } => {
-                        resizable = !resizable;
-                        println!("Resizable: {}", resizable);
-                        window.set_resizable(resizable);
-                    },
-                    _ => (),
+            winit::Event::WindowEvent { event, .. } => match event {
+                winit::WindowEvent::CloseRequested => return winit::ControlFlow::Break,
+                winit::WindowEvent::KeyboardInput {
+                    input:
+                        winit::KeyboardInput {
+                            virtual_keycode: Some(winit::VirtualKeyCode::Space),
+                            state: winit::ElementState::Released,
+                            ..
+                        },
+                    ..
+                } => {
+                    resizable = !resizable;
+                    println!("Resizable: {}", resizable);
+                    window.set_resizable(resizable);
                 }
+                _ => (),
             },
             _ => (),
         };
+        winit::ControlFlow::Continue
     });
 }

examples/timer.rs

@@ -1,36 +0,0 @@
-use std::time::{Duration, Instant};
-use winit::{
-    event::{Event, StartCause, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
-
-fn main() {
-    let event_loop = EventLoop::new();
-
-    let _window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .build(&event_loop)
-        .unwrap();
-
-    let timer_length = Duration::new(1, 0);
-
-    event_loop.run(move |event, _, control_flow| {
-        println!("{:?}", event);
-
-        match event {
-            Event::NewEvents(StartCause::Init) => {
-                *control_flow = ControlFlow::WaitUntil(Instant::now() + timer_length)
-            },
-            Event::NewEvents(StartCause::ResumeTimeReached { .. }) => {
-                *control_flow = ControlFlow::WaitUntil(Instant::now() + timer_length);
-                println!("\nTimer\n");
-            },
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            _ => (),
-        }
-    });
-}

examples/transparent.rs

@@ -1,29 +1,20 @@
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let window = WindowBuilder::new()
-        .with_decorations(false)
-        .with_transparent(true)
-        .build(&event_loop)
-        .unwrap();
+    let window = winit::WindowBuilder::new().with_decorations(false)
+                                                 .with_transparency(true)
+                                                 .build(&events_loop).unwrap();
 
     window.set_title("A fantastic window!");
 
-    event_loop.run(move |event, _, control_flow| {
+    events_loop.run_forever(|event| {
         println!("{:?}", event);
 
         match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }

examples/video_modes.rs

@@ -1,12 +0,0 @@
-use winit::event_loop::EventLoop;
-
-fn main() {
-    let event_loop = EventLoop::new();
-    let monitor = event_loop.primary_monitor();
-
-    println!("Listing available video modes:");
-
-    for mode in monitor.video_modes() {
-        println!("{:?}", mode);
-    }
-}

examples/window.rs

@@ -1,26 +1,22 @@
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
+extern crate winit;
 
 fn main() {
-    let event_loop = EventLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let window = WindowBuilder::new()
+    let _window = winit::WindowBuilder::new()
         .with_title("A fantastic window!")
-        .build(&event_loop)
+        .build(&events_loop)
         .unwrap();
 
-    event_loop.run(move |event, _, control_flow| {
+    events_loop.run_forever(|event| {
         println!("{:?}", event);
 
         match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            winit::Event::WindowEvent {
+                event: winit::WindowEvent::CloseRequested,
+                ..
+            } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }

examples/window_icon.rs

@@ -1,65 +1,94 @@
-extern crate image;
-use std::path::Path;
-use winit::{
-    event::Event,
-    event_loop::{ControlFlow, EventLoop},
-    window::{Icon, WindowBuilder},
-};
+// Heads up: you need to compile this example with `--features icon_loading`.
+// `Icon::from_path` won't be available otherwise, though for your own applications, you could use
+// `Icon::from_rgba` if you don't want to depend on the `image` crate.
 
+extern crate winit;
+#[cfg(feature = "icon_loading")]
+extern crate image;
+
+#[cfg(feature = "icon_loading")]
 fn main() {
+    use winit::Icon;
     // You'll have to choose an icon size at your own discretion. On X11, the desired size varies
     // by WM, and on Windows, you still have to account for screen scaling. Here we use 32px,
     // since it seems to work well enough in most cases. Be careful about going too high, or
     // you'll be bitten by the low-quality downscaling built into the WM.
     let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
+    // While `Icon::from_path` is the most straightforward, you have a few other options. If you
+    // want to use the `include_bytes` macro, then pass the result to `Icon::from_bytes`. See the
+    // docs for the full list of options (you'll have to generate the docs with the `icon_loading`
+    // feature enabled).
+    let icon = Icon::from_path(path).expect("Failed to open icon");
 
-    let (icon_rgba, icon_width, icon_height) = {
-        let image = image::open(path).expect("Failed to open icon path");
-        use image::{GenericImageView, Pixel};
-        let (width, height) = image.dimensions();
-        let mut rgba = Vec::with_capacity((width * height) as usize * 4);
-        for (_, _, pixel) in image.pixels() {
-            rgba.extend_from_slice(&pixel.to_rgba().data);
-        }
-        (rgba, width, height)
-    };
-    let icon = Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon");
+    let mut events_loop = winit::EventsLoop::new();
 
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("An iconic window!")
         // At present, this only does anything on Windows and X11, so if you want to save load
         // time, you can put icon loading behind a function that returns `None` on other platforms.
         .with_window_icon(Some(icon))
-        .build(&event_loop)
+        .build(&events_loop)
         .unwrap();
 
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-        if let Event::WindowEvent { event, .. } = event {
-            use winit::event::WindowEvent::*;
+    events_loop.run_forever(|event| {
+        if let winit::Event::WindowEvent { event, .. } = event {
+            use winit::WindowEvent::*;
             match event {
-                CloseRequested => *control_flow = ControlFlow::Exit,
+                CloseRequested => return winit::ControlFlow::Break,
                 DroppedFile(path) => {
-                    window.set_window_icon(Some(load_icon(&path)));
+                    use image::GenericImageView;
+
+                    let icon_image = image::open(path).expect("Failed to open window icon");
+
+                    let (width, height) = icon_image.dimensions();
+                    const DESIRED_SIZE: u32 = 32;
+                    let (new_width, new_height) = if width == height {
+                        (DESIRED_SIZE, DESIRED_SIZE)
+                    } else {
+                        // Note that this will never divide by zero, due to the previous condition.
+                        let aspect_adjustment = DESIRED_SIZE as f64
+                            / std::cmp::max(width, height) as f64;
+                        (
+                            (width as f64 * aspect_adjustment) as u32,
+                            (height as f64 * aspect_adjustment) as u32,
+                        )
+                    };
+
+                    // By scaling the icon ourselves, we get higher-quality filtering and save
+                    // some memory.
+                    let icon = image::imageops::resize(
+                        &icon_image,
+                        new_width,
+                        new_height,
+                        image::FilterType::Lanczos3,
+                    );
+
+                    let (offset_x, offset_y) = (
+                        (DESIRED_SIZE - new_width) / 2,
+                        (DESIRED_SIZE - new_height) / 2,
+                    );
+
+                    let mut canvas = image::ImageBuffer::new(DESIRED_SIZE, DESIRED_SIZE);
+                    image::imageops::replace(
+                        &mut canvas,
+                        &icon,
+                        offset_x,
+                        offset_y,
+                    );
+
+                    window.set_window_icon(Some(canvas.into()));
                 },
                 _ => (),
             }
         }
+        winit::ControlFlow::Continue
     });
 }
 
-fn load_icon(path: &Path) -> Icon {
-    let (icon_rgba, icon_width, icon_height) = {
-        let image = image::open(path).expect("Failed to open icon path");
-        use image::{GenericImageView, Pixel};
-        let (width, height) = image.dimensions();
-        let mut rgba = Vec::with_capacity((width * height) as usize * 4);
-        for (_, _, pixel) in image.pixels() {
-            rgba.extend_from_slice(&pixel.to_rgba().data);
-        }
-        (rgba, width, height)
-    };
-    Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+#[cfg(not(feature = "icon_loading"))]
+fn main() {
+    print!(
+r#"This example requires the `icon_loading` feature:
+    cargo run --example window_icon --features icon_loading
+"#);
 }

examples/window_run_return.rs

@@ -1,45 +0,0 @@
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    platform::desktop::EventLoopExtDesktop,
-    window::WindowBuilder,
-};
-
-fn main() {
-    let mut event_loop = EventLoop::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 _window_2 = WindowBuilder::new()
-        .with_title("A second, fantasticer window!")
-        .build(&event_loop)
-        .unwrap();
-
-    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,
-        }
-    });
-
-    println!("Okay we're done now for real.");
-}

rustfmt.toml

@@ -1,7 +0,0 @@
-merge_imports=true
-match_block_trailing_comma=true
-force_explicit_abi=true
-format_macro_matchers=true
-use_field_init_shorthand=true
-format_code_in_doc_comments=true
-force_multiline_blocks=true

src/dpi.rs

@@ -1,3 +1,4 @@
+
 //! DPI is important, so read the docs for this module if you don't want to be confused.
 //!
 //! Originally, `winit` dealt entirely in physical pixels (excluding unintentional inconsistencies), but now all
@@ -32,10 +33,10 @@
 //!   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
+//!   [`MonitorId::get_hidpi_factor`](../struct.MonitorId.html#method.get_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
-//!   to `window.current_monitor().hidpi_factor()`.
+//!   [`Window::get_hidpi_factor`](../struct.Window.html#method.get_hidpi_factor), which is roughly equivalent
+//!   to `window.get_current_monitor().get_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,
@@ -58,9 +59,9 @@
 //!
 //! 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`](../enum.WindowEvent.html#variant.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`](../enum.WindowEvent.html#variant.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.

src/error.rs

@@ -1,82 +0,0 @@
-use std::{error, fmt};
-
-use crate::platform_impl;
-
-/// An error whose cause it outside Winit's control.
-#[derive(Debug)]
-pub enum ExternalError {
-    /// The operation is not supported by the backend.
-    NotSupported(NotSupportedError),
-    /// The OS cannot perform the operation.
-    Os(OsError),
-}
-
-/// The error type for when the requested operation is not supported by the backend.
-#[derive(Clone)]
-pub struct NotSupportedError {
-    _marker: (),
-}
-
-/// The error type for when the OS cannot perform the requested operation.
-#[derive(Debug)]
-pub struct OsError {
-    line: u32,
-    file: &'static str,
-    error: platform_impl::OsError,
-}
-
-impl NotSupportedError {
-    #[inline]
-    #[allow(dead_code)]
-    pub(crate) fn new() -> NotSupportedError {
-        NotSupportedError { _marker: () }
-    }
-}
-
-impl OsError {
-    #[allow(dead_code)]
-    pub(crate) fn new(line: u32, file: &'static str, error: platform_impl::OsError) -> OsError {
-        OsError { line, file, error }
-    }
-}
-
-#[allow(unused_macros)]
-macro_rules! os_error {
-    ($error:expr) => {{
-        crate::error::OsError::new(line!(), file!(), $error)
-    }};
-}
-
-impl fmt::Display for OsError {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        formatter.pad(&format!(
-            "os error at {}:{}: {}",
-            self.file, self.line, self.error
-        ))
-    }
-}
-
-impl fmt::Display for ExternalError {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        match self {
-            ExternalError::NotSupported(e) => e.fmt(formatter),
-            ExternalError::Os(e) => e.fmt(formatter),
-        }
-    }
-}
-
-impl fmt::Debug for NotSupportedError {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        formatter.debug_struct("NotSupportedError").finish()
-    }
-}
-
-impl fmt::Display for NotSupportedError {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        formatter.pad("the requested operation is not supported by Winit")
-    }
-}
-
-impl error::Error for OsError {}
-impl error::Error for ExternalError {}
-impl error::Error for NotSupportedError {}

src/event_loop.rs

@@ -1,212 +0,0 @@
-//! The `EventLoop` struct and assorted supporting types, including `ControlFlow`.
-//!
-//! If you want to send custom events to the event loop, use [`EventLoop::create_proxy()`][create_proxy]
-//! to acquire an [`EventLoopProxy`][event_loop_proxy] and call its [`send_event`][send_event] method.
-//!
-//! 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
-use std::{error, fmt, ops::Deref, time::Instant};
-
-use crate::{
-    event::Event,
-    monitor::{AvailableMonitorsIter, MonitorHandle},
-    platform_impl,
-};
-
-/// Provides a way to retrieve events from the system and from the windows that were registered to
-/// the events loop.
-///
-/// An `EventLoop` can be seen more or less as a "context". Calling `EventLoop::new()`
-/// initializes everything that will be required to create windows. For example on Linux creating
-/// an events loop opens a connection to the X or Wayland server.
-///
-/// To wake up an `EventLoop` from a another thread, see the `EventLoopProxy` docs.
-///
-/// Note that the `EventLoop` cannot be shared across threads (due to platform-dependant logic
-/// forbidding it), as such it is neither `Send` nor `Sync`. If you need cross-thread access, the
-/// `Window` created from this `EventLoop` _can_ be sent to an other thread, and the
-/// `EventLoopProxy` allows you to wake up an `EventLoop` from an other thread.
-pub struct EventLoop<T: 'static> {
-    pub(crate) event_loop: platform_impl::EventLoop<T>,
-    pub(crate) _marker: ::std::marker::PhantomData<*mut ()>, // Not Send nor Sync
-}
-
-/// Target that associates windows with an `EventLoop`.
-///
-/// This type exists to allow you to create new windows while Winit executes your callback.
-/// `EventLoop` will coerce into this type, so functions that take this as a parameter can also
-/// take `&EventLoop`.
-pub struct EventLoopWindowTarget<T: 'static> {
-    pub(crate) p: platform_impl::EventLoopWindowTarget<T>,
-    pub(crate) _marker: ::std::marker::PhantomData<*mut ()>, // Not Send nor Sync
-}
-
-impl<T> fmt::Debug for EventLoop<T> {
-    fn fmt(&self, fmtr: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmtr.pad("EventLoop { .. }")
-    }
-}
-
-impl<T> fmt::Debug for EventLoopWindowTarget<T> {
-    fn fmt(&self, fmtr: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmtr.pad("EventLoopWindowTarget { .. }")
-    }
-}
-
-/// Set by the user callback given to the `EventLoop::run` method.
-///
-/// Indicates the desired behavior of the event loop after [`Event::EventsCleared`][events_cleared]
-/// is emitted. Defaults to `Poll`.
-///
-/// ## Persistency
-/// Almost every change is persistent between multiple calls to the event loop closure within a
-/// given run loop. The only exception to this is `Exit` which, once set, cannot be unset. Changes
-/// 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
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum ControlFlow {
-    /// When the current loop iteration finishes, immediately begin a new iteration regardless of
-    /// whether or not new events are available to process.
-    Poll,
-    /// When the current loop iteration finishes, suspend the thread until another event arrives.
-    Wait,
-    /// When the current loop iteration finishes, suspend the thread until either another event
-    /// arrives or the given time is reached.
-    WaitUntil(Instant),
-    /// Send a `LoopDestroyed` event and stop the event loop. This variant is *sticky* - once set,
-    /// `control_flow` cannot be changed from `Exit`, and any future attempts to do so will result
-    /// in the `control_flow` parameter being reset to `Exit`.
-    Exit,
-}
-
-impl Default for ControlFlow {
-    #[inline(always)]
-    fn default() -> ControlFlow {
-        ControlFlow::Poll
-    }
-}
-
-impl EventLoop<()> {
-    /// Builds a new event loop with a `()` as the user event type.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **iOS:** Can only be called on the main thread.
-    pub fn new() -> EventLoop<()> {
-        EventLoop::<()>::new_user_event()
-    }
-}
-
-impl<T> EventLoop<T> {
-    /// Builds a new event loop.
-    ///
-    /// Usage will result in display backend initialisation, this can be controlled on linux
-    /// using an environment variable `WINIT_UNIX_BACKEND`. Legal values are `x11` and `wayland`.
-    /// If it is not set, winit will try to connect to a wayland connection, and if it fails will
-    /// fallback on x11. If this variable is set with any other value, winit will panic.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **iOS:** Can only be called on the main thread.
-    pub fn new_user_event() -> EventLoop<T> {
-        EventLoop {
-            event_loop: platform_impl::EventLoop::new(),
-            _marker: ::std::marker::PhantomData,
-        }
-    }
-
-    /// Hijacks the calling thread and initializes the `winit` event loop with the provided
-    /// closure. Since the closure is `'static`, it must be a `move` closure if it needs to
-    /// access any data from the calling context.
-    ///
-    /// See the [`ControlFlow`] docs for information on how changes to `&mut ControlFlow` impact the
-    /// event loop's behavior.
-    ///
-    /// Any values not passed to this function will *not* be dropped.
-    ///
-    /// [`ControlFlow`]: ./enum.ControlFlow.html
-    #[inline]
-    pub fn run<F>(self, event_handler: F) -> !
-    where
-        F: 'static + FnMut(Event<T>, &EventLoopWindowTarget<T>, &mut ControlFlow),
-    {
-        self.event_loop.run(event_handler)
-    }
-
-    /// Creates an `EventLoopProxy` that can be used to dispatch user events to the main event loop.
-    pub fn create_proxy(&self) -> EventLoopProxy<T> {
-        EventLoopProxy {
-            event_loop_proxy: self.event_loop.create_proxy(),
-        }
-    }
-
-    /// Returns the list of all the monitors available on the system.
-    #[inline]
-    pub fn available_monitors(&self) -> impl Iterator<Item = MonitorHandle> {
-        let data = self.event_loop.available_monitors();
-        AvailableMonitorsIter {
-            data: data.into_iter(),
-        }
-    }
-
-    /// Returns the primary monitor of the system.
-    #[inline]
-    pub fn primary_monitor(&self) -> MonitorHandle {
-        MonitorHandle {
-            inner: self.event_loop.primary_monitor(),
-        }
-    }
-}
-
-impl<T> Deref for EventLoop<T> {
-    type Target = EventLoopWindowTarget<T>;
-    fn deref(&self) -> &EventLoopWindowTarget<T> {
-        self.event_loop.window_target()
-    }
-}
-
-/// Used to send custom events to `EventLoop`.
-#[derive(Clone)]
-pub struct EventLoopProxy<T: 'static> {
-    event_loop_proxy: platform_impl::EventLoopProxy<T>,
-}
-
-impl<T: 'static> EventLoopProxy<T> {
-    /// Send an event to the `EventLoop` from which this proxy was created. This emits a
-    /// `UserEvent(event)` event in the event loop, where `event` is the value passed to this
-    /// function.
-    ///
-    /// Returns an `Err` if the associated `EventLoop` no longer exists.
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
-        self.event_loop_proxy.send_event(event)
-    }
-}
-
-impl<T: 'static> fmt::Debug for EventLoopProxy<T> {
-    fn fmt(&self, fmtr: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmtr.pad("EventLoopProxy { .. }")
-    }
-}
-
-/// 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;
-
-impl fmt::Display for EventLoopClosed {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", error::Error::description(self))
-    }
-}
-
-impl error::Error for EventLoopClosed {
-    fn description(&self) -> &str {
-        "Tried to wake up a closed `EventLoop`"
-    }
-}

src/events.rs

@@ -1,89 +1,26 @@
-//! The `Event` enum and assorted supporting types.
-//!
-//! 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
-use std::{path::PathBuf, time::Instant};
+use std::path::PathBuf;
 
-use crate::{
-    dpi::{LogicalPosition, LogicalSize},
-    platform_impl,
-    window::WindowId,
-};
+use {DeviceId, LogicalPosition, LogicalSize, WindowId};
 
 /// Describes a generic event.
 #[derive(Clone, Debug, PartialEq)]
-pub enum Event<T> {
-    /// Emitted when the OS sends an event to a winit window.
+pub enum Event {
     WindowEvent {
         window_id: WindowId,
         event: WindowEvent,
     },
-    /// Emitted when the OS sends an event to a device.
     DeviceEvent {
         device_id: DeviceId,
         event: DeviceEvent,
     },
-    /// Emitted when an event is sent from [`EventLoopProxy::send_event`](../event_loop/struct.EventLoopProxy.html#method.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,
+    Awakened,
 
-    /// 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.
-    LoopDestroyed,
-
-    /// Emitted when the application has been suspended or resumed.
+    /// The application has been suspended or resumed.
     ///
     /// The parameter is true if app was suspended, and false if it has been resumed.
     Suspended(bool),
 }
 
-impl<T> Event<T> {
-    pub fn map_nonuser_event<U>(self) -> Result<Event<U>, Event<T>> {
-        use self::Event::*;
-        match self {
-            UserEvent(_) => Err(self),
-            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),
-            LoopDestroyed => Ok(LoopDestroyed),
-            Suspended(suspended) => Ok(Suspended(suspended)),
-        }
-    }
-}
-
-/// Describes the reason the event loop is resuming.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum StartCause {
-    /// Sent if the time specified by `ControlFlow::WaitUntil` has been reached. Contains the
-    /// moment the timeout was requested and the requested resume time. The actual resume time is
-    /// guaranteed to be equal to or after the requested resume time.
-    ResumeTimeReached {
-        start: Instant,
-        requested_resume: Instant,
-    },
-
-    /// Sent if the OS has new events to send to the window, after a wait was requested. Contains
-    /// the moment the wait was requested and the resume time, if requested.
-    WaitCancelled {
-        start: Instant,
-        requested_resume: Option<Instant>,
-    },
-
-    /// Sent if the event loop is being resumed after the loop's control flow was set to
-    /// `ControlFlow::Poll`.
-    Poll,
-
-    /// Sent once, immediately after `run` is called. Indicates that the loop was just initialized.
-    Init,
-}
-
 /// Describes an event from a `Window`.
 #[derive(Clone, Debug, PartialEq)]
 pub enum WindowEvent {
@@ -100,19 +37,19 @@ pub enum WindowEvent {
     Destroyed,
 
     /// A file has been dropped into the window.
-    ///
+    /// 
     /// When the user drops multiple files at once, this event will be emitted for each file
     /// separately.
     DroppedFile(PathBuf),
 
     /// A file is being hovered over the window.
-    ///
+    /// 
     /// When the user hovers multiple files at once, this event will be emitted for each file
     /// separately.
     HoveredFile(PathBuf),
 
     /// A file was hovered, but has exited the window.
-    ///
+    /// 
     /// There will be a single `HoveredFileCancelled` event triggered even if multiple files were
     /// hovered.
     HoveredFileCancelled,
@@ -126,10 +63,7 @@ pub enum WindowEvent {
     Focused(bool),
 
     /// An event from the keyboard has been received.
-    KeyboardInput {
-        device_id: DeviceId,
-        input: KeyboardInput,
-    },
+    KeyboardInput { device_id: DeviceId, input: KeyboardInput },
 
     /// The cursor has moved on the window.
     CursorMoved {
@@ -139,7 +73,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,
-        modifiers: ModifiersState,
+        modifiers: ModifiersState
     },
 
     /// The cursor has entered the window.
@@ -149,41 +83,24 @@ pub enum WindowEvent {
     CursorLeft { device_id: DeviceId },
 
     /// A mouse wheel movement or touchpad scroll occurred.
-    MouseWheel {
-        device_id: DeviceId,
-        delta: MouseScrollDelta,
-        phase: TouchPhase,
-        modifiers: ModifiersState,
-    },
+    MouseWheel { device_id: DeviceId, delta: MouseScrollDelta, phase: TouchPhase, modifiers: ModifiersState },
 
     /// An mouse button press has been received.
-    MouseInput {
-        device_id: DeviceId,
-        state: ElementState,
-        button: MouseButton,
-        modifiers: ModifiersState,
-    },
+    MouseInput { device_id: DeviceId, state: ElementState, button: MouseButton, modifiers: ModifiersState },
+
 
     /// Touchpad pressure event.
     ///
     /// At the moment, only supported on Apple forcetouch-capable macbooks.
     /// The parameters are: pressure level (value between 0 and 1 representing how hard the touchpad
     /// is being pressed) and stage (integer representing the click level).
-    TouchpadPressure {
-        device_id: DeviceId,
-        pressure: f32,
-        stage: i64,
-    },
+    TouchpadPressure { device_id: DeviceId, pressure: f32, stage: i64 },
 
     /// Motion on some analog axis. May report data redundant to other, more specific events.
-    AxisMotion {
-        device_id: DeviceId,
-        axis: AxisId,
-        value: f64,
-    },
+    AxisMotion { device_id: DeviceId, axis: AxisId, value: f64 },
 
-    /// The OS or application has requested that the window be redrawn.
-    RedrawRequested,
+    /// The window needs to be redrawn.
+    Refresh,
 
     /// Touch event has been received
     Touch(Touch),
@@ -200,25 +117,6 @@ pub enum WindowEvent {
     HiDpiFactorChanged(f64),
 }
 
-/// Identifier of an input device.
-///
-/// Whenever you receive an event arising from a particular input device, this event contains a `DeviceId` which
-/// identifies its origin. Note that devices may be virtual (representing an on-screen cursor and keyboard focus) or
-/// physical. Virtual devices typically aggregate inputs from multiple physical devices.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId(pub(crate) platform_impl::DeviceId);
-
-impl DeviceId {
-    /// Returns a dummy `DeviceId`, useful for unit testing. The only guarantee made about the return
-    /// value of this function is that it will always be equal to itself and to future values returned
-    /// by this function.  No other guarantees are made. This may be equal to a real `DeviceId`.
-    ///
-    /// **Passing this into a winit function will result in undefined behavior.**
-    pub unsafe fn dummy() -> Self {
-        DeviceId(platform_impl::DeviceId::dummy())
-    }
-}
-
 /// Represents raw hardware events that are not associated with any particular window.
 ///
 /// Useful for interactions that diverge significantly from a conventional 2D GUI, such as 3D camera or first-person
@@ -250,19 +148,11 @@ pub enum DeviceEvent {
     /// Motion on some analog axis.  This event will be reported for all arbitrary input devices
     /// that winit supports on this platform, including mouse devices.  If the device is a mouse
     /// device then this will be reported alongside the MouseMotion event.
-    Motion {
-        axis: AxisId,
-        value: f64,
-    },
+    Motion { axis: AxisId, value: f64 },
 
-    Button {
-        button: ButtonId,
-        state: ElementState,
-    },
+    Button { button: ButtonId, state: ElementState },
     Key(KeyboardInput),
-    Text {
-        codepoint: char,
-    },
+    Text { codepoint: char },
 }
 
 /// Describes a keyboard input event.
@@ -288,7 +178,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.
-    pub modifiers: ModifiersState,
+    pub modifiers: ModifiersState
 }
 
 /// Describes touch-screen input state.
@@ -298,7 +188,7 @@ pub enum TouchPhase {
     Started,
     Moved,
     Ended,
-    Cancelled,
+    Cancelled
 }
 
 /// Represents touch event
@@ -322,7 +212,7 @@ pub struct Touch {
     pub phase: TouchPhase,
     pub location: LogicalPosition,
     /// unique identifier of a finger.
-    pub id: u64,
+    pub id: u64
 }
 
 /// Hardware-dependent keyboard scan code.
@@ -356,19 +246,19 @@ pub enum MouseButton {
 #[derive(Debug, Clone, Copy, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum MouseScrollDelta {
-    /// Amount in lines or rows to scroll in the horizontal
-    /// and vertical directions.
-    ///
-    /// Positive values indicate movement forward
-    /// (away from the user) or rightwards.
-    LineDelta(f32, f32),
-    /// Amount in pixels to scroll in the horizontal and
-    /// vertical direction.
-    ///
-    /// Scroll events are expressed as a PixelDelta if
-    /// supported by the device (eg. a touchpad) and
-    /// platform.
-    PixelDelta(LogicalPosition),
+	/// Amount in lines or rows to scroll in the horizontal
+	/// and vertical directions.
+	///
+	/// Positive values indicate movement forward
+	/// (away from the user) or rightwards.
+	LineDelta(f32, f32),
+	/// Amount in pixels to scroll in the horizontal and
+	/// vertical direction.
+	///
+	/// Scroll events are expressed as a PixelDelta if
+	/// supported by the device (eg. a touchpad) and
+	/// platform.
+	PixelDelta(LogicalPosition),
 }
 
 /// Symbolic name for a keyboard key.
@@ -528,7 +418,7 @@ pub enum VirtualKeyCode {
     Multiply,
     Mute,
     MyComputer,
-    NavigateForward,  // also called "Prior"
+    NavigateForward, // also called "Prior"
     NavigateBackward, // also called "Next"
     NextTrack,
     NoConvert,
@@ -586,5 +476,5 @@ pub struct ModifiersState {
     /// The "logo" key
     ///
     /// This is the "windows" key on PC and "command" key on Mac.
-    pub logo: bool,
+    pub logo: bool
 }

src/icon.rs

@@ -1,4 +1,12 @@
-use std::{error::Error, fmt, mem};
+use std::{fmt, mem};
+use std::error::Error;
+#[cfg(feature = "icon_loading")]
+use std::io::{BufRead, Seek};
+#[cfg(feature = "icon_loading")]
+use std::path::Path;
+
+#[cfg(feature = "icon_loading")]
+use image;
 
 #[repr(C)]
 #[derive(Debug)]
@@ -16,7 +24,9 @@ pub(crate) const PIXEL_SIZE: usize = mem::size_of::<Pixel>();
 pub enum BadIcon {
     /// Produced when the length of the `rgba` argument isn't divisible by 4, thus `rgba` can't be
     /// safely interpreted as 32bpp RGBA pixels.
-    ByteCountNotDivisibleBy4 { byte_count: usize },
+    ByteCountNotDivisibleBy4 {
+        byte_count: usize,
+    },
     /// Produced when the number of pixels (`rgba.len() / 4`) isn't equal to `width * height`.
     /// At least one of your arguments is incorrect.
     DimensionsVsPixelCount {
@@ -28,7 +38,7 @@ pub enum BadIcon {
 }
 
 impl fmt::Display for BadIcon {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         let msg = match self {
             &BadIcon::ByteCountNotDivisibleBy4 { byte_count } => format!(
                 "The length of the `rgba` argument ({:?}) isn't divisible by 4, making it impossible to interpret as 32bpp RGBA pixels.",
@@ -53,13 +63,17 @@ impl Error for BadIcon {
         "A valid icon cannot be created from these arguments"
     }
 
-    fn cause(&self) -> Option<&dyn Error> {
+    fn cause(&self) -> Option<&Error> {
         Some(self)
     }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 /// An icon used for the window titlebar, taskbar, etc.
+///
+/// Enabling the `icon_loading` feature provides you with several convenience methods for creating
+/// an `Icon` from any format supported by the [image](https://github.com/PistonDevelopers/image)
+/// crate.
 pub struct Icon {
     pub(crate) rgba: Vec<u8>,
     pub(crate) width: u32,
@@ -73,9 +87,7 @@ impl Icon {
     /// `rgba.len() / 4`. Otherwise, this will return a `BadIcon` error.
     pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
         if rgba.len() % PIXEL_SIZE != 0 {
-            return Err(BadIcon::ByteCountNotDivisibleBy4 {
-                byte_count: rgba.len(),
-            });
+            return Err(BadIcon::ByteCountNotDivisibleBy4 { byte_count: rgba.len() });
         }
         let pixel_count = rgba.len() / PIXEL_SIZE;
         if pixel_count != (width * height) as usize {
@@ -86,11 +98,73 @@ impl Icon {
                 pixel_count,
             })
         } else {
-            Ok(Icon {
-                rgba,
-                width,
-                height,
-            })
+            Ok(Icon { rgba, width, height })
         }
     }
+
+    #[cfg(feature = "icon_loading")]
+    /// Loads an `Icon` from the path of an image on the filesystem.
+    ///
+    /// Requires the `icon_loading` feature.
+    pub fn from_path<P: AsRef<Path>>(path: P) -> image::ImageResult<Self> {
+        image::open(path).map(Into::into)
+    }
+
+    #[cfg(feature = "icon_loading")]
+    /// Loads an `Icon` from anything implementing `BufRead` and `Seek`.
+    ///
+    /// Requires the `icon_loading` feature.
+    pub fn from_reader<R: BufRead + Seek>(
+        reader: R,
+        format: image::ImageFormat,
+    ) -> image::ImageResult<Self> {
+        image::load(reader, format).map(Into::into)
+    }
+
+    #[cfg(feature = "icon_loading")]
+    /// Loads an `Icon` from the unprocessed bytes of an image file.
+    /// Uses heuristics to determine format.
+    ///
+    /// Requires the `icon_loading` feature.
+    pub fn from_bytes(bytes: &[u8]) -> image::ImageResult<Self> {
+        image::load_from_memory(bytes).map(Into::into)
+    }
+
+    #[cfg(feature = "icon_loading")]
+    /// Loads an `Icon` from the unprocessed bytes of an image.
+    ///
+    /// Requires the `icon_loading` feature.
+    pub fn from_bytes_with_format(
+        bytes: &[u8],
+        format: image::ImageFormat,
+    ) -> image::ImageResult<Self> {
+        image::load_from_memory_with_format(bytes, format).map(Into::into)
+    }
+}
+
+#[cfg(feature = "icon_loading")]
+/// Requires the `icon_loading` feature.
+impl From<image::DynamicImage> for Icon {
+    fn from(image: image::DynamicImage) -> Self {
+        use image::{GenericImageView, Pixel};
+        let (width, height) = image.dimensions();
+        let mut rgba = Vec::with_capacity((width * height) as usize * PIXEL_SIZE);
+        for (_, _, pixel) in image.pixels() {
+            rgba.extend_from_slice(&pixel.to_rgba().data);
+        }
+        Icon { rgba, width, height }
+    }
+}
+
+#[cfg(feature = "icon_loading")]
+/// Requires the `icon_loading` feature.
+impl From<image::RgbaImage> for Icon {
+    fn from(buf: image::RgbaImage) -> Self {
+        let (width, height) = buf.dimensions();
+        let mut rgba = Vec::with_capacity((width * height) as usize * PIXEL_SIZE);
+        for (_, _, pixel) in buf.enumerate_pixels() {
+            rgba.extend_from_slice(&pixel.data);
+        }
+        Icon { rgba, width, height }
+    }
 }

src/lib.rs

@@ -2,112 +2,542 @@
 //!
 //! # Building a window
 //!
-//! Before you can build a [`Window`], you first need to build an [`EventLoop`]. This is done with the
-//! [`EventLoop::new()`] function.
+//! Before you can build a window, you first need to build an `EventsLoop`. This is done with the
+//! `EventsLoop::new()` function. Example:
 //!
 //! ```no_run
-//! use winit::event_loop::EventLoop;
-//! let event_loop = EventLoop::new();
+//! use winit::EventsLoop;
+//! let events_loop = EventsLoop::new();
 //! ```
 //!
-//! Once this is done there are two ways to create a [`Window`]:
+//! Once this is done there are two ways to create a window:
 //!
-//!  - Calling [`Window::new(&event_loop)`][window_new].
-//!  - Calling [`let builder = WindowBuilder::new()`][window_builder_new] then [`builder.build(&event_loop)`][window_builder_build].
+//!  - Calling `Window::new(&events_loop)`.
+//!  - Calling `let builder = WindowBuilder::new()` then `builder.build(&events_loop)`.
 //!
 //! The first way is the simplest way and will give you default values for everything.
 //!
-//! The second way allows you to customize the way your [`Window`] will look and behave by modifying
-//! the fields of the [`WindowBuilder`] object before you create the [`Window`].
+//! The second way allows you to customize the way your window will look and behave by modifying
+//! the fields of the `WindowBuilder` object before you create the window.
 //!
-//! # Event handling
+//! # Events handling
 //!
-//! Once a [`Window`] has been created, it will *generate events*. For example whenever the user moves
-//! the [`Window`], resizes the [`Window`], moves the mouse, etc. an event is generated.
+//! Once a window has been created, it will *generate events*. For example whenever the user moves
+//! the window, resizes the window, moves the mouse, etc. an event is generated.
 //!
-//! The events generated by a [`Window`] can be retreived from the [`EventLoop`] the [`Window`] was created
+//! The events generated by a window can be retrieved from the `EventsLoop` the window was created
 //! with.
 //!
-//! You do this by calling [`event_loop.run(...)`][event_loop_run]. This function will run forever
-//! unless `control_flow` is set to [`ControlFlow`]`::`[`Exit`], at which point [`Event`]`::`[`LoopDestroyed`]
-//! is emitted and the entire program terminates.
+//! There are two ways to do so. The first is to call `events_loop.poll_events(...)`, which will
+//! retrieve all the events pending on the windows and immediately return after no new event is
+//! available. You usually want to use this method in application that render continuously on the
+//! screen, such as video games.
 //!
 //! ```no_run
-//! use winit::{
-//!     event::{Event, WindowEvent},
-//!     event_loop::ControlFlow,
-//! };
-//! # use winit::event_loop::EventLoop;
-//! # let event_loop = EventLoop::new();
+//! use winit::{Event, WindowEvent};
+//! use winit::dpi::LogicalSize;
+//! # use winit::EventsLoop;
+//! # let mut events_loop = EventsLoop::new();
 //!
-//! event_loop.run(move |event, _, control_flow| {
+//! loop {
+//!     events_loop.poll_events(|event| {
+//!         match event {
+//!             Event::WindowEvent {
+//!                 event: WindowEvent::Resized(LogicalSize { width, height }),
+//!                 ..
+//!             } => {
+//!                 println!("The window was resized to {}x{}", width, height);
+//!             },
+//!             _ => ()
+//!         }
+//!     });
+//! }
+//! ```
+//!
+//! The second way is to call `events_loop.run_forever(...)`. As its name tells, it will run
+//! forever unless it is stopped by returning `ControlFlow::Break`.
+//!
+//! ```no_run
+//! use winit::{ControlFlow, Event, WindowEvent};
+//! # use winit::EventsLoop;
+//! # let mut events_loop = EventsLoop::new();
+//!
+//! events_loop.run_forever(|event| {
 //!     match event {
-//!         Event::WindowEvent {
-//!             event: WindowEvent::CloseRequested,
-//!             ..
-//!         } => {
+//!         Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
 //!             println!("The close button was pressed; stopping");
-//!             *control_flow = ControlFlow::Exit
+//!             ControlFlow::Break
 //!         },
-//!         _ => *control_flow = ControlFlow::Wait,
+//!         _ => ControlFlow::Continue,
 //!     }
 //! });
 //! ```
 //!
-//! If you use multiple [`Window`]s, [`Event`]`::`[`WindowEvent`] has a member named `window_id`. You can
-//! compare it with the value returned by the [`id()`][window_id_fn] method of [`Window`] in order to know which
-//! [`Window`] has received the event.
+//! If you use multiple windows, the `WindowEvent` event has a member named `window_id`. You can
+//! compare it with the value returned by the `id()` method of `Window` in order to know which
+//! window has received the event.
 //!
 //! # Drawing on the window
 //!
-//! Winit doesn't provide any function that allows drawing on a [`Window`]. However it allows you to
-//! 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`].
+//! Winit doesn't provide any function that allows drawing on a window. However it allows you to
+//! retrieve the raw handle of the window (see the `os` module for that), 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.Event.html#variant.WindowEvent
-//! [`LoopDestroyed`]: ./event/enum.Event.html#variant.LoopDestroyed
-//! [`platform`]: ./platform/index.html
-
-#![deny(rust_2018_idioms)]
 
 #[allow(unused_imports)]
 #[macro_use]
 extern crate lazy_static;
+extern crate libc;
 #[macro_use]
 extern crate log;
+#[cfg(feature = "icon_loading")]
+extern crate image;
 #[cfg(feature = "serde")]
 #[macro_use]
 extern crate serde;
-#[macro_use]
+
 #[cfg(target_os = "windows")]
-extern crate derivative;
+extern crate winapi;
+#[cfg(target_os = "windows")]
+extern crate backtrace;
 #[macro_use]
 #[cfg(target_os = "windows")]
 extern crate bitflags;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[macro_use]
 extern crate objc;
+#[cfg(target_os = "macos")]
+extern crate cocoa;
+#[cfg(target_os = "macos")]
+extern crate core_foundation;
+#[cfg(target_os = "macos")]
+extern crate core_graphics;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+extern crate x11_dl;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+extern crate parking_lot;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+extern crate percent_encoding;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+extern crate smithay_client_toolkit as sctk;
+extern crate raw_window_handle;
+
+pub(crate) use dpi::*; // TODO: Actually change the imports throughout the codebase.
+pub use events::*;
+pub use window::{AvailableMonitorsIter, MonitorId};
+pub use icon::*;
 
 pub mod dpi;
-#[macro_use]
-pub mod error;
-pub mod event;
-pub mod event_loop;
+mod events;
 mod icon;
-pub mod monitor;
-mod platform_impl;
-pub mod window;
+mod platform;
+mod window;
 
-pub mod platform;
+pub mod os;
+
+/// Represents a window.
+///
+/// # Example
+///
+/// ```no_run
+/// use winit::{Event, EventsLoop, Window, WindowEvent, ControlFlow};
+///
+/// let mut events_loop = EventsLoop::new();
+/// let window = Window::new(&events_loop).unwrap();
+///
+/// events_loop.run_forever(|event| {
+///     match event {
+///         Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
+///             ControlFlow::Break
+///         },
+///         _ => ControlFlow::Continue,
+///     }
+/// });
+/// ```
+pub struct Window {
+    window: platform::Window,
+}
+
+impl std::fmt::Debug for Window {
+    fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result {
+        fmtr.pad("Window { .. }")
+    }
+}
+
+/// Identifier of a window. Unique for each window.
+///
+/// Can be obtained with `window.id()`.
+///
+/// Whenever you receive an event specific to a window, this event contains a `WindowId` which you
+/// can then compare to the ids of your windows.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(platform::WindowId);
+
+impl WindowId {
+    /// Returns a dummy `WindowId`, useful for unit testing. The only guarantee made about the return
+    /// value of this function is that it will always be equal to itself and to future values returned
+    /// by this function.  No other guarantees are made. This may be equal to a real `WindowId`.
+    ///
+    /// **Passing this into a winit function will result in undefined behavior.**
+    pub unsafe fn dummy() -> Self {
+        WindowId(platform::WindowId::dummy())
+    }
+}
+
+/// Identifier of an input device.
+///
+/// Whenever you receive an event arising from a particular input device, this event contains a `DeviceId` which
+/// identifies its origin. Note that devices may be virtual (representing an on-screen cursor and keyboard focus) or
+/// physical. Virtual devices typically aggregate inputs from multiple physical devices.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId(platform::DeviceId);
+
+impl DeviceId {
+    /// Returns a dummy `DeviceId`, useful for unit testing. The only guarantee made about the return
+    /// value of this function is that it will always be equal to itself and to future values returned
+    /// by this function.  No other guarantees are made. This may be equal to a real `DeviceId`.
+    ///
+    /// **Passing this into a winit function will result in undefined behavior.**
+    pub unsafe fn dummy() -> Self {
+        DeviceId(platform::DeviceId::dummy())
+    }
+}
+
+/// Provides a way to retrieve events from the system and from the windows that were registered to
+/// the events loop.
+///
+/// An `EventsLoop` can be seen more or less as a "context". Calling `EventsLoop::new()`
+/// initializes everything that will be required to create windows. For example on Linux creating
+/// an events loop opens a connection to the X or Wayland server.
+///
+/// To wake up an `EventsLoop` from a another thread, see the `EventsLoopProxy` docs.
+///
+/// Note that the `EventsLoop` cannot be shared accross threads (due to platform-dependant logic
+/// forbiding it), as such it is neither `Send` nor `Sync`. If you need cross-thread access, the
+/// `Window` created from this `EventsLoop` _can_ be sent to an other thread, and the
+/// `EventsLoopProxy` allows you to wakeup an `EventsLoop` from an other thread.
+pub struct EventsLoop {
+    events_loop: platform::EventsLoop,
+    _marker: ::std::marker::PhantomData<*mut ()> // Not Send nor Sync
+}
+
+impl std::fmt::Debug for EventsLoop {
+    fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result {
+        fmtr.pad("EventsLoop { .. }")
+    }
+}
+
+/// Returned by the user callback given to the `EventsLoop::run_forever` method.
+///
+/// Indicates whether the `run_forever` method should continue or complete.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum ControlFlow {
+    /// Continue looping and waiting for events.
+    Continue,
+    /// Break from the event loop.
+    Break,
+}
+
+impl EventsLoop {
+    /// Builds a new events loop.
+    ///
+    /// Usage will result in display backend initialisation, this can be controlled on linux
+    /// using an environment variable `WINIT_UNIX_BACKEND`. Legal values are `x11` and `wayland`.
+    /// If it is not set, winit will try to connect to a wayland connection, and if it fails will
+    /// fallback on x11. If this variable is set with any other value, winit will panic.
+    pub fn new() -> EventsLoop {
+        EventsLoop {
+            events_loop: platform::EventsLoop::new(),
+            _marker: ::std::marker::PhantomData,
+        }
+    }
+
+    /// Returns the list of all the monitors available on the system.
+    ///
+    // Note: should be replaced with `-> impl Iterator` once stable.
+    #[inline]
+    pub fn get_available_monitors(&self) -> AvailableMonitorsIter {
+        let data = self.events_loop.get_available_monitors();
+        AvailableMonitorsIter{ data: data.into_iter() }
+    }
+
+    /// Returns the primary monitor of the system.
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId { inner: self.events_loop.get_primary_monitor() }
+    }
+
+    /// Fetches all the events that are pending, calls the callback function for each of them,
+    /// and returns.
+    #[inline]
+    pub fn poll_events<F>(&mut self, callback: F)
+        where F: FnMut(Event)
+    {
+        self.events_loop.poll_events(callback)
+    }
+
+    /// Calls `callback` every time an event is received. If no event is available, sleeps the
+    /// current thread and waits for an event. If the callback returns `ControlFlow::Break` then
+    /// `run_forever` will immediately return.
+    ///
+    /// # Danger!
+    ///
+    /// The callback is run after *every* event, so if its execution time is non-trivial the event queue may not empty
+    /// at a sufficient rate. Rendering in the callback with vsync enabled **will** cause significant lag.
+    #[inline]
+    pub fn run_forever<F>(&mut self, callback: F)
+        where F: FnMut(Event) -> ControlFlow
+    {
+        self.events_loop.run_forever(callback)
+    }
+
+    /// Creates an `EventsLoopProxy` that can be used to wake up the `EventsLoop` from another
+    /// thread.
+    pub fn create_proxy(&self) -> EventsLoopProxy {
+        EventsLoopProxy {
+            events_loop_proxy: self.events_loop.create_proxy(),
+        }
+    }
+}
+
+/// Used to wake up the `EventsLoop` from another thread.
+#[derive(Clone)]
+pub struct EventsLoopProxy {
+    events_loop_proxy: platform::EventsLoopProxy,
+}
+
+impl std::fmt::Debug for EventsLoopProxy {
+    fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result {
+        fmtr.pad("EventsLoopProxy { .. }")
+    }
+}
+
+impl EventsLoopProxy {
+    /// Wake up the `EventsLoop` from which this proxy was created.
+    ///
+    /// This causes the `EventsLoop` to emit an `Awakened` event.
+    ///
+    /// Returns an `Err` if the associated `EventsLoop` no longer exists.
+    pub fn wakeup(&self) -> Result<(), EventsLoopClosed> {
+        self.events_loop_proxy.wakeup()
+    }
+}
+
+/// The error that is returned when an `EventsLoopProxy` attempts to wake up an `EventsLoop` that
+/// no longer exists.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub struct EventsLoopClosed;
+
+impl std::fmt::Display for EventsLoopClosed {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", std::error::Error::description(self))
+    }
+}
+
+impl std::error::Error for EventsLoopClosed {
+    fn description(&self) -> &str {
+        "Tried to wake up a closed `EventsLoop`"
+    }
+}
+
+/// Object that allows you to build windows.
+#[derive(Clone)]
+pub struct WindowBuilder {
+    /// The attributes to use to create the window.
+    pub window: WindowAttributes,
+
+    // Platform-specific configuration. Private.
+    platform_specific: platform::PlatformSpecificWindowBuilderAttributes,
+}
+
+impl std::fmt::Debug for WindowBuilder {
+    fn fmt(&self, fmtr: &mut std::fmt::Formatter) -> std::fmt::Result {
+        fmtr.debug_struct("WindowBuilder")
+            .field("window", &self.window)
+            .finish()
+    }
+}
+
+/// Error that can happen while creating a window or a headless renderer.
+#[derive(Debug, Clone)]
+pub enum CreationError {
+    OsError(String),
+    /// TODO: remove this error
+    NotSupported,
+}
+
+impl CreationError {
+    fn to_string(&self) -> &str {
+        match *self {
+            CreationError::OsError(ref text) => &text,
+            CreationError::NotSupported => "Some of the requested attributes are not supported",
+        }
+    }
+}
+
+impl std::fmt::Display for CreationError {
+    fn fmt(&self, formatter: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
+        formatter.write_str(self.to_string())
+    }
+}
+
+impl std::error::Error for CreationError {
+    fn description(&self) -> &str {
+        self.to_string()
+    }
+}
+
+/// Describes the appearance of the mouse cursor.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum MouseCursor {
+    /// The platform-dependent default cursor.
+    Default,
+    /// A simple crosshair.
+    Crosshair,
+    /// A hand (often used to indicate links in web browsers).
+    Hand,
+    /// Self explanatory.
+    Arrow,
+    /// Indicates something is to be moved.
+    Move,
+    /// Indicates text that may be selected or edited.
+    Text,
+    /// Program busy indicator.
+    Wait,
+    /// Help indicator (often rendered as a "?")
+    Help,
+    /// Progress indicator. Shows that processing is being done. But in contrast
+    /// with "Wait" the user may still interact with the program. Often rendered
+    /// as a spinning beach ball, or an arrow with a watch or hourglass.
+    Progress,
+
+    /// Cursor showing that something cannot be done.
+    NotAllowed,
+    ContextMenu,
+    Cell,
+    VerticalText,
+    Alias,
+    Copy,
+    NoDrop,
+    Grab,
+    Grabbing,
+    AllScroll,
+    ZoomIn,
+    ZoomOut,
+
+    /// Indicate that some edge is to be moved. For example, the 'SeResize' cursor
+    /// is used when the movement starts from the south-east corner of the box.
+    EResize,
+    NResize,
+    NeResize,
+    NwResize,
+    SResize,
+    SeResize,
+    SwResize,
+    WResize,
+    EwResize,
+    NsResize,
+    NeswResize,
+    NwseResize,
+    ColResize,
+    RowResize,
+}
+
+impl Default for MouseCursor {
+    fn default() -> Self {
+        MouseCursor::Default
+    }
+}
+
+/// Attributes to use when creating a window.
+#[derive(Debug, Clone)]
+pub struct WindowAttributes {
+    /// The dimensions of the window. If this is `None`, some platform-specific dimensions will be
+    /// used.
+    ///
+    /// The default is `None`.
+    pub dimensions: Option<LogicalSize>,
+
+    /// The minimum dimensions a window can be, If this is `None`, the window will have no minimum dimensions (aside from reserved).
+    ///
+    /// The default is `None`.
+    pub min_dimensions: Option<LogicalSize>,
+
+    /// The maximum dimensions a window can be, If this is `None`, the maximum will have no maximum or will be set to the primary monitor's dimensions by the platform.
+    ///
+    /// The default is `None`.
+    pub max_dimensions: Option<LogicalSize>,
+
+    /// Whether the window is resizable or not.
+    ///
+    /// The default is `true`.
+    pub resizable: bool,
+
+    /// Whether the window should be set as fullscreen upon creation.
+    ///
+    /// The default is `None`.
+    pub fullscreen: Option<MonitorId>,
+
+    /// The title of the window in the title bar.
+    ///
+    /// The default is `"winit window"`.
+    pub title: String,
+
+    /// Whether the window should be maximized upon creation.
+    ///
+    /// The default is `false`.
+    pub maximized: bool,
+
+    /// Whether the window should be immediately visible upon creation.
+    ///
+    /// The default is `true`.
+    pub visible: bool,
+
+    /// Whether the the window should be transparent. If this is true, writing colors
+    /// with alpha values different than `1.0` will produce a transparent window.
+    ///
+    /// The default is `false`.
+    pub transparent: bool,
+
+    /// Whether the window should have borders and bars.
+    ///
+    /// The default is `true`.
+    pub decorations: bool,
+
+    /// Whether the window should always be on top of other windows.
+    ///
+    /// The default is `false`.
+    pub always_on_top: bool,
+
+    /// The window icon.
+    ///
+    /// The default is `None`.
+    pub window_icon: Option<Icon>,
+
+    /// [iOS only] Enable multitouch,
+    /// see [multipleTouchEnabled](https://developer.apple.com/documentation/uikit/uiview/1622519-multipletouchenabled)
+    pub multitouch: bool,
+}
+
+impl Default for WindowAttributes {
+    #[inline]
+    fn default() -> WindowAttributes {
+        WindowAttributes {
+            dimensions: None,
+            min_dimensions: None,
+            max_dimensions: None,
+            resizable: true,
+            title: "winit window".to_owned(),
+            maximized: false,
+            fullscreen: None,
+            visible: true,
+            transparent: false,
+            decorations: true,
+            always_on_top: false,
+            window_icon: None,
+            multitouch: false,
+        }
+    }
+}

src/monitor.rs

@@ -1,138 +0,0 @@
-//! 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]
-//! type. This is retreived from an [`AvailableMonitorsIter`][monitor_iter], which can be acquired
-//! with:
-//! - [`EventLoop::available_monitors`][loop_get]
-//! - [`Window::available_monitors`][window_get].
-//!
-//! [monitor_id]: ./struct.MonitorHandle.html
-//! [monitor_iter]: ./struct.AvailableMonitorsIter.html
-//! [loop_get]: ../event_loop/struct.EventLoop.html#method.available_monitors
-//! [window_get]: ../window/struct.Window.html#method.available_monitors
-use std::collections::vec_deque::IntoIter as VecDequeIter;
-
-use crate::{
-    dpi::{PhysicalPosition, PhysicalSize},
-    platform_impl,
-};
-
-/// An iterator over all available monitors.
-///
-/// Can be acquired with:
-/// - [`EventLoop::available_monitors`][loop_get]
-/// - [`Window::available_monitors`][window_get].
-///
-/// [loop_get]: ../event_loop/struct.EventLoop.html#method.available_monitors
-/// [window_get]: ../window/struct.Window.html#method.available_monitors
-// Implementation note: we retrieve the list once, then serve each element by one by one.
-// This may change in the future.
-#[derive(Debug)]
-pub struct AvailableMonitorsIter {
-    pub(crate) data: VecDequeIter<platform_impl::MonitorHandle>,
-}
-
-impl Iterator for AvailableMonitorsIter {
-    type Item = MonitorHandle;
-
-    #[inline]
-    fn next(&mut self) -> Option<MonitorHandle> {
-        self.data.next().map(|id| MonitorHandle { inner: id })
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.data.size_hint()
-    }
-}
-
-/// Describes a fullscreen video mode of a monitor.
-///
-/// Can be acquired with:
-/// - [`MonitorHandle::video_modes`][monitor_get].
-///
-/// [monitor_get]: ../monitor/struct.MonitorHandle.html#method.video_modes
-#[derive(Debug, Clone, Eq, PartialEq, Hash)]
-pub struct VideoMode {
-    pub(crate) size: (u32, u32),
-    pub(crate) bit_depth: u16,
-    pub(crate) refresh_rate: u16,
-}
-
-impl VideoMode {
-    /// Returns the resolution of this video mode.
-    pub fn size(&self) -> PhysicalSize {
-        self.size.into()
-    }
-
-    /// Returns the bit depth of this video mode, as in how many bits you have
-    /// available per color. This is generally 24 bits or 32 bits on modern
-    /// systems, depending on whether the alpha channel is counted or not.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Wayland:** Always returns 32.
-    /// - **iOS:** Always returns 32.
-    pub fn bit_depth(&self) -> u16 {
-        self.bit_depth
-    }
-
-    /// Returns the refresh rate of this video mode. **Note**: the returned
-    /// refresh rate is an integer approximation, and you shouldn't rely on this
-    /// value to be exact.
-    pub fn refresh_rate(&self) -> u16 {
-        self.refresh_rate
-    }
-}
-
-/// Handle to a monitor.
-///
-/// Allows you to retrieve information about a given monitor and can be used in [`Window`] creation.
-///
-/// [`Window`]: ../window/struct.Window.html
-#[derive(Debug, Clone)]
-pub struct MonitorHandle {
-    pub(crate) inner: platform_impl::MonitorHandle,
-}
-
-impl MonitorHandle {
-    /// Returns a human-readable name of the monitor.
-    ///
-    /// Returns `None` if the monitor doesn't exist anymore.
-    #[inline]
-    pub fn name(&self) -> Option<String> {
-        self.inner.name()
-    }
-
-    /// Returns the monitor's resolution.
-    #[inline]
-    pub fn size(&self) -> PhysicalSize {
-        self.inner.size()
-    }
-
-    /// Returns the top-left corner position of the monitor relative to the larger full
-    /// screen area.
-    #[inline]
-    pub fn position(&self) -> PhysicalPosition {
-        self.inner.position()
-    }
-
-    /// 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.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **X11:** Can be overridden using the `WINIT_HIDPI_FACTOR` environment variable.
-    /// - **Android:** Always returns 1.0.
-    #[inline]
-    pub fn hidpi_factor(&self) -> f64 {
-        self.inner.hidpi_factor()
-    }
-
-    /// Returns all fullscreen video modes supported by this monitor.
-    #[inline]
-    pub fn video_modes(&self) -> impl Iterator<Item = VideoMode> {
-        self.inner.video_modes()
-    }
-}

src/os/android.rs

@@ -0,0 +1,38 @@
+#![cfg(any(target_os = "android"))]
+
+use std::os::raw::c_void;
+use EventsLoop;
+use Window;
+use WindowBuilder;
+
+/// Additional methods on `EventsLoop` that are specific to Android.
+pub trait EventsLoopExt {
+    /// Makes it possible for glutin to register a callback when a suspend event happens on Android
+    fn set_suspend_callback(&self, cb: Option<Box<Fn(bool) -> ()>>);
+}
+
+impl EventsLoopExt for EventsLoop {
+    fn set_suspend_callback(&self, cb: Option<Box<Fn(bool) -> ()>>) {
+        self.events_loop.set_suspend_callback(cb);
+    }
+}
+
+/// Additional methods on `Window` that are specific to Android.
+pub trait WindowExt {
+    fn get_native_window(&self) -> *const c_void;
+}
+
+impl WindowExt for Window {
+    #[inline]
+    fn get_native_window(&self) -> *const c_void {
+        self.window.get_native_window()
+    }
+}
+
+/// Additional methods on `WindowBuilder` that are specific to Android.
+pub trait WindowBuilderExt {
+
+}
+
+impl WindowBuilderExt for WindowBuilder {
+}

src/os/ios.rs

@@ -0,0 +1,59 @@
+#![cfg(target_os = "ios")]
+
+use std::os::raw::c_void;
+
+use {MonitorId, Window, WindowBuilder};
+
+/// Additional methods on `Window` that are specific to iOS.
+pub trait WindowExt {
+    /// Returns a pointer to the `UIWindow` that is used by this window.
+    ///
+    /// The pointer will become invalid when the `Window` is destroyed.
+    fn get_uiwindow(&self) -> *mut c_void;
+
+    /// Returns a pointer to the `UIView` that is used by this window.
+    ///
+    /// The pointer will become invalid when the `Window` is destroyed.
+    fn get_uiview(&self) -> *mut c_void;
+}
+
+impl WindowExt for Window {
+    #[inline]
+    fn get_uiwindow(&self) -> *mut c_void {
+        self.window.get_uiwindow() as _
+    }
+
+    #[inline]
+    fn get_uiview(&self) -> *mut c_void {
+        self.window.get_uiview() as _
+    }
+}
+
+/// Additional methods on `WindowBuilder` that are specific to iOS.
+pub trait WindowBuilderExt {
+    /// Sets the root view class used by the `Window`, otherwise a barebones `UIView` is provided.
+    ///
+    /// The class will be initialized by calling `[root_view initWithFrame:CGRect]`
+    fn with_root_view_class(self, root_view_class: *const c_void) -> WindowBuilder;
+}
+
+impl WindowBuilderExt for WindowBuilder {
+    #[inline]
+    fn with_root_view_class(mut self, root_view_class: *const c_void) -> WindowBuilder {
+        self.platform_specific.root_view_class = unsafe { &*(root_view_class as *const _) };
+        self
+    }
+}
+
+/// Additional methods on `MonitorId` that are specific to iOS.
+pub trait MonitorIdExt {
+    /// Returns a pointer to the `UIScreen` that is used by this monitor.
+    fn get_uiscreen(&self) -> *mut c_void;
+}
+
+impl MonitorIdExt for MonitorId {
+    #[inline]
+    fn get_uiscreen(&self) -> *mut c_void {
+        self.inner.get_uiscreen() as _
+    }
+}

src/os/macos.rs

@@ -1,24 +1,19 @@
 #![cfg(target_os = "macos")]
 
 use std::os::raw::c_void;
-
-use crate::{
-    dpi::LogicalSize,
-    monitor::MonitorHandle,
-    window::{Window, WindowBuilder},
-};
+use {LogicalSize, MonitorId, Window, WindowBuilder};
 
 /// Additional methods on `Window` that are specific to MacOS.
-pub trait WindowExtMacOS {
+pub trait WindowExt {
     /// Returns a pointer to the cocoa `NSWindow` that is used by this window.
     ///
     /// The pointer will become invalid when the `Window` is destroyed.
-    fn ns_window(&self) -> *mut c_void;
+    fn get_nswindow(&self) -> *mut c_void;
 
     /// Returns a pointer to the cocoa `NSView` that is used by this window.
     ///
     /// The pointer will become invalid when the `Window` is destroyed.
-    fn ns_view(&self) -> *mut c_void;
+    fn get_nsview(&self) -> *mut c_void;
 
     /// Request user attention, causing the application's dock icon to bounce.
     /// Note that this has no effect if the application is already focused.
@@ -29,7 +24,7 @@ pub trait WindowExtMacOS {
     fn request_user_attention(&self, is_critical: bool);
 
     /// Returns whether or not the window is in simple fullscreen mode.
-    fn simple_fullscreen(&self) -> bool;
+    fn get_simple_fullscreen(&self) -> bool;
 
     /// Toggles a fullscreen mode that doesn't require a new macOS space.
     /// Returns a boolean indicating whether the transition was successful (this
@@ -41,15 +36,15 @@ pub trait WindowExtMacOS {
     fn set_simple_fullscreen(&self, fullscreen: bool) -> bool;
 }
 
-impl WindowExtMacOS for Window {
+impl WindowExt for Window {
     #[inline]
-    fn ns_window(&self) -> *mut c_void {
-        self.window.ns_window()
+    fn get_nswindow(&self) -> *mut c_void {
+        self.window.get_nswindow()
     }
 
     #[inline]
-    fn ns_view(&self) -> *mut c_void {
-        self.window.ns_view()
+    fn get_nsview(&self) -> *mut c_void {
+        self.window.get_nsview()
     }
 
     #[inline]
@@ -58,8 +53,8 @@ impl WindowExtMacOS for Window {
     }
 
     #[inline]
-    fn simple_fullscreen(&self) -> bool {
-        self.window.simple_fullscreen()
+    fn get_simple_fullscreen(&self) -> bool {
+        self.window.get_simple_fullscreen()
     }
 
     #[inline]
@@ -95,12 +90,11 @@ impl Default for ActivationPolicy {
 ///  - `with_titlebar_hidden`
 ///  - `with_titlebar_buttons_hidden`
 ///  - `with_fullsize_content_view`
-pub trait WindowBuilderExtMacOS {
+pub trait WindowBuilderExt {
     /// Sets the activation policy for the window being built.
     fn with_activation_policy(self, activation_policy: ActivationPolicy) -> WindowBuilder;
     /// Enables click-and-drag behavior for the entire window, not just the titlebar.
-    fn with_movable_by_window_background(self, movable_by_window_background: bool)
-        -> WindowBuilder;
+    fn with_movable_by_window_background(self, movable_by_window_background: bool) -> WindowBuilder;
     /// Makes the titlebar transparent and allows the content to appear behind it.
     fn with_titlebar_transparent(self, titlebar_transparent: bool) -> WindowBuilder;
     /// Hides the window title.
@@ -115,7 +109,7 @@ pub trait WindowBuilderExtMacOS {
     fn with_resize_increments(self, increments: LogicalSize) -> WindowBuilder;
 }
 
-impl WindowBuilderExtMacOS for WindowBuilder {
+impl WindowBuilderExt for WindowBuilder {
     #[inline]
     fn with_activation_policy(mut self, activation_policy: ActivationPolicy) -> WindowBuilder {
         self.platform_specific.activation_policy = activation_policy;
@@ -123,10 +117,7 @@ impl WindowBuilderExtMacOS for WindowBuilder {
     }
 
     #[inline]
-    fn with_movable_by_window_background(
-        mut self,
-        movable_by_window_background: bool,
-    ) -> WindowBuilder {
+    fn with_movable_by_window_background(mut self, movable_by_window_background: bool) -> WindowBuilder {
         self.platform_specific.movable_by_window_background = movable_by_window_background;
         self
     }
@@ -168,21 +159,21 @@ impl WindowBuilderExtMacOS for WindowBuilder {
     }
 }
 
-/// Additional methods on `MonitorHandle` that are specific to MacOS.
-pub trait MonitorHandleExtMacOS {
+/// Additional methods on `MonitorId` that are specific to MacOS.
+pub trait MonitorIdExt {
     /// Returns the identifier of the monitor for Cocoa.
     fn native_id(&self) -> u32;
     /// Returns a pointer to the NSScreen representing this monitor.
-    fn ns_screen(&self) -> Option<*mut c_void>;
+    fn get_nsscreen(&self) -> Option<*mut c_void>;
 }
 
-impl MonitorHandleExtMacOS for MonitorHandle {
+impl MonitorIdExt for MonitorId {
     #[inline]
     fn native_id(&self) -> u32 {
-        self.inner.native_identifier()
+        self.inner.get_native_identifier()
     }
 
-    fn ns_screen(&self) -> Option<*mut c_void> {
-        self.inner.ns_screen().map(|s| s as *mut c_void)
+    fn get_nsscreen(&self) -> Option<*mut c_void> {
+        self.inner.get_nsscreen().map(|s| s as *mut c_void)
     }
 }

src/os/mod.rs

@@ -0,0 +1,17 @@
+//! Contains traits with platform-specific methods in them.
+//!
+//! Contains the follow modules:
+//!
+//!  - `android`
+//!  - `ios`
+//!  - `macos`
+//!  - `unix`
+//!  - `windows`
+//!
+//! However only the module corresponding to the platform you're compiling to will be available.
+//!
+pub mod android;
+pub mod ios;
+pub mod macos;
+pub mod unix;
+pub mod windows;

src/os/unix.rs

@@ -1,26 +1,31 @@
 #![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
 
-use std::{os::raw, ptr, sync::Arc};
+use std::os::raw;
+use std::ptr;
+use std::sync::Arc;
 
-use smithay_client_toolkit::window::{ButtonState, Theme};
+use sctk::window::{ButtonState, Theme};
 
-use crate::{
-    dpi::LogicalSize,
-    event_loop::EventLoop,
-    monitor::MonitorHandle,
-    window::{Window, WindowBuilder},
+use {
+    EventsLoop,
+    LogicalSize,
+    MonitorId,
+    Window,
+    WindowBuilder,
 };
-
-use crate::platform_impl::{
-    x11::{ffi::XVisualInfo, XConnection},
-    EventLoop as LinuxEventLoop, Window as LinuxWindow,
+use platform::{
+    EventsLoop as LinuxEventsLoop,
+    Window as LinuxWindow,
 };
+use platform::x11::XConnection;
+use platform::x11::ffi::XVisualInfo;
 
 // TODO: stupid hack so that glutin can do its work
 #[doc(hidden)]
-pub use crate::platform_impl::x11;
+pub use platform::x11;
 
-pub use crate::platform_impl::{x11::util::WindowType as XWindowType, XNotSupported};
+pub use platform::XNotSupported;
+pub use platform::x11::util::WindowType as XWindowType;
 
 /// Theme for wayland client side decorations
 ///
@@ -90,52 +95,50 @@ impl Theme for WaylandThemeObject {
     }
 }
 
-/// Additional methods on `EventLoop` that are specific to Unix.
-pub trait EventLoopExtUnix {
-    /// Builds a new `EventLoops` that is forced to use X11.
+/// Additional methods on `EventsLoop` that are specific to Linux.
+pub trait EventsLoopExt {
+    /// Builds a new `EventsLoop` that is forced to use X11.
     fn new_x11() -> Result<Self, XNotSupported>
-    where
-        Self: Sized;
+        where Self: Sized;
 
-    /// Builds a new `EventLoop` that is forced to use Wayland.
+    /// Builds a new `EventsLoop` that is forced to use Wayland.
     fn new_wayland() -> Self
-    where
-        Self: Sized;
+        where Self: Sized;
 
-    /// True if the `EventLoop` uses Wayland.
+    /// True if the `EventsLoop` uses Wayland.
     fn is_wayland(&self) -> bool;
 
-    /// True if the `EventLoop` uses X11.
+    /// True if the `EventsLoop` uses X11.
     fn is_x11(&self) -> bool;
 
     #[doc(hidden)]
-    fn xlib_xconnection(&self) -> Option<Arc<XConnection>>;
+    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
 
-    /// Returns a pointer to the `wl_display` object of wayland that is used by this `EventLoop`.
+    /// Returns a pointer to the `wl_display` object of wayland that is used by this `EventsLoop`.
     ///
-    /// Returns `None` if the `EventLoop` doesn't use wayland (if it uses xlib for example).
+    /// Returns `None` if the `EventsLoop` doesn't use wayland (if it uses xlib for example).
     ///
-    /// The pointer will become invalid when the glutin `EventLoop` is destroyed.
-    fn wayland_display(&self) -> Option<*mut raw::c_void>;
+    /// The pointer will become invalid when the glutin `EventsLoop` is destroyed.
+    fn get_wayland_display(&self) -> Option<*mut raw::c_void>;
 }
 
-impl<T> EventLoopExtUnix for EventLoop<T> {
+impl EventsLoopExt for EventsLoop {
     #[inline]
     fn new_x11() -> Result<Self, XNotSupported> {
-        LinuxEventLoop::new_x11().map(|ev| {
-            EventLoop {
-                event_loop: ev,
+        LinuxEventsLoop::new_x11().map(|ev|
+            EventsLoop {
+                events_loop: ev,
                 _marker: ::std::marker::PhantomData,
             }
-        })
+        )
     }
 
     #[inline]
     fn new_wayland() -> Self {
-        EventLoop {
-            event_loop: match LinuxEventLoop::new_wayland() {
+        EventsLoop {
+            events_loop: match LinuxEventsLoop::new_wayland() {
                 Ok(e) => e,
-                Err(_) => panic!(), // TODO: propagate
+                Err(_) => panic!()      // TODO: propagate
             },
             _marker: ::std::marker::PhantomData,
         }
@@ -143,50 +146,47 @@ impl<T> EventLoopExtUnix for EventLoop<T> {
 
     #[inline]
     fn is_wayland(&self) -> bool {
-        self.event_loop.is_wayland()
+        self.events_loop.is_wayland()
     }
 
     #[inline]
     fn is_x11(&self) -> bool {
-        !self.event_loop.is_wayland()
+        !self.events_loop.is_wayland()
     }
 
     #[inline]
     #[doc(hidden)]
-    fn xlib_xconnection(&self) -> Option<Arc<XConnection>> {
-        match self.event_loop {
-            LinuxEventLoop::X(ref e) => Some(e.x_connection().clone()),
-            _ => None,
-        }
+    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
+        self.events_loop.x_connection().cloned()
     }
 
     #[inline]
-    fn wayland_display(&self) -> Option<*mut raw::c_void> {
-        match self.event_loop {
-            LinuxEventLoop::Wayland(ref e) => Some(e.display().get_display_ptr() as *mut _),
-            _ => None,
+    fn get_wayland_display(&self) -> Option<*mut raw::c_void> {
+        match self.events_loop {
+            LinuxEventsLoop::Wayland(ref e) => Some(e.get_display().c_ptr() as *mut _),
+            _ => None
         }
     }
 }
 
 /// Additional methods on `Window` that are specific to Unix.
-pub trait WindowExtUnix {
+pub trait WindowExt {
     /// Returns the ID of the `Window` xlib object that is used by this window.
     ///
     /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
-    fn xlib_window(&self) -> Option<raw::c_ulong>;
+    fn get_xlib_window(&self) -> Option<raw::c_ulong>;
 
     /// Returns a pointer to the `Display` object of xlib that is used by this window.
     ///
     /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn xlib_display(&self) -> Option<*mut raw::c_void>;
+    fn get_xlib_display(&self) -> Option<*mut raw::c_void>;
 
-    fn xlib_screen_id(&self) -> Option<raw::c_int>;
+    fn get_xlib_screen_id(&self) -> Option<raw::c_int>;
 
     #[doc(hidden)]
-    fn xlib_xconnection(&self) -> Option<Arc<XConnection>>;
+    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
 
     /// Set window urgency hint (`XUrgencyHint`). Only relevant on X.
     fn set_urgent(&self, is_urgent: bool);
@@ -196,21 +196,21 @@ pub trait WindowExtUnix {
     /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn xcb_connection(&self) -> Option<*mut raw::c_void>;
+    fn get_xcb_connection(&self) -> Option<*mut raw::c_void>;
 
     /// Returns a pointer to the `wl_surface` object of wayland that is used by this window.
     ///
     /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn wayland_surface(&self) -> Option<*mut raw::c_void>;
+    fn get_wayland_surface(&self) -> Option<*mut raw::c_void>;
 
     /// Returns a pointer to the `wl_display` object of wayland that is used by this window.
     ///
     /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn wayland_display(&self) -> Option<*mut raw::c_void>;
+    fn get_wayland_display(&self) -> Option<*mut raw::c_void>;
 
     /// Sets the color theme of the client side window decorations on wayland
     fn set_wayland_theme(&self, theme: WaylandTheme);
@@ -225,45 +225,45 @@ pub trait WindowExtUnix {
     fn is_ready(&self) -> bool;
 }
 
-impl WindowExtUnix for Window {
+impl WindowExt for Window {
     #[inline]
-    fn xlib_window(&self) -> Option<raw::c_ulong> {
+    fn get_xlib_window(&self) -> Option<raw::c_ulong> {
         match self.window {
-            LinuxWindow::X(ref w) => Some(w.xlib_window()),
-            _ => None,
+            LinuxWindow::X(ref w) => Some(w.get_xlib_window()),
+            _ => None
         }
     }
 
     #[inline]
-    fn xlib_display(&self) -> Option<*mut raw::c_void> {
+    fn get_xlib_display(&self) -> Option<*mut raw::c_void> {
         match self.window {
-            LinuxWindow::X(ref w) => Some(w.xlib_display()),
-            _ => None,
+            LinuxWindow::X(ref w) => Some(w.get_xlib_display()),
+            _ => None
         }
     }
 
     #[inline]
-    fn xlib_screen_id(&self) -> Option<raw::c_int> {
+    fn get_xlib_screen_id(&self) -> Option<raw::c_int> {
         match self.window {
-            LinuxWindow::X(ref w) => Some(w.xlib_screen_id()),
-            _ => None,
+            LinuxWindow::X(ref w) => Some(w.get_xlib_screen_id()),
+            _ => None
         }
     }
 
     #[inline]
     #[doc(hidden)]
-    fn xlib_xconnection(&self) -> Option<Arc<XConnection>> {
+    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
         match self.window {
-            LinuxWindow::X(ref w) => Some(w.xlib_xconnection()),
-            _ => None,
+            LinuxWindow::X(ref w) => Some(w.get_xlib_xconnection()),
+            _ => None
         }
     }
 
     #[inline]
-    fn xcb_connection(&self) -> Option<*mut raw::c_void> {
+    fn get_xcb_connection(&self) -> Option<*mut raw::c_void> {
         match self.window {
-            LinuxWindow::X(ref w) => Some(w.xcb_connection()),
-            _ => None,
+            LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
+            _ => None
         }
     }
 
@@ -275,18 +275,18 @@ impl WindowExtUnix for Window {
     }
 
     #[inline]
-    fn wayland_surface(&self) -> Option<*mut raw::c_void> {
+    fn get_wayland_surface(&self) -> Option<*mut raw::c_void> {
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.surface().as_ref().c_ptr() as *mut _),
-            _ => None,
+            LinuxWindow::Wayland(ref w) => Some(w.get_surface().c_ptr() as *mut _),
+            _ => None
         }
     }
 
     #[inline]
-    fn wayland_display(&self) -> Option<*mut raw::c_void> {
+    fn get_wayland_display(&self) -> Option<*mut raw::c_void> {
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.display().as_ref().c_ptr() as *mut _),
-            _ => None,
+            LinuxWindow::Wayland(ref w) => Some(w.get_display().c_ptr() as *mut _),
+            _ => None
         }
     }
 
@@ -294,7 +294,7 @@ impl WindowExtUnix for Window {
     fn set_wayland_theme(&self, theme: WaylandTheme) {
         match self.window {
             LinuxWindow::Wayland(ref w) => w.set_theme(WaylandThemeObject(theme)),
-            _ => {},
+            _ => {}
         }
     }
 
@@ -305,7 +305,7 @@ impl WindowExtUnix for Window {
 }
 
 /// Additional methods on `WindowBuilder` that are specific to Unix.
-pub trait WindowBuilderExtUnix {
+pub trait WindowBuilderExt {
     fn with_x11_visual<T>(self, visual_infos: *const T) -> WindowBuilder;
     fn with_x11_screen(self, screen_id: i32) -> WindowBuilder;
 
@@ -330,11 +330,12 @@ pub trait WindowBuilderExtUnix {
     fn with_app_id(self, app_id: String) -> WindowBuilder;
 }
 
-impl WindowBuilderExtUnix for WindowBuilder {
+impl WindowBuilderExt for WindowBuilder {
     #[inline]
     fn with_x11_visual<T>(mut self, visual_infos: *const T) -> WindowBuilder {
-        self.platform_specific.visual_infos =
-            Some(unsafe { ptr::read(visual_infos as *const XVisualInfo) });
+        self.platform_specific.visual_infos = Some(
+            unsafe { ptr::read(visual_infos as *const XVisualInfo) }
+        );
         self
     }
 
@@ -387,15 +388,15 @@ impl WindowBuilderExtUnix for WindowBuilder {
     }
 }
 
-/// Additional methods on `MonitorHandle` that are specific to Linux.
-pub trait MonitorHandleExtUnix {
+/// Additional methods on `MonitorId` that are specific to Linux.
+pub trait MonitorIdExt {
     /// Returns the inner identifier of the monitor.
     fn native_id(&self) -> u32;
 }
 
-impl MonitorHandleExtUnix for MonitorHandle {
+impl MonitorIdExt for MonitorId {
     #[inline]
     fn native_id(&self) -> u32 {
-        self.inner.native_identifier()
+        self.inner.get_native_identifier()
     }
 }

src/os/windows.rs

@@ -5,47 +5,40 @@ use std::os::raw::c_void;
 use libc;
 use winapi::shared::windef::HWND;
 
-use crate::{
-    event::DeviceId,
-    event_loop::EventLoop,
-    monitor::MonitorHandle,
-    platform_impl::EventLoop as WindowsEventLoop,
-    window::{Icon, Window, WindowBuilder},
-};
+use {DeviceId, EventsLoop, Icon, MonitorId, Window, WindowBuilder};
+use platform::EventsLoop as WindowsEventsLoop;
 
-/// Additional methods on `EventLoop` that are specific to Windows.
-pub trait EventLoopExtWindows {
+/// Additional methods on `EventsLoop` that are specific to Windows.
+pub trait EventsLoopExt {
     /// By default, winit on Windows will attempt to enable process-wide DPI awareness. If that's
-    /// undesirable, you can create an `EventLoop` using this function instead.
-    fn new_dpi_unaware() -> Self
-    where
-        Self: Sized;
+    /// undesirable, you can create an `EventsLoop` using this function instead.
+    fn new_dpi_unaware() -> Self where Self: Sized;
 }
 
-impl<T> EventLoopExtWindows for EventLoop<T> {
+impl EventsLoopExt for EventsLoop {
     #[inline]
     fn new_dpi_unaware() -> Self {
-        EventLoop {
-            event_loop: WindowsEventLoop::with_dpi_awareness(false),
+        EventsLoop {
+            events_loop: WindowsEventsLoop::with_dpi_awareness(false),
             _marker: ::std::marker::PhantomData,
         }
     }
 }
 
 /// Additional methods on `Window` that are specific to Windows.
-pub trait WindowExtWindows {
+pub trait WindowExt {
     /// Returns the native handle that is used by this window.
     ///
     /// The pointer will become invalid when the native window was destroyed.
-    fn hwnd(&self) -> *mut libc::c_void;
+    fn get_hwnd(&self) -> *mut libc::c_void;
 
     /// This sets `ICON_BIG`. A good ceiling here is 256x256.
     fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>);
 }
 
-impl WindowExtWindows for Window {
+impl WindowExt for Window {
     #[inline]
-    fn hwnd(&self) -> *mut libc::c_void {
+    fn get_hwnd(&self) -> *mut libc::c_void {
         self.window.hwnd() as *mut _
     }
 
@@ -56,7 +49,7 @@ impl WindowExtWindows for Window {
 }
 
 /// Additional methods on `WindowBuilder` that are specific to Windows.
-pub trait WindowBuilderExtWindows {
+pub trait WindowBuilderExt {
     /// Sets a parent to the window to be created.
     fn with_parent_window(self, parent: HWND) -> WindowBuilder;
 
@@ -67,7 +60,7 @@ pub trait WindowBuilderExtWindows {
     fn with_no_redirection_bitmap(self, flag: bool) -> WindowBuilder;
 }
 
-impl WindowBuilderExtWindows for WindowBuilder {
+impl WindowBuilderExt for WindowBuilder {
     #[inline]
     fn with_parent_window(mut self, parent: HWND) -> WindowBuilder {
         self.platform_specific.parent = Some(parent);
@@ -87,8 +80,8 @@ impl WindowBuilderExtWindows for WindowBuilder {
     }
 }
 
-/// Additional methods on `MonitorHandle` that are specific to Windows.
-pub trait MonitorHandleExtWindows {
+/// Additional methods on `MonitorId` that are specific to Windows.
+pub trait MonitorIdExt {
     /// Returns the name of the monitor adapter specific to the Win32 API.
     fn native_id(&self) -> String;
 
@@ -96,29 +89,29 @@ pub trait MonitorHandleExtWindows {
     fn hmonitor(&self) -> *mut c_void;
 }
 
-impl MonitorHandleExtWindows for MonitorHandle {
+impl MonitorIdExt for MonitorId {
     #[inline]
     fn native_id(&self) -> String {
-        self.inner.native_identifier()
+        self.inner.get_native_identifier()
     }
 
     #[inline]
     fn hmonitor(&self) -> *mut c_void {
-        self.inner.hmonitor() as *mut _
+        self.inner.get_hmonitor() as *mut _
     }
 }
 
 /// Additional methods on `DeviceId` that are specific to Windows.
-pub trait DeviceIdExtWindows {
+pub trait DeviceIdExt {
     /// Returns an identifier that persistently refers to this specific device.
     ///
     /// Will return `None` if the device is no longer available.
-    fn persistent_identifier(&self) -> Option<String>;
+    fn get_persistent_identifier(&self) -> Option<String>;
 }
 
-impl DeviceIdExtWindows for DeviceId {
+impl DeviceIdExt for DeviceId {
     #[inline]
-    fn persistent_identifier(&self) -> Option<String> {
-        self.0.persistent_identifier()
+    fn get_persistent_identifier(&self) -> Option<String> {
+        self.0.get_persistent_identifier()
     }
 }

src/platform/android.rs

@@ -1,33 +0,0 @@
-#![cfg(any(target_os = "android"))]
-
-use crate::{EventLoop, Window, WindowBuilder};
-use std::os::raw::c_void;
-
-/// Additional methods on `EventLoop` that are specific to Android.
-pub trait EventLoopExtAndroid {
-    /// Makes it possible for glutin to register a callback when a suspend event happens on Android
-    fn set_suspend_callback(&self, cb: Option<Box<dyn Fn(bool) -> ()>>);
-}
-
-impl EventLoopExtAndroid for EventLoop {
-    fn set_suspend_callback(&self, cb: Option<Box<dyn Fn(bool) -> ()>>) {
-        self.event_loop.set_suspend_callback(cb);
-    }
-}
-
-/// Additional methods on `Window` that are specific to Android.
-pub trait WindowExtAndroid {
-    fn native_window(&self) -> *const c_void;
-}
-
-impl WindowExtAndroid for Window {
-    #[inline]
-    fn native_window(&self) -> *const c_void {
-        self.window.native_window()
-    }
-}
-
-/// Additional methods on `WindowBuilder` that are specific to Android.
-pub trait WindowBuilderExtAndroid {}
-
-impl WindowBuilderExtAndroid for WindowBuilder {}

src/platform/android/ffi.rs

@@ -0,0 +1,108 @@
+#![allow(dead_code)]
+#![allow(non_snake_case)]
+#![allow(non_camel_case_types)]
+#![allow(non_upper_case_globals)]
+
+use libc;
+use std::os::raw;
+
+#[link(name = "android")]
+#[link(name = "EGL")]
+#[link(name = "GLESv2")]
+extern {}
+
+/**
+ * asset_manager.h
+ */
+pub type AAssetManager = raw::c_void;
+
+/**
+ * native_window.h
+ */
+pub type ANativeWindow = raw::c_void;
+
+extern {
+    pub fn ANativeWindow_getHeight(window: *const ANativeWindow) -> libc::int32_t;
+    pub fn ANativeWindow_getWidth(window: *const ANativeWindow) -> libc::int32_t;
+}
+
+/**
+ * native_activity.h
+ */
+pub type JavaVM = ();
+pub type JNIEnv = ();
+pub type jobject = *const libc::c_void;
+
+pub type AInputQueue = ();  // FIXME: wrong
+pub type ARect = ();  // FIXME: wrong
+
+#[repr(C)]
+pub struct ANativeActivity {
+    pub callbacks: *mut ANativeActivityCallbacks,
+    pub vm: *mut JavaVM,
+    pub env: *mut JNIEnv,
+    pub clazz: jobject,
+    pub internalDataPath: *const libc::c_char,
+    pub externalDataPath: *const libc::c_char,
+    pub sdkVersion: libc::int32_t,
+    pub instance: *mut libc::c_void,
+    pub assetManager: *mut AAssetManager,
+    pub obbPath: *const libc::c_char,
+}
+
+#[repr(C)]
+pub struct ANativeActivityCallbacks {
+    pub onStart: extern fn(*mut ANativeActivity),
+    pub onResume: extern fn(*mut ANativeActivity),
+    pub onSaveInstanceState: extern fn(*mut ANativeActivity, *mut libc::size_t),
+    pub onPause: extern fn(*mut ANativeActivity),
+    pub onStop: extern fn(*mut ANativeActivity),
+    pub onDestroy: extern fn(*mut ANativeActivity),
+    pub onWindowFocusChanged: extern fn(*mut ANativeActivity, libc::c_int),
+    pub onNativeWindowCreated: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowResized: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowRedrawNeeded: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowDestroyed: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onInputQueueCreated: extern fn(*mut ANativeActivity, *mut AInputQueue),
+    pub onInputQueueDestroyed: extern fn(*mut ANativeActivity, *mut AInputQueue),
+    pub onContentRectChanged: extern fn(*mut ANativeActivity, *const ARect),
+    pub onConfigurationChanged: extern fn(*mut ANativeActivity),
+    pub onLowMemory: extern fn(*mut ANativeActivity),
+}
+
+/**
+ * looper.h
+ */
+pub type ALooper = ();
+
+#[link(name = "android")]
+extern {
+    pub fn ALooper_forThread() -> *const ALooper;
+    pub fn ALooper_acquire(looper: *const ALooper);
+    pub fn ALooper_release(looper: *const ALooper);
+    pub fn ALooper_prepare(opts: libc::c_int) -> *const ALooper;
+    pub fn ALooper_pollOnce(timeoutMillis: libc::c_int, outFd: *mut libc::c_int,
+        outEvents: *mut libc::c_int, outData: *mut *mut libc::c_void) -> libc::c_int;
+    pub fn ALooper_pollAll(timeoutMillis: libc::c_int, outFd: *mut libc::c_int,
+        outEvents: *mut libc::c_int, outData: *mut *mut libc::c_void) -> libc::c_int;
+    pub fn ALooper_wake(looper: *const ALooper);
+    pub fn ALooper_addFd(looper: *const ALooper, fd: libc::c_int, ident: libc::c_int,
+        events: libc::c_int, callback: ALooper_callbackFunc, data: *mut libc::c_void)
+        -> libc::c_int;
+    pub fn ALooper_removeFd(looper: *const ALooper, fd: libc::c_int) -> libc::c_int;
+}
+
+pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: libc::c_int = 1 << 0;
+
+pub const ALOOPER_POLL_WAKE: libc::c_int = -1;
+pub const ALOOPER_POLL_CALLBACK: libc::c_int = -2;
+pub const ALOOPER_POLL_TIMEOUT: libc::c_int = -3;
+pub const ALOOPER_POLL_ERROR: libc::c_int = -4;
+
+pub const ALOOPER_EVENT_INPUT: libc::c_int = 1 << 0;
+pub const ALOOPER_EVENT_OUTPUT: libc::c_int = 1 << 1;
+pub const ALOOPER_EVENT_ERROR: libc::c_int = 1 << 2;
+pub const ALOOPER_EVENT_HANGUP: libc::c_int = 1 << 3;
+pub const ALOOPER_EVENT_INVALID: libc::c_int = 1 << 4;
+
+pub type ALooper_callbackFunc = extern fn(libc::c_int, libc::c_int, *mut libc::c_void) -> libc::c_int;

src/platform/android/mod.rs

@@ -4,63 +4,66 @@ extern crate android_glue;
 
 mod ffi;
 
-use std::{
-    cell::RefCell,
-    collections::VecDeque,
-    fmt,
-    os::raw::c_void,
-    sync::mpsc::{channel, Receiver},
-};
+use raw_window_handle::{android::AndroidHandle, RawWindowHandle};
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::fmt;
+use std::os::raw::c_void;
+use std::sync::mpsc::{Receiver, channel};
 
-use crate::{
-    error::{ExternalError, NotSupportedError},
-    events::{Touch, TouchPhase},
-    window::MonitorHandle as RootMonitorHandle,
-    CreationError, CursorIcon, Event, LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize,
-    WindowAttributes, WindowEvent, WindowId as RootWindowId,
+use {
+    CreationError,
+    Event,
+    LogicalPosition,
+    LogicalSize,
+    MouseCursor,
+    PhysicalPosition,
+    PhysicalSize,
+    WindowAttributes,
+    WindowEvent,
+    WindowId as RootWindowId,
 };
 use CreationError::OsError;
+use events::{Touch, TouchPhase};
+use window::MonitorId as RootMonitorId;
 
-pub type OsError = std::io::Error;
-
-pub struct EventLoop {
+pub struct EventsLoop {
     event_rx: Receiver<android_glue::Event>,
-    suspend_callback: RefCell<Option<Box<dyn Fn(bool) -> ()>>>,
+    suspend_callback: RefCell<Option<Box<Fn(bool) -> ()>>>,
 }
 
 #[derive(Clone)]
-pub struct EventLoopProxy;
+pub struct EventsLoopProxy;
 
-impl EventLoop {
-    pub fn new() -> EventLoop {
+impl EventsLoop {
+    pub fn new() -> EventsLoop {
         let (tx, rx) = channel();
         android_glue::add_sender(tx);
-        EventLoop {
+        EventsLoop {
             event_rx: rx,
             suspend_callback: Default::default(),
         }
     }
 
     #[inline]
-    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
         let mut rb = VecDeque::with_capacity(1);
-        rb.push_back(MonitorHandle);
+        rb.push_back(MonitorId);
         rb
     }
 
     #[inline]
-    pub fn primary_monitor(&self) -> MonitorHandle {
-        MonitorHandle
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId
     }
 
     pub fn poll_events<F>(&mut self, mut callback: F)
-    where
-        F: FnMut(::Event),
+        where F: FnMut(::Event)
     {
         while let Ok(event) = self.event_rx.try_recv() {
-            let e = match event {
+            let e = match event{
                 android_glue::Event::EventMotion(motion) => {
-                    let dpi_factor = MonitorHandle.hidpi_factor();
+                    let dpi_factor = MonitorId.get_hidpi_factor();
                     let location = LogicalPosition::from_physical(
                         (motion.x as f64, motion.y as f64),
                         dpi_factor,
@@ -94,14 +97,15 @@ impl EventLoop {
                     }
                     Some(Event::Suspended(true))
                 },
-                android_glue::Event::WindowResized | android_glue::Event::ConfigChanged => {
+                android_glue::Event::WindowResized |
+                android_glue::Event::ConfigChanged => {
                     // Activity Orientation changed or resized.
-                    let native_window = unsafe { android_glue::native_window() };
+                    let native_window = unsafe { android_glue::get_native_window() };
                     if native_window.is_null() {
                         None
                     } else {
-                        let dpi_factor = MonitorHandle.hidpi_factor();
-                        let physical_size = MonitorHandle.size();
+                        let dpi_factor = MonitorId.get_hidpi_factor();
+                        let physical_size = MonitorId.get_dimensions();
                         let size = LogicalSize::from_physical(physical_size, dpi_factor);
                         Some(Event::WindowEvent {
                             window_id: RootWindowId(WindowId),
@@ -113,26 +117,29 @@ impl EventLoop {
                     // The activity needs to be redrawn.
                     Some(Event::WindowEvent {
                         window_id: RootWindowId(WindowId),
-                        event: WindowEvent::Redraw,
+                        event: WindowEvent::Refresh,
                     })
-                },
-                android_glue::Event::Wake => Some(Event::Awakened),
-                _ => None,
+                }
+                android_glue::Event::Wake => {
+                    Some(Event::Awakened)
+                }
+                _ => {
+                    None
+                }
             };
 
             if let Some(event) = e {
                 callback(event);
             }
-        }
+        };
     }
 
-    pub fn set_suspend_callback(&self, cb: Option<Box<dyn Fn(bool) -> ()>>) {
+    pub fn set_suspend_callback(&self, cb: Option<Box<Fn(bool) -> ()>>) {
         *self.suspend_callback.borrow_mut() = cb;
     }
 
     pub fn run_forever<F>(&mut self, mut callback: F)
-    where
-        F: FnMut(::Event) -> ::ControlFlow,
+        where F: FnMut(::Event) -> ::ControlFlow,
     {
         // Yeah that's a very bad implementation.
         loop {
@@ -149,13 +156,13 @@ impl EventLoop {
         }
     }
 
-    pub fn create_proxy(&self) -> EventLoopProxy {
-        EventLoopProxy
+    pub fn create_proxy(&self) -> EventsLoopProxy {
+        EventsLoopProxy
     }
 }
 
-impl EventLoopProxy {
-    pub fn wakeup(&self) -> Result<(), ::EventLoopClosed> {
+impl EventsLoopProxy {
+    pub fn wakeup(&self) -> Result<(), ::EventsLoopClosed> {
         android_glue::wake_event_loop();
         Ok(())
     }
@@ -184,55 +191,54 @@ pub struct Window {
 }
 
 #[derive(Clone)]
-pub struct MonitorHandle;
+pub struct MonitorId;
 
-impl fmt::Debug for MonitorHandle {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+impl fmt::Debug for MonitorId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         #[derive(Debug)]
-        struct MonitorHandle {
+        struct MonitorId {
             name: Option<String>,
             dimensions: PhysicalSize,
             position: PhysicalPosition,
             hidpi_factor: f64,
         }
 
-        let monitor_id_proxy = MonitorHandle {
-            name: self.name(),
-            dimensions: self.size(),
-            position: self.outer_position(),
-            hidpi_factor: self.hidpi_factor(),
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
         };
 
         monitor_id_proxy.fmt(f)
     }
 }
 
-impl MonitorHandle {
+impl MonitorId {
     #[inline]
-    pub fn name(&self) -> Option<String> {
+    pub fn get_name(&self) -> Option<String> {
         Some("Primary".to_string())
     }
 
     #[inline]
-    pub fn size(&self) -> PhysicalSize {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         unsafe {
-            let window = android_glue::native_window();
+            let window = android_glue::get_native_window();
             (
                 ffi::ANativeWindow_getWidth(window) as f64,
                 ffi::ANativeWindow_getHeight(window) as f64,
-            )
-                .into()
+            ).into()
         }
     }
 
     #[inline]
-    pub fn outer_position(&self) -> PhysicalPosition {
+    pub fn get_position(&self) -> PhysicalPosition {
         // Android assumes single screen
         (0, 0).into()
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f64 {
+    pub fn get_hidpi_factor(&self) -> f64 {
         1.0
     }
 }
@@ -243,17 +249,16 @@ pub struct PlatformSpecificWindowBuilderAttributes;
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
 impl Window {
-    pub fn new(
-        _: &EventLoop,
-        win_attribs: WindowAttributes,
-        _: PlatformSpecificWindowBuilderAttributes,
-    ) -> Result<Window, CreationError> {
-        let native_window = unsafe { android_glue::native_window() };
+    pub fn new(_: &EventsLoop, win_attribs: WindowAttributes,
+               _: PlatformSpecificWindowBuilderAttributes)
+               -> Result<Window, CreationError>
+    {
+        let native_window = unsafe { android_glue::get_native_window() };
         if native_window.is_null() {
             return Err(OsError(format!("Android's native window is null")));
         }
 
-        android_glue::set_multitouch(true);
+        android_glue::set_multitouch(win_attribs.multitouch);
 
         Ok(Window {
             native_window: native_window as *const _,
@@ -261,7 +266,7 @@ impl Window {
     }
 
     #[inline]
-    pub fn native_window(&self) -> *const c_void {
+    pub fn get_native_window(&self) -> *const c_void {
         self.native_window
     }
 
@@ -281,29 +286,29 @@ impl Window {
     }
 
     #[inline]
-    pub fn outer_position(&self) -> Option<LogicalPosition> {
+    pub fn get_position(&self) -> Option<LogicalPosition> {
         // N/A
         None
     }
 
     #[inline]
-    pub fn inner_position(&self) -> Option<LogicalPosition> {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
         // N/A
         None
     }
 
     #[inline]
-    pub fn set_outer_position(&self, _position: LogicalPosition) {
+    pub fn set_position(&self, _position: LogicalPosition) {
         // N/A
     }
 
     #[inline]
-    pub fn set_min_inner_size(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
     #[inline]
-    pub fn set_max_inner_size(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
@@ -313,19 +318,19 @@ impl Window {
     }
 
     #[inline]
-    pub fn inner_size(&self) -> Option<LogicalSize> {
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         if self.native_window.is_null() {
             None
         } else {
-            let dpi_factor = self.hidpi_factor();
-            let physical_size = self.current_monitor().size();
+            let dpi_factor = self.get_hidpi_factor();
+            let physical_size = self.get_current_monitor().get_dimensions();
             Some(LogicalSize::from_physical(physical_size, dpi_factor))
         }
     }
 
     #[inline]
-    pub fn outer_size(&self) -> Option<LogicalSize> {
-        self.inner_size()
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
+        self.get_inner_size()
     }
 
     #[inline]
@@ -334,18 +339,18 @@ impl Window {
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f64 {
-        self.current_monitor().hidpi_factor()
+    pub fn get_hidpi_factor(&self) -> f64 {
+        self.get_current_monitor().get_hidpi_factor()
     }
 
     #[inline]
-    pub fn set_cursor_icon(&self, _: CursorIcon) {
+    pub fn set_cursor(&self, _: MouseCursor) {
         // N/A
     }
 
     #[inline]
-    pub fn set_cursor_grab(&self, _grab: bool) -> Result<(), ExternalError> {
-        Err(ExternalError::NotSupported(NotSupportedError::new()))
+    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
+        Err("Cursor grabbing is not possible on Android.".to_owned())
     }
 
     #[inline]
@@ -354,8 +359,8 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), ExternalError> {
-        Err(ExternalError::NotSupported(NotSupportedError::new()))
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
+        Err("Setting cursor position is not possible on Android.".to_owned())
     }
 
     #[inline]
@@ -365,14 +370,14 @@ impl Window {
     }
 
     #[inline]
-    pub fn fullscreen(&self) -> Option<RootMonitorHandle> {
+    pub fn get_fullscreen(&self) -> Option<RootMonitorId> {
         // N/A
         // Android has single screen maximized apps so nothing to do
         None
     }
 
     #[inline]
-    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorHandle>) {
+    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorId>) {
         // N/A
         // Android has single screen maximized apps so nothing to do
     }
@@ -393,33 +398,39 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_ime_position(&self, _spot: LogicalPosition) {
+    pub fn set_ime_spot(&self, _spot: LogicalPosition) {
         // N/A
     }
 
     #[inline]
-    pub fn current_monitor(&self) -> RootMonitorHandle {
-        RootMonitorHandle {
-            inner: MonitorHandle,
-        }
+    pub fn get_current_monitor(&self) -> RootMonitorId {
+        RootMonitorId { inner: MonitorId }
     }
 
     #[inline]
-    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
         let mut rb = VecDeque::with_capacity(1);
-        rb.push_back(MonitorHandle);
+        rb.push_back(MonitorId);
         rb
     }
 
     #[inline]
-    pub fn primary_monitor(&self) -> MonitorHandle {
-        MonitorHandle
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId
     }
 
     #[inline]
     pub fn id(&self) -> WindowId {
         WindowId
     }
+
+    pub fn raw_window_handle(&self) -> RawWindowHandle {
+        let handle = AndroidHandle {
+            a_native_window: self.native_window as _,
+            ..AndroidHandle::empty()
+        };
+        RawWindowHandle::Android(handle)
+    }
 }
 
 unsafe impl Send for Window {}

src/platform/desktop.rs

@@ -1,45 +0,0 @@
-#![cfg(any(
-    target_os = "windows",
-    target_os = "macos",
-    target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"
-))]
-
-use crate::{
-    event::Event,
-    event_loop::{ControlFlow, EventLoop, EventLoopWindowTarget},
-};
-
-/// Additional methods on `EventLoop` that are specific to desktop platforms.
-pub trait EventLoopExtDesktop {
-    /// A type provided by the user that can be passed through `Event::UserEvent`.
-    type UserEvent;
-
-    /// Initializes the `winit` event loop.
-    ///
-    /// Unlike `run`, this function accepts non-`'static` (i.e. non-`move`) closures and returns
-    /// control flow to the caller when `control_flow` is set to `ControlFlow::Exit`.
-    ///
-    /// # Caveats
-    /// Despite its apperance at first glance, this is *not* a perfect replacement for
-    /// `poll_events`. For example, this function will not return on Windows or macOS while a
-    /// window is getting resized, resulting in all application logic outside of the
-    /// `event_handler` closure not running until the resize operation ends. Other OS operations
-    /// may also result in such freezes. This behavior is caused by fundamental limitations in the
-    /// underyling OS APIs, which cannot be hidden by Winit without severe stability reprecussions.
-    ///
-    /// You are strongly encouraged to use `run`, unless the use of this is absolutely necessary.
-    fn run_return<F>(&mut self, event_handler: F)
-    where
-        F: FnMut(Event<Self::UserEvent>, &EventLoopWindowTarget<Self::UserEvent>, &mut ControlFlow);
-}
-
-impl<T> EventLoopExtDesktop for EventLoop<T> {
-    type UserEvent = T;
-
-    fn run_return<F>(&mut self, event_handler: F)
-    where
-        F: FnMut(Event<T>, &EventLoopWindowTarget<T>, &mut ControlFlow),
-    {
-        self.event_loop.run_return(event_handler)
-    }
-}

src/platform/emscripten/ffi.rs

@@ -1,8 +1,8 @@
 #![allow(dead_code, non_camel_case_types, non_snake_case)]
 
+use std::os::raw::{c_int, c_char, c_void, c_ulong, c_double, c_long, c_ushort};
 #[cfg(test)]
 use std::mem;
-use std::os::raw::{c_char, c_double, c_int, c_long, c_ulong, c_ushort, c_void};
 
 pub type EM_BOOL = c_int;
 pub type EM_UTF8 = c_char;
@@ -71,45 +71,30 @@ pub const DOM_KEY_LOCATION_NUMPAD: c_ulong = 0x03;
 
 pub type em_callback_func = Option<unsafe extern "C" fn()>;
 
-pub type em_key_callback_func = Option<
-    unsafe extern "C" fn(
-        eventType: c_int,
-        keyEvent: *const EmscriptenKeyboardEvent,
-        userData: *mut c_void,
-    ) -> EM_BOOL,
->;
+pub type em_key_callback_func = Option<unsafe extern "C" fn(
+    eventType: c_int,
+    keyEvent: *const EmscriptenKeyboardEvent,
+    userData: *mut c_void) -> EM_BOOL>;
 
-pub type em_mouse_callback_func = Option<
-    unsafe extern "C" fn(
-        eventType: c_int,
-        mouseEvent: *const EmscriptenMouseEvent,
-        userData: *mut c_void,
-    ) -> EM_BOOL,
->;
+pub type em_mouse_callback_func = Option<unsafe extern "C" fn(
+    eventType: c_int,
+    mouseEvent: *const EmscriptenMouseEvent,
+    userData: *mut c_void) -> EM_BOOL>;
 
-pub type em_pointerlockchange_callback_func = Option<
-    unsafe extern "C" fn(
-        eventType: c_int,
-        pointerlockChangeEvent: *const EmscriptenPointerlockChangeEvent,
-        userData: *mut c_void,
-    ) -> EM_BOOL,
->;
+pub type em_pointerlockchange_callback_func = Option<unsafe extern "C" fn(
+    eventType: c_int,
+    pointerlockChangeEvent: *const EmscriptenPointerlockChangeEvent,
+    userData: *mut c_void) -> EM_BOOL>;
 
-pub type em_fullscreenchange_callback_func = Option<
-    unsafe extern "C" fn(
-        eventType: c_int,
-        fullscreenChangeEvent: *const EmscriptenFullscreenChangeEvent,
-        userData: *mut c_void,
-    ) -> EM_BOOL,
->;
+pub type em_fullscreenchange_callback_func = Option<unsafe extern "C" fn(
+    eventType: c_int,
+    fullscreenChangeEvent: *const EmscriptenFullscreenChangeEvent,
+    userData: *mut c_void) -> EM_BOOL>;
 
-pub type em_touch_callback_func = Option<
-    unsafe extern "C" fn(
-        eventType: c_int,
-        touchEvent: *const EmscriptenTouchEvent,
-        userData: *mut c_void,
-    ) -> EM_BOOL,
->;
+pub type em_touch_callback_func = Option<unsafe extern "C" fn(
+    eventType: c_int,
+    touchEvent: *const EmscriptenTouchEvent,
+    userData: *mut c_void) -> EM_BOOL>;
 
 #[repr(C)]
 pub struct EmscriptenFullscreenChangeEvent {
@@ -151,9 +136,7 @@ fn bindgen_test_layout_EmscriptenKeyboardEvent() {
     assert_eq!(mem::align_of::<EmscriptenKeyboardEvent>(), 8usize);
 }
 impl Clone for EmscriptenKeyboardEvent {
-    fn clone(&self) -> Self {
-        *self
-    }
+    fn clone(&self) -> Self { *self }
 }
 
 #[repr(C)]
@@ -236,128 +219,96 @@ fn bindgen_test_layout_EmscriptenPointerlockChangeEvent() {
 }
 
 extern "C" {
-    pub fn emscripten_set_canvas_size(width: c_int, height: c_int) -> EMSCRIPTEN_RESULT;
+    pub fn emscripten_set_canvas_size(
+        width: c_int, height: c_int)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_get_canvas_size(
-        width: *mut c_int,
-        height: *mut c_int,
-        is_fullscreen: *mut c_int,
-    ) -> EMSCRIPTEN_RESULT;
+        width: *mut c_int, height: *mut c_int,
+        is_fullscreen: *mut c_int)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_element_css_size(
-        target: *const c_char,
-        width: c_double,
-        height: c_double,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, width: c_double,
+        height: c_double) -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_get_element_css_size(
-        target: *const c_char,
-        width: *mut c_double,
-        height: *mut c_double,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, width: *mut c_double,
+        height: *mut c_double) -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_request_pointerlock(
-        target: *const c_char,
-        deferUntilInEventHandler: EM_BOOL,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, deferUntilInEventHandler: EM_BOOL)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_exit_pointerlock() -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_request_fullscreen(
-        target: *const c_char,
-        deferUntilInEventHandler: EM_BOOL,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, deferUntilInEventHandler: EM_BOOL)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_exit_fullscreen() -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_keydown_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: EM_BOOL,
-        callback: em_key_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void,
+        useCapture: EM_BOOL, callback: em_key_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_keyup_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: EM_BOOL,
-        callback: em_key_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void,
+        useCapture: EM_BOOL, callback: em_key_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_mousemove_callback(
-        target: *const c_char,
-        user_data: *mut c_void,
-        use_capture: EM_BOOL,
-        callback: em_mouse_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, user_data: *mut c_void,
+        use_capture: EM_BOOL, callback: em_mouse_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_mousedown_callback(
-        target: *const c_char,
-        user_data: *mut c_void,
-        use_capture: EM_BOOL,
-        callback: em_mouse_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, user_data: *mut c_void,
+        use_capture: EM_BOOL, callback: em_mouse_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_mouseup_callback(
-        target: *const c_char,
-        user_data: *mut c_void,
-        use_capture: EM_BOOL,
-        callback: em_mouse_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, user_data: *mut c_void,
+        use_capture: EM_BOOL, callback: em_mouse_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_hide_mouse();
 
     pub fn emscripten_get_device_pixel_ratio() -> f64;
 
     pub fn emscripten_set_pointerlockchange_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: EM_BOOL,
-        callback: em_pointerlockchange_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void, useCapture: EM_BOOL,
+        callback: em_pointerlockchange_callback_func) -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_fullscreenchange_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: EM_BOOL,
-        callback: em_fullscreenchange_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void, useCapture: EM_BOOL,
+        callback: em_fullscreenchange_callback_func) -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_asm_const(code: *const c_char);
 
     pub fn emscripten_set_main_loop(
-        func: em_callback_func,
-        fps: c_int,
-        simulate_infinite_loop: EM_BOOL,
-    );
+        func: em_callback_func, fps: c_int, simulate_infinite_loop: EM_BOOL);
 
     pub fn emscripten_cancel_main_loop();
 
     pub fn emscripten_set_touchstart_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: c_int,
-        callback: em_touch_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void,
+        useCapture: c_int, callback: em_touch_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_touchend_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: c_int,
-        callback: em_touch_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void,
+        useCapture: c_int, callback: em_touch_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_touchmove_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: c_int,
-        callback: em_touch_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void,
+        useCapture: c_int, callback: em_touch_callback_func)
+        -> EMSCRIPTEN_RESULT;
 
     pub fn emscripten_set_touchcancel_callback(
-        target: *const c_char,
-        userData: *mut c_void,
-        useCapture: c_int,
-        callback: em_touch_callback_func,
-    ) -> EMSCRIPTEN_RESULT;
+        target: *const c_char, userData: *mut c_void,
+        useCapture: c_int, callback: em_touch_callback_func)
+        -> EMSCRIPTEN_RESULT;
 }

src/platform/emscripten/mod.rs

@@ -2,27 +2,19 @@
 
 mod ffi;
 
-use std::{
-    cell::RefCell,
-    collections::VecDeque,
-    mem,
-    os::raw::{c_char, c_double, c_int, c_ulong, c_void},
-    ptr, str,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc, Mutex,
-    },
-};
+use std::{mem, ptr, str};
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::os::raw::{c_char, c_void, c_double, c_ulong, c_int};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Mutex, Arc};
 
-use crate::{
-    dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize},
-    error::{ExternalError, NotSupportedError},
-    window::MonitorHandle as RootMonitorHandle,
-};
+use dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
+use window::MonitorId as RootMonitorId;
 
 const DOCUMENT_NAME: &'static str = "#document\0";
 
-fn hidpi_factor() -> f64 {
+fn get_hidpi_factor() -> f64 {
     unsafe { ffi::emscripten_get_device_pixel_ratio() as f64 }
 }
 
@@ -32,8 +24,6 @@ pub struct PlatformSpecificWindowBuilderAttributes;
 unsafe impl Send for PlatformSpecificWindowBuilderAttributes {}
 unsafe impl Sync for PlatformSpecificWindowBuilderAttributes {}
 
-pub type OsError = std::io::Error;
-
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct DeviceId;
 
@@ -47,27 +37,27 @@ impl DeviceId {
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
 #[derive(Debug, Clone)]
-pub struct MonitorHandle;
+pub struct MonitorId;
 
-impl MonitorHandle {
+impl MonitorId {
     #[inline]
-    pub fn name(&self) -> Option<String> {
+    pub fn get_name(&self) -> Option<String> {
         Some("Canvas".to_owned())
     }
 
     #[inline]
-    pub fn outer_position(&self) -> PhysicalPosition {
+    pub fn get_position(&self) -> PhysicalPosition {
         unimplemented!()
     }
 
     #[inline]
-    pub fn size(&self) -> PhysicalSize {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         (0, 0).into()
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f64 {
-        hidpi_factor()
+    pub fn get_hidpi_factor(&self) -> f64 {
+        get_hidpi_factor()
     }
 }
 
@@ -75,22 +65,14 @@ impl MonitorHandle {
 thread_local!(static MAIN_LOOP_CALLBACK: RefCell<*mut c_void> = RefCell::new(ptr::null_mut()));
 
 // Used to assign a callback to emscripten main loop
-pub fn set_main_loop_callback<F>(callback: F)
-where
-    F: FnMut(),
-{
+pub fn set_main_loop_callback<F>(callback : F) where F : FnMut() {
     MAIN_LOOP_CALLBACK.with(|log| {
         *log.borrow_mut() = &callback as *const _ as *mut c_void;
     });
 
-    unsafe {
-        ffi::emscripten_set_main_loop(Some(wrapper::<F>), 0, 1);
-    }
+    unsafe { ffi::emscripten_set_main_loop(Some(wrapper::<F>), 0, 1); }
 
-    unsafe extern "C" fn wrapper<F>()
-    where
-        F: FnMut(),
-    {
+    unsafe extern "C" fn wrapper<F>() where F : FnMut() {
         MAIN_LOOP_CALLBACK.with(|z| {
             let closure = *z.borrow_mut() as *mut F;
             (*closure)();
@@ -99,22 +81,22 @@ where
 }
 
 #[derive(Clone)]
-pub struct EventLoopProxy;
+pub struct EventsLoopProxy;
 
-impl EventLoopProxy {
-    pub fn wakeup(&self) -> Result<(), ::EventLoopClosed> {
+impl EventsLoopProxy {
+    pub fn wakeup(&self) -> Result<(), ::EventsLoopClosed> {
         unimplemented!()
     }
 }
 
-pub struct EventLoop {
+pub struct EventsLoop {
     window: Mutex<Option<Arc<Window2>>>,
     interrupted: AtomicBool,
 }
 
-impl EventLoop {
-    pub fn new() -> EventLoop {
-        EventLoop {
+impl EventsLoop {
+    pub fn new() -> EventsLoop {
+        EventsLoop {
             window: Mutex::new(None),
             interrupted: AtomicBool::new(false),
         }
@@ -126,25 +108,24 @@ impl EventLoop {
     }
 
     #[inline]
-    pub fn create_proxy(&self) -> EventLoopProxy {
+    pub fn create_proxy(&self) -> EventsLoopProxy {
         unimplemented!()
     }
 
     #[inline]
-    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
         let mut list = VecDeque::with_capacity(1);
-        list.push_back(MonitorHandle);
+        list.push_back(MonitorId);
         list
     }
 
     #[inline]
-    pub fn primary_monitor(&self) -> MonitorHandle {
-        MonitorHandle
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId
     }
 
     pub fn poll_events<F>(&self, mut callback: F)
-    where
-        F: FnMut(::Event),
+        where F: FnMut(::Event)
     {
         let ref mut window = *self.window.lock().unwrap();
         if let &mut Some(ref mut window) = window {
@@ -155,22 +136,17 @@ impl EventLoop {
     }
 
     pub fn run_forever<F>(&self, mut callback: F)
-    where
-        F: FnMut(::Event) -> ::ControlFlow,
+        where F: FnMut(::Event) -> ::ControlFlow
     {
         self.interrupted.store(false, Ordering::Relaxed);
 
         // TODO: handle control flow
 
         set_main_loop_callback(|| {
-            self.poll_events(|e| {
-                callback(e);
-            });
+            self.poll_events(|e| { callback(e); });
             ::std::thread::sleep(::std::time::Duration::from_millis(5));
             if self.interrupted.load(Ordering::Relaxed) {
-                unsafe {
-                    ffi::emscripten_cancel_main_loop();
-                }
+                unsafe { ffi::emscripten_cancel_main_loop(); }
             }
         });
     }
@@ -187,7 +163,7 @@ impl WindowId {
 
 pub struct Window2 {
     cursor_grabbed: Mutex<bool>,
-    cursor_visible: Mutex<bool>,
+    cursor_hidden: Mutex<bool>,
     is_fullscreen: bool,
     events: Box<Mutex<VecDeque<::Event>>>,
 }
@@ -211,15 +187,15 @@ fn show_mouse() {
     // }
     // styleSheet.insertRule('canvas.emscripten { border: none; cursor: auto; }', 0);
     unsafe {
-        ffi::emscripten_asm_const(b"var styleSheet = document.styleSheets[0]; var rules = styleSheet.cssRules; for (var i = 0; i < rules.length; i++) { if (rules[i].cssText.substr(0, 6) == 'canvas') { styleSheet.deleteRule(i); i--; } } styleSheet.insertRule('canvas.emscripten { border: none; cursor: auto; }', 0);\0".as_ptr() as *const c_char);
+            ffi::emscripten_asm_const(b"var styleSheet = document.styleSheets[0]; var rules = styleSheet.cssRules; for (var i = 0; i < rules.length; i++) { if (rules[i].cssText.substr(0, 6) == 'canvas') { styleSheet.deleteRule(i); i--; } } styleSheet.insertRule('canvas.emscripten { border: none; cursor: auto; }', 0);\0".as_ptr() as *const c_char);
     }
 }
 
 extern "C" fn mouse_callback(
     event_type: c_int,
     event: *const ffi::EmscriptenMouseEvent,
-    event_queue: *mut c_void,
-) -> ffi::EM_BOOL {
+    event_queue: *mut c_void) -> ffi::EM_BOOL
+{
     unsafe {
         let queue: &Mutex<VecDeque<::Event>> = mem::transmute(event_queue);
 
@@ -232,7 +208,7 @@ extern "C" fn mouse_callback(
 
         match event_type {
             ffi::EMSCRIPTEN_EVENT_MOUSEMOVE => {
-                let dpi_factor = hidpi_factor();
+                let dpi_factor = get_hidpi_factor();
                 let position = LogicalPosition::from_physical(
                     ((*event).canvasX as f64, (*event).canvasY as f64),
                     dpi_factor,
@@ -242,18 +218,18 @@ extern "C" fn mouse_callback(
                     event: ::WindowEvent::CursorMoved {
                         device_id: ::DeviceId(DeviceId),
                         position,
-                        modifiers,
-                    },
+                        modifiers: modifiers,
+                    }
                 });
                 queue.lock().unwrap().push_back(::Event::DeviceEvent {
                     device_id: ::DeviceId(DeviceId),
                     event: ::DeviceEvent::MouseMotion {
                         delta: ((*event).movementX as f64, (*event).movementY as f64),
-                    },
+                    }
                 });
             },
-            mouse_input @ ffi::EMSCRIPTEN_EVENT_MOUSEDOWN
-            | mouse_input @ ffi::EMSCRIPTEN_EVENT_MOUSEUP => {
+            mouse_input @ ffi::EMSCRIPTEN_EVENT_MOUSEDOWN |
+            mouse_input @ ffi::EMSCRIPTEN_EVENT_MOUSEUP => {
                 let button = match (*event).button {
                     0 => ::MouseButton::Left,
                     1 => ::MouseButton::Middle,
@@ -269,13 +245,14 @@ extern "C" fn mouse_callback(
                     window_id: ::WindowId(WindowId(0)),
                     event: ::WindowEvent::MouseInput {
                         device_id: ::DeviceId(DeviceId),
-                        state,
-                        button,
-                        modifiers,
-                    },
+                        state: state,
+                        button: button,
+                        modifiers: modifiers,
+                    }
                 })
             },
-            _ => {},
+            _ => {
+            }
         }
     }
     ffi::EM_FALSE
@@ -284,8 +261,8 @@ extern "C" fn mouse_callback(
 extern "C" fn keyboard_callback(
     event_type: c_int,
     event: *const ffi::EmscriptenKeyboardEvent,
-    event_queue: *mut c_void,
-) -> ffi::EM_BOOL {
+    event_queue: *mut c_void) -> ffi::EM_BOOL
+{
     unsafe {
         let queue: &Mutex<VecDeque<::Event>> = mem::transmute(event_queue);
 
@@ -325,17 +302,18 @@ extern "C" fn keyboard_callback(
                     },
                 });
             },
-            _ => {},
+            _ => {
+            }
         }
     }
     ffi::EM_FALSE
 }
 
-extern "C" fn touch_callback(
+extern fn touch_callback(
     event_type: c_int,
     event: *const ffi::EmscriptenTouchEvent,
-    event_queue: *mut c_void,
-) -> ffi::EM_BOOL {
+    event_queue: *mut c_void) -> ffi::EM_BOOL
+{
     unsafe {
         let queue: &Mutex<VecDeque<::Event>> = mem::transmute(event_queue);
 
@@ -350,7 +328,7 @@ extern "C" fn touch_callback(
         for touch in 0..(*event).numTouches as usize {
             let touch = (*event).touches[touch];
             if touch.isChanged == ffi::EM_TRUE {
-                let dpi_factor = hidpi_factor();
+                let dpi_factor = get_hidpi_factor();
                 let location = LogicalPosition::from_physical(
                     (touch.canvasX as f64, touch.canvasY as f64),
                     dpi_factor,
@@ -375,8 +353,8 @@ extern "C" fn touch_callback(
 unsafe extern "C" fn fullscreen_callback(
     _eventType: c_int,
     _fullscreenChangeEvent: *const ffi::EmscriptenFullscreenChangeEvent,
-    _userData: *mut c_void,
-) -> ffi::EM_BOOL {
+    _userData: *mut c_void) -> ffi::EM_BOOL
+{
     ffi::emscripten_request_fullscreen(ptr::null(), ffi::EM_TRUE);
     ffi::EM_FALSE
 }
@@ -386,8 +364,8 @@ unsafe extern "C" fn fullscreen_callback(
 unsafe extern "C" fn pointerlockchange_callback(
     _eventType: c_int,
     _pointerlockChangeEvent: *const ffi::EmscriptenPointerlockChangeEvent,
-    _userData: *mut c_void,
-) -> ffi::EM_BOOL {
+    _userData: *mut c_void) -> ffi::EM_BOOL
+{
     ffi::emscripten_request_pointerlock(ptr::null(), ffi::EM_TRUE);
     ffi::EM_FALSE
 }
@@ -400,20 +378,17 @@ fn em_try(res: ffi::EMSCRIPTEN_RESULT) -> Result<(), String> {
 }
 
 impl Window {
-    pub fn new(
-        event_loop: &EventLoop,
-        attribs: ::WindowAttributes,
-        _pl_attribs: PlatformSpecificWindowBuilderAttributes,
-    ) -> Result<Window, ::CreationError> {
-        if event_loop.window.lock().unwrap().is_some() {
-            return Err(::CreationError::OsError(
-                "Cannot create another window".to_owned(),
-            ));
+    pub fn new(events_loop: &EventsLoop, attribs: ::WindowAttributes,
+               _pl_attribs: PlatformSpecificWindowBuilderAttributes)
+        -> Result<Window, ::CreationError>
+    {
+        if events_loop.window.lock().unwrap().is_some() {
+            return Err(::CreationError::OsError("Cannot create another window".to_owned()));
         }
 
         let w = Window2 {
-            cursor_grabbed: Mutex::new(false),
-            cursor_visible: Mutex::new(true),
+            cursor_grabbed: Default::default(),
+            cursor_hidden: Default::default(),
             events: Default::default(),
             is_fullscreen: attribs.fullscreen.is_some(),
         };
@@ -422,93 +397,41 @@ impl Window {
             window: Arc::new(w),
         };
 
+
         // TODO: set up more event callbacks
         unsafe {
-            em_try(ffi::emscripten_set_mousemove_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(mouse_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_mousedown_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(mouse_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_mouseup_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(mouse_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_keydown_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(keyboard_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_keyup_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(keyboard_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_touchstart_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(touch_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_touchend_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(touch_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_touchmove_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(touch_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
-            em_try(ffi::emscripten_set_touchcancel_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                mem::transmute(&*window.window.events),
-                ffi::EM_FALSE,
-                Some(touch_callback),
-            ))
-            .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_mousemove_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(mouse_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_mousedown_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(mouse_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_mouseup_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(mouse_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_keydown_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(keyboard_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_keyup_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(keyboard_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_touchstart_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(touch_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_touchend_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(touch_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_touchmove_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(touch_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
+            em_try(ffi::emscripten_set_touchcancel_callback(DOCUMENT_NAME.as_ptr() as *const c_char, mem::transmute(&*window.window.events), ffi::EM_FALSE, Some(touch_callback)))
+                .map_err(|e| ::CreationError::OsError(format!("emscripten error: {}", e)))?;
         }
 
         if attribs.fullscreen.is_some() {
             unsafe {
-                em_try(ffi::emscripten_request_fullscreen(
-                    ptr::null(),
-                    ffi::EM_TRUE,
-                ))
-                .map_err(|e| ::CreationError::OsError(e))?;
-                em_try(ffi::emscripten_set_fullscreenchange_callback(
-                    ptr::null(),
-                    0 as *mut c_void,
-                    ffi::EM_FALSE,
-                    Some(fullscreen_callback),
-                ))
-                .map_err(|e| ::CreationError::OsError(e))?;
+                em_try(ffi::emscripten_request_fullscreen(ptr::null(), ffi::EM_TRUE))
+                    .map_err(|e| ::CreationError::OsError(e))?;
+                em_try(ffi::emscripten_set_fullscreenchange_callback(ptr::null(), 0 as *mut c_void, ffi::EM_FALSE, Some(fullscreen_callback)))
+                    .map_err(|e| ::CreationError::OsError(e))?;
             }
-        } else if let Some(size) = attribs.inner_size {
+        } else if let Some(size) = attribs.dimensions {
             window.set_inner_size(size);
         }
 
-        *event_loop.window.lock().unwrap() = Some(window.window.clone());
+        *events_loop.window.lock().unwrap() = Some(window.window.clone());
         Ok(window)
     }
 
@@ -518,23 +441,25 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_title(&self, _title: &str) {}
+    pub fn set_title(&self, _title: &str) {
+    }
 
     #[inline]
-    pub fn outer_position(&self) -> Option<LogicalPosition> {
+    pub fn get_position(&self) -> Option<LogicalPosition> {
         Some((0, 0).into())
     }
 
     #[inline]
-    pub fn inner_position(&self) -> Option<LogicalPosition> {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
         Some((0, 0).into())
     }
 
     #[inline]
-    pub fn set_outer_position(&self, _: LogicalPosition) {}
+    pub fn set_position(&self, _: LogicalPosition) {
+    }
 
     #[inline]
-    pub fn inner_size(&self) -> Option<LogicalSize> {
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         unsafe {
             let mut width = 0;
             let mut height = 0;
@@ -545,7 +470,7 @@ impl Window {
             {
                 None
             } else {
-                let dpi_factor = self.hidpi_factor();
+                let dpi_factor = self.get_hidpi_factor();
                 let logical = LogicalSize::from_physical((width as u32, height as u32), dpi_factor);
                 Some(logical)
             }
@@ -553,14 +478,14 @@ impl Window {
     }
 
     #[inline]
-    pub fn outer_size(&self) -> Option<LogicalSize> {
-        self.inner_size()
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
+        self.get_inner_size()
     }
 
     #[inline]
     pub fn set_inner_size(&self, size: LogicalSize) {
         unsafe {
-            let dpi_factor = self.hidpi_factor();
+            let dpi_factor = self.get_hidpi_factor();
             let physical = PhysicalSize::from_logical(size, dpi_factor);
             let (width, height): (u32, u32) = physical.into();
             ffi::emscripten_set_element_css_size(
@@ -572,12 +497,12 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_min_inner_size(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
     #[inline]
-    pub fn set_max_inner_size(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
@@ -597,16 +522,14 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_icon(&self, _cursor: ::CursorIcon) {
+    pub fn set_cursor(&self, _cursor: ::MouseCursor) {
         // N/A
     }
 
     #[inline]
-    pub fn set_cursor_grab(&self, grab: bool) -> Result<(), ExternalError> {
+    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
         let mut grabbed_lock = self.window.cursor_grabbed.lock().unwrap();
-        if grab == *grabbed_lock {
-            return Ok(());
-        }
+        if grab == *grabbed_lock { return Ok(()); }
         unsafe {
             if grab {
                 em_try(ffi::emscripten_set_pointerlockchange_callback(
@@ -615,10 +538,7 @@ impl Window {
                     ffi::EM_FALSE,
                     Some(pointerlockchange_callback),
                 ))?;
-                em_try(ffi::emscripten_request_pointerlock(
-                    ptr::null(),
-                    ffi::EM_TRUE,
-                ))?;
+                em_try(ffi::emscripten_request_pointerlock(ptr::null(), ffi::EM_TRUE))?;
             } else {
                 em_try(ffi::emscripten_set_pointerlockchange_callback(
                     ptr::null(),
@@ -634,26 +554,24 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_visible(&self, visible: bool) {
-        let mut visible_lock = self.window.cursor_visible.lock().unwrap();
-        if visible == *visible_lock {
-            return;
-        }
-        if visible {
-            show_mouse();
-        } else {
+    pub fn hide_cursor(&self, hide: bool) {
+        let mut hidden_lock = self.window.cursor_hidden.lock().unwrap();
+        if hide == *hidden_lock { return; }
+        if hide {
             unsafe { ffi::emscripten_hide_mouse() };
+        } else {
+            show_mouse();
         }
-        *visible_lock = visible;
+        *hidden_lock = hide;
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f64 {
-        hidpi_factor()
+    pub fn get_hidpi_factor(&self) -> f64 {
+        get_hidpi_factor()
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), ExternalError> {
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
         Err("Setting cursor position is not possible on Emscripten.".to_owned())
     }
 
@@ -663,12 +581,12 @@ impl Window {
     }
 
     #[inline]
-    pub fn fullscreen(&self) -> Option<::MonitorHandle> {
+    pub fn get_fullscreen(&self) -> Option<::MonitorId> {
         None
     }
 
     #[inline]
-    pub fn set_fullscreen(&self, _monitor: Option<::MonitorHandle>) {
+    pub fn set_fullscreen(&self, _monitor: Option<::MonitorId>) {
         // iOS has single screen maximized apps so nothing to do
     }
 
@@ -688,76 +606,58 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_ime_position(&self, _logical_spot: LogicalPosition) {
+    pub fn set_ime_spot(&self, _logical_spot: LogicalPosition) {
         // N/A
     }
 
     #[inline]
-    pub fn current_monitor(&self) -> RootMonitorHandle {
-        RootMonitorHandle {
-            inner: MonitorHandle,
-        }
+    pub fn get_current_monitor(&self) -> RootMonitorId {
+        RootMonitorId { inner: MonitorId }
     }
 
     #[inline]
-    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
         let mut list = VecDeque::with_capacity(1);
-        list.push_back(MonitorHandle);
+        list.push_back(MonitorId);
         list
     }
 
     #[inline]
-    pub fn primary_monitor(&self) -> MonitorHandle {
-        MonitorHandle
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId
     }
 }
 
 impl Drop for Window {
     fn drop(&mut self) {
-        // Delete window from event_loop
+        // Delete window from events_loop
         // TODO: ?
-        /*if let Some(ev) = self.event_loop.upgrade() {
+        /*if let Some(ev) = self.events_loop.upgrade() {
             let _ = ev.window.lock().unwrap().take().unwrap();
         }*/
 
         unsafe {
             // Return back to normal cursor state
             self.hide_cursor(false);
-            self.set_cursor_grab(false);
+            self.grab_cursor(false);
 
             // Exit fullscreen if on
             if self.window.is_fullscreen {
-                ffi::emscripten_set_fullscreenchange_callback(
-                    ptr::null(),
-                    0 as *mut c_void,
-                    ffi::EM_FALSE,
-                    None,
-                );
+                ffi::emscripten_set_fullscreenchange_callback(ptr::null(), 0 as *mut c_void, ffi::EM_FALSE, None);
                 ffi::emscripten_exit_fullscreen();
             }
 
             // Delete callbacks
-            ffi::emscripten_set_keydown_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                0 as *mut c_void,
-                ffi::EM_FALSE,
-                None,
-            );
-            ffi::emscripten_set_keyup_callback(
-                DOCUMENT_NAME.as_ptr() as *const c_char,
-                0 as *mut c_void,
-                ffi::EM_FALSE,
-                None,
-            );
+            ffi::emscripten_set_keydown_callback(DOCUMENT_NAME.as_ptr() as *const c_char, 0 as *mut c_void, ffi::EM_FALSE,None);
+            ffi::emscripten_set_keyup_callback(DOCUMENT_NAME.as_ptr() as *const c_char, 0 as *mut c_void, ffi::EM_FALSE,None);
         }
     }
 }
 
 fn error_to_str(code: ffi::EMSCRIPTEN_RESULT) -> &'static str {
     match code {
-        ffi::EMSCRIPTEN_RESULT_SUCCESS | ffi::EMSCRIPTEN_RESULT_DEFERRED => {
-            "Internal error in the library (success detected as failure)"
-        },
+        ffi::EMSCRIPTEN_RESULT_SUCCESS | ffi::EMSCRIPTEN_RESULT_DEFERRED
+            => "Internal error in the library (success detected as failure)",
 
         ffi::EMSCRIPTEN_RESULT_NOT_SUPPORTED => "Not supported",
         ffi::EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED => "Failed not deferred",
@@ -767,7 +667,7 @@ fn error_to_str(code: ffi::EMSCRIPTEN_RESULT) -> &'static str {
         ffi::EMSCRIPTEN_RESULT_FAILED => "Failed",
         ffi::EMSCRIPTEN_RESULT_NO_DATA => "No data",
 
-        _ => "Undocumented error",
+        _ => "Undocumented error"
     }
 }
 
@@ -776,9 +676,7 @@ fn key_translate(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES]) ->
     let maybe_key = unsafe { str::from_utf8(mem::transmute::<_, &[u8]>(slice)) };
     let key = match maybe_key {
         Ok(key) => key,
-        Err(_) => {
-            return 0;
-        },
+        Err(_) => { return 0; },
     };
     if key.chars().count() == 1 {
         key.as_bytes()[0]
@@ -787,35 +685,28 @@ fn key_translate(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES]) ->
     }
 }
 
-fn key_translate_virt(
-    input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES],
-    location: c_ulong,
-) -> Option<::VirtualKeyCode> {
+fn key_translate_virt(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES],
+                      location: c_ulong) -> Option<::VirtualKeyCode>
+{
     let slice = &input[0..input.iter().take_while(|x| **x != 0).count()];
     let maybe_key = unsafe { str::from_utf8(mem::transmute::<_, &[u8]>(slice)) };
     let key = match maybe_key {
         Ok(key) => key,
-        Err(_) => {
-            return None;
-        },
+        Err(_) => { return None; },
     };
     use VirtualKeyCode::*;
     match key {
-        "Alt" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_LEFT => Some(LAlt),
-                ffi::DOM_KEY_LOCATION_RIGHT => Some(RAlt),
-                _ => None,
-            }
+        "Alt" => match location {
+            ffi::DOM_KEY_LOCATION_LEFT => Some(LAlt),
+            ffi::DOM_KEY_LOCATION_RIGHT => Some(RAlt),
+            _ => None,
         },
         "AltGraph" => None,
         "CapsLock" => None,
-        "Control" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_LEFT => Some(LControl),
-                ffi::DOM_KEY_LOCATION_RIGHT => Some(RControl),
-                _ => None,
-            }
+        "Control" => match location {
+            ffi::DOM_KEY_LOCATION_LEFT => Some(LControl),
+            ffi::DOM_KEY_LOCATION_RIGHT => Some(RControl),
+            _ => None,
         },
         "Fn" => None,
         "FnLock" => None,
@@ -823,22 +714,18 @@ fn key_translate_virt(
         "Meta" => None,
         "NumLock" => Some(Numlock),
         "ScrollLock" => Some(Scroll),
-        "Shift" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_LEFT => Some(LShift),
-                ffi::DOM_KEY_LOCATION_RIGHT => Some(RShift),
-                _ => None,
-            }
+        "Shift" => match location {
+            ffi::DOM_KEY_LOCATION_LEFT => Some(LShift),
+            ffi::DOM_KEY_LOCATION_RIGHT => Some(RShift),
+            _ => None,
         },
         "Super" => None,
         "Symbol" => None,
         "SymbolLock" => None,
 
-        "Enter" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(NumpadEnter),
-                _ => Some(Return),
-            }
+        "Enter" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(NumpadEnter),
+            _ => Some(Return),
         },
         "Tab" => Some(Tab),
         " " => Some(Space),
@@ -1163,65 +1050,45 @@ fn key_translate_virt(
         "Divide" => Some(Divide),
         "Subtract" | "-" => Some(Subtract),
         "Separator" => None,
-        "0" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad0),
-                _ => Some(Key0),
-            }
+        "0" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad0),
+            _ => Some(Key0),
         },
-        "1" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad1),
-                _ => Some(Key1),
-            }
+        "1" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad1),
+            _ => Some(Key1),
         },
-        "2" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad2),
-                _ => Some(Key2),
-            }
+        "2" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad2),
+            _ => Some(Key2),
         },
-        "3" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad3),
-                _ => Some(Key3),
-            }
+        "3" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad3),
+            _ => Some(Key3),
         },
-        "4" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad4),
-                _ => Some(Key4),
-            }
+        "4" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad4),
+            _ => Some(Key4),
         },
-        "5" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad5),
-                _ => Some(Key5),
-            }
+        "5" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad5),
+            _ => Some(Key5),
         },
-        "6" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad6),
-                _ => Some(Key6),
-            }
+        "6" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad6),
+            _ => Some(Key6),
         },
-        "7" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad7),
-                _ => Some(Key7),
-            }
+        "7" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad7),
+            _ => Some(Key7),
         },
-        "8" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad8),
-                _ => Some(Key8),
-            }
+        "8" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad8),
+            _ => Some(Key8),
         },
-        "9" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad9),
-                _ => Some(Key9),
-            }
+        "9" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(Numpad9),
+            _ => Some(Key9),
         },
 
         "A" | "a" => Some(A),
@@ -1254,17 +1121,13 @@ fn key_translate_virt(
         "'" => Some(Apostrophe),
         "\\" => Some(Backslash),
         ":" => Some(Colon),
-        "," => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(NumpadComma),
-                _ => Some(Comma),
-            }
+        "," => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(NumpadComma),
+            _ => Some(Comma),
         },
-        "=" => {
-            match location {
-                ffi::DOM_KEY_LOCATION_NUMPAD => Some(NumpadEquals),
-                _ => Some(Equals),
-            }
+        "=" => match location {
+            ffi::DOM_KEY_LOCATION_NUMPAD => Some(NumpadEquals),
+            _ => Some(Equals),
         },
         "{" => Some(LBracket),
         "." => Some(Period),

src/platform/ios.rs

@@ -1,163 +0,0 @@
-#![cfg(target_os = "ios")]
-
-use std::os::raw::c_void;
-
-use crate::{
-    event_loop::EventLoop,
-    monitor::MonitorHandle,
-    window::{Window, WindowBuilder},
-};
-
-/// Additional methods on `EventLoop` that are specific to iOS.
-pub trait EventLoopExtIOS {
-    /// Returns the idiom (phone/tablet/tv/etc) for the current device.
-    fn idiom(&self) -> Idiom;
-}
-
-impl<T: 'static> EventLoopExtIOS for EventLoop<T> {
-    fn idiom(&self) -> Idiom {
-        self.event_loop.idiom()
-    }
-}
-
-/// Additional methods on `Window` that are specific to iOS.
-pub trait WindowExtIOS {
-    /// Returns a pointer to the `UIWindow` that is used by this window.
-    ///
-    /// The pointer will become invalid when the `Window` is destroyed.
-    fn ui_window(&self) -> *mut c_void;
-
-    /// Returns a pointer to the `UIViewController` that is used by this window.
-    ///
-    /// The pointer will become invalid when the `Window` is destroyed.
-    fn ui_view_controller(&self) -> *mut c_void;
-
-    /// Returns a pointer to the `UIView` that is used by this window.
-    ///
-    /// The pointer will become invalid when the `Window` is destroyed.
-    fn ui_view(&self) -> *mut c_void;
-
-    /// Sets the HiDpi factor used by this window.
-    ///
-    /// This translates to `-[UIWindow setContentScaleFactor:hidpi_factor]`.
-    fn set_hidpi_factor(&self, hidpi_factor: f64);
-
-    /// Sets the valid orientations for screens showing this `Window`.
-    ///
-    /// On iPhones and iPods upside down portrait is never enabled.
-    fn set_valid_orientations(&self, valid_orientations: ValidOrientations);
-}
-
-impl WindowExtIOS for Window {
-    #[inline]
-    fn ui_window(&self) -> *mut c_void {
-        self.window.ui_window() as _
-    }
-
-    #[inline]
-    fn ui_view_controller(&self) -> *mut c_void {
-        self.window.ui_view_controller() as _
-    }
-
-    #[inline]
-    fn ui_view(&self) -> *mut c_void {
-        self.window.ui_view() as _
-    }
-
-    #[inline]
-    fn set_hidpi_factor(&self, hidpi_factor: f64) {
-        self.window.set_hidpi_factor(hidpi_factor)
-    }
-
-    #[inline]
-    fn set_valid_orientations(&self, valid_orientations: ValidOrientations) {
-        self.window.set_valid_orientations(valid_orientations)
-    }
-}
-
-/// Additional methods on `WindowBuilder` that are specific to iOS.
-pub trait WindowBuilderExtIOS {
-    /// Sets the root view class used by the `Window`, otherwise a barebones `UIView` is provided.
-    ///
-    /// The class will be initialized by calling `[root_view initWithFrame:CGRect]`
-    fn with_root_view_class(self, root_view_class: *const c_void) -> WindowBuilder;
-
-    /// Sets the `contentScaleFactor` of the underlying `UIWindow` to `hidpi_factor`.
-    ///
-    /// The default value is device dependent, and it's recommended GLES or Metal applications set
-    /// this to `MonitorHandle::hidpi_factor()`.
-    fn with_hidpi_factor(self, hidpi_factor: f64) -> WindowBuilder;
-
-    /// Sets the valid orientations for the `Window`.
-    fn with_valid_orientations(self, valid_orientations: ValidOrientations) -> WindowBuilder;
-}
-
-impl WindowBuilderExtIOS for WindowBuilder {
-    #[inline]
-    fn with_root_view_class(mut self, root_view_class: *const c_void) -> WindowBuilder {
-        self.platform_specific.root_view_class = unsafe { &*(root_view_class as *const _) };
-        self
-    }
-
-    #[inline]
-    fn with_hidpi_factor(mut self, hidpi_factor: f64) -> WindowBuilder {
-        self.platform_specific.hidpi_factor = Some(hidpi_factor);
-        self
-    }
-
-    #[inline]
-    fn with_valid_orientations(mut self, valid_orientations: ValidOrientations) -> WindowBuilder {
-        self.platform_specific.valid_orientations = valid_orientations;
-        self
-    }
-}
-
-/// Additional methods on `MonitorHandle` that are specific to iOS.
-pub trait MonitorHandleExtIOS {
-    /// Returns a pointer to the `UIScreen` that is used by this monitor.
-    fn ui_screen(&self) -> *mut c_void;
-}
-
-impl MonitorHandleExtIOS for MonitorHandle {
-    #[inline]
-    fn ui_screen(&self) -> *mut c_void {
-        self.inner.ui_screen() as _
-    }
-}
-
-/// Valid orientations for a particular `Window`.
-#[derive(Clone, Copy, Debug)]
-pub enum ValidOrientations {
-    /// Excludes `PortraitUpsideDown` on iphone
-    LandscapeAndPortrait,
-
-    Landscape,
-
-    /// Excludes `PortraitUpsideDown` on iphone
-    Portrait,
-}
-
-impl Default for ValidOrientations {
-    #[inline]
-    fn default() -> ValidOrientations {
-        ValidOrientations::LandscapeAndPortrait
-    }
-}
-
-/// The device [idiom].
-///
-/// [idiom]: https://developer.apple.com/documentation/uikit/uidevice/1620037-userinterfaceidiom?language=objc
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Idiom {
-    Unspecified,
-
-    /// iPhone and iPod touch.
-    Phone,
-
-    /// iPad.
-    Pad,
-
-    /// tvOS and Apple TV.
-    TV,
-    CarPlay,
-}

src/platform/ios/ffi.rs

@@ -0,0 +1,110 @@
+#![allow(non_camel_case_types, non_snake_case, non_upper_case_globals)]
+
+use std::ffi::CString;
+use std::os::raw::*;
+
+use objc::runtime::Object;
+
+pub type id = *mut Object;
+pub const nil: id = 0 as id;
+
+pub type CFStringRef = *const c_void;
+pub type CFTimeInterval = f64;
+pub type Boolean = u32;
+
+pub const kCFRunLoopRunHandledSource: i32 = 4;
+
+#[cfg(target_pointer_width = "32")]
+pub type CGFloat = f32;
+#[cfg(target_pointer_width = "64")]
+pub type CGFloat = f64;
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGPoint {
+    pub x: CGFloat,
+    pub y: CGFloat,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGRect {
+    pub origin: CGPoint,
+    pub size: CGSize,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGSize {
+    pub width: CGFloat,
+    pub height: CGFloat,
+}
+
+#[link(name = "UIKit", kind = "framework")]
+#[link(name = "CoreFoundation", kind = "framework")]
+#[link(name = "GlKit", kind = "framework")]
+extern {
+    pub static kCFRunLoopDefaultMode: CFStringRef;
+
+    // int UIApplicationMain ( int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName );
+    pub fn UIApplicationMain(
+        argc: c_int,
+        argv: *const c_char,
+        principalClassName: id,
+        delegateClassName: id,
+    ) -> c_int;
+
+    // SInt32 CFRunLoopRunInMode ( CFStringRef mode, CFTimeInterval seconds, Boolean returnAfterSourceHandled );
+    pub fn CFRunLoopRunInMode(
+        mode: CFStringRef,
+        seconds: CFTimeInterval,
+        returnAfterSourceHandled: Boolean,
+    ) -> i32;
+}
+
+extern {
+    pub fn setjmp(env: *mut c_void) -> c_int;
+    pub fn longjmp(env: *mut c_void, val: c_int) -> !;
+}
+
+// values taken from "setjmp.h" header in xcode iPhoneOS/iPhoneSimulator SDK
+#[cfg(any(target_arch = "x86_64"))]
+pub const JBLEN: usize = (9 * 2) + 3 + 16;
+#[cfg(any(target_arch = "x86"))]
+pub const JBLEN: usize = 18;
+#[cfg(target_arch = "arm")]
+pub const JBLEN: usize = 10 + 16 + 2;
+#[cfg(target_arch = "aarch64")]
+pub const JBLEN: usize = (14 + 8 + 2) * 2;
+
+pub type JmpBuf = [c_int; JBLEN];
+
+pub trait NSString: Sized {
+    unsafe fn alloc(_: Self) -> id {
+        msg_send![class!(NSString), alloc]
+    }
+
+    unsafe fn initWithUTF8String_(self, c_string: *const c_char) -> id;
+    unsafe fn stringByAppendingString_(self, other: id) -> id;
+    unsafe fn init_str(self, string: &str) -> Self;
+    unsafe fn UTF8String(self) -> *const c_char;
+}
+
+impl NSString for id {
+    unsafe fn initWithUTF8String_(self, c_string: *const c_char) -> id {
+        msg_send![self, initWithUTF8String:c_string as id]
+    }
+
+    unsafe fn stringByAppendingString_(self, other: id) -> id {
+        msg_send![self, stringByAppendingString:other]
+    }
+
+    unsafe fn init_str(self, string: &str) -> id {
+        let cstring = CString::new(string).unwrap();
+        self.initWithUTF8String_(cstring.as_ptr())
+    }
+
+    unsafe fn UTF8String(self) -> *const c_char {
+        msg_send![self, UTF8String]
+    }
+}

src/platform/ios/mod.rs

@@ -0,0 +1,719 @@
+//! iOS support
+//!
+//! # Building app
+//! To build ios app you will need rustc built for this targets:
+//!
+//!  - armv7-apple-ios
+//!  - armv7s-apple-ios
+//!  - i386-apple-ios
+//!  - aarch64-apple-ios
+//!  - x86_64-apple-ios
+//!
+//! Then
+//!
+//! ```
+//! cargo build --target=...
+//! ```
+//! The simplest way to integrate your app into xcode environment is to build it
+//! as a static library. Wrap your main function and export it.
+//!
+//! ```rust, ignore
+//! #[no_mangle]
+//! pub extern fn start_winit_app() {
+//!     start_inner()
+//! }
+//!
+//! fn start_inner() {
+//!    ...
+//! }
+//!
+//! ```
+//!
+//! Compile project and then drag resulting .a into Xcode project. Add winit.h to xcode.
+//!
+//! ```ignore
+//! void start_winit_app();
+//! ```
+//!
+//! Use start_winit_app inside your xcode's main function.
+//!
+//!
+//! # App lifecycle and events
+//!
+//! iOS environment is very different from other platforms and you must be very
+//! careful with it's events. Familiarize yourself with
+//! [app lifecycle](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIApplicationDelegate_Protocol/).
+//!
+//!
+//! This is how those event are represented in winit:
+//!
+//!  - applicationDidBecomeActive is Focused(true)
+//!  - applicationWillResignActive is Focused(false)
+//!  - applicationDidEnterBackground is Suspended(true)
+//!  - applicationWillEnterForeground is Suspended(false)
+//!  - applicationWillTerminate is Destroyed
+//!
+//! Keep in mind that after Destroyed event is received every attempt to draw with
+//! opengl will result in segfault.
+//!
+//! Also note that app will not receive Destroyed event if suspended, it will be SIGKILL'ed
+
+#![cfg(target_os = "ios")]
+
+use raw_window_handle::{ios::IOSHandle, RawWindowHandle};
+use std::{fmt, mem, ptr};
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::os::raw::*;
+use std::sync::Arc;
+
+use objc::declare::ClassDecl;
+use objc::runtime::{BOOL, Class, Object, Sel, YES};
+
+use {
+    CreationError,
+    Event,
+    LogicalPosition,
+    LogicalSize,
+    MouseCursor,
+    PhysicalPosition,
+    PhysicalSize,
+    WindowAttributes,
+    WindowEvent,
+    WindowId as RootEventId,
+};
+use events::{Touch, TouchPhase};
+use window::MonitorId as RootMonitorId;
+
+mod ffi;
+use self::ffi::{
+    CFTimeInterval,
+    CFRunLoopRunInMode,
+    CGFloat,
+    CGPoint,
+    CGRect,
+    id,
+    JBLEN,
+    JmpBuf,
+    kCFRunLoopDefaultMode,
+    kCFRunLoopRunHandledSource,
+    longjmp,
+    nil,
+    NSString,
+    setjmp,
+    UIApplicationMain,
+ };
+
+static mut JMPBUF: Option<Box<JmpBuf>> = None;
+
+pub struct Window {
+    _events_queue: Arc<RefCell<VecDeque<Event>>>,
+    delegate_state: Box<DelegateState>,
+}
+
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
+
+#[derive(Debug)]
+struct DelegateState {
+    window: id,
+    controller: id,
+    view: id,
+    size: LogicalSize,
+    scale: f64,
+}
+
+impl DelegateState {
+    fn new(window: id, controller: id, view: id, size: LogicalSize, scale: f64) -> DelegateState {
+        DelegateState {
+            window,
+            controller,
+            view,
+            size,
+            scale,
+        }
+    }
+}
+
+impl Drop for DelegateState {
+    fn drop(&mut self) {
+        unsafe {
+            let _: () = msg_send![self.window, release];
+            let _: () = msg_send![self.controller, release];
+            let _: () = msg_send![self.view, release];
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct MonitorId;
+
+impl fmt::Debug for MonitorId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorId {
+            name: Option<String>,
+            dimensions: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: f64,
+        }
+
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
+
+impl MonitorId {
+    #[inline]
+    pub fn get_uiscreen(&self) -> id {
+        let class = class!(UIScreen);
+        unsafe { msg_send![class, mainScreen] }
+    }
+
+    #[inline]
+    pub fn get_name(&self) -> Option<String> {
+        Some("Primary".to_string())
+    }
+
+    #[inline]
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        let bounds: CGRect = unsafe { msg_send![self.get_uiscreen(), nativeBounds] };
+        (bounds.size.width as f64, bounds.size.height as f64).into()
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> PhysicalPosition {
+        // iOS assumes single screen
+        (0, 0).into()
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        let scale: CGFloat = unsafe { msg_send![self.get_uiscreen(), nativeScale] };
+        scale as f64
+    }
+}
+
+pub struct EventsLoop {
+    events_queue: Arc<RefCell<VecDeque<Event>>>,
+}
+
+#[derive(Clone)]
+pub struct EventsLoopProxy;
+
+impl EventsLoop {
+    pub fn new() -> EventsLoop {
+        unsafe {
+            if !msg_send![class!(NSThread), isMainThread] {
+                panic!("`EventsLoop` can only be created on the main thread on iOS");
+            }
+        }
+        EventsLoop { events_queue: Default::default() }
+    }
+
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        let mut rb = VecDeque::with_capacity(1);
+        rb.push_back(MonitorId);
+        rb
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId
+    }
+
+    pub fn poll_events<F>(&mut self, mut callback: F)
+        where F: FnMut(::Event)
+    {
+        if let Some(event) = self.events_queue.borrow_mut().pop_front() {
+            callback(event);
+            return;
+        }
+
+        unsafe {
+            // jump hack, so we won't quit on willTerminate event before processing it
+            assert!(JMPBUF.is_some(), "`EventsLoop::poll_events` must be called after window creation on iOS");
+            if setjmp(mem::transmute_copy(&mut JMPBUF)) != 0 {
+                if let Some(event) = self.events_queue.borrow_mut().pop_front() {
+                    callback(event);
+                    return;
+                }
+            }
+        }
+
+        unsafe {
+            // run runloop
+            let seconds: CFTimeInterval = 0.000002;
+            while CFRunLoopRunInMode(kCFRunLoopDefaultMode, seconds, 1) == kCFRunLoopRunHandledSource {}
+        }
+
+        if let Some(event) = self.events_queue.borrow_mut().pop_front() {
+            callback(event)
+        }
+    }
+
+    pub fn run_forever<F>(&mut self, mut callback: F)
+        where F: FnMut(::Event) -> ::ControlFlow,
+    {
+        // Yeah that's a very bad implementation.
+        loop {
+            let mut control_flow = ::ControlFlow::Continue;
+            self.poll_events(|e| {
+                if let ::ControlFlow::Break = callback(e) {
+                    control_flow = ::ControlFlow::Break;
+                }
+            });
+            if let ::ControlFlow::Break = control_flow {
+                break;
+            }
+            ::std::thread::sleep(::std::time::Duration::from_millis(5));
+        }
+    }
+
+    pub fn create_proxy(&self) -> EventsLoopProxy {
+        EventsLoopProxy
+    }
+}
+
+impl EventsLoopProxy {
+    pub fn wakeup(&self) -> Result<(), ::EventsLoopClosed> {
+        unimplemented!()
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId;
+
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+#[derive(Clone)]
+pub struct PlatformSpecificWindowBuilderAttributes {
+    pub root_view_class: &'static Class,
+}
+
+impl Default for PlatformSpecificWindowBuilderAttributes {
+    fn default() -> Self {
+        PlatformSpecificWindowBuilderAttributes {
+            root_view_class: class!(UIView),
+        }
+    }
+}
+
+// TODO: AFAIK transparency is enabled by default on iOS,
+// so to be consistent with other platforms we have to change that.
+impl Window {
+    pub fn new(
+        ev: &EventsLoop,
+        _attributes: WindowAttributes,
+        pl_attributes: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Window, CreationError> {
+        unsafe {
+            debug_assert!(mem::size_of_val(&JMPBUF) == mem::size_of::<Box<JmpBuf>>());
+            assert!(mem::replace(&mut JMPBUF, Some(Box::new([0; JBLEN]))).is_none(), "Only one `Window` is supported on iOS");
+        }
+
+        unsafe {
+            if setjmp(mem::transmute_copy(&mut JMPBUF)) != 0 {
+                let app_class = class!(UIApplication);
+                let app: id = msg_send![app_class, sharedApplication];
+                let delegate: id = msg_send![app, delegate];
+                let state: *mut c_void = *(&*delegate).get_ivar("winitState");
+                let mut delegate_state = Box::from_raw(state as *mut DelegateState);
+                let events_queue = &*ev.events_queue;
+                (&mut *delegate).set_ivar("eventsQueue", mem::transmute::<_, *mut c_void>(events_queue));
+
+                // easiest? way to get access to PlatformSpecificWindowBuilderAttributes to configure the view
+                let rect: CGRect = msg_send![MonitorId.get_uiscreen(), bounds];
+
+                let uiview_class = class!(UIView);
+                let root_view_class = pl_attributes.root_view_class;
+                let is_uiview: BOOL = msg_send![root_view_class, isSubclassOfClass:uiview_class];
+                assert!(is_uiview == YES, "`root_view_class` must inherit from `UIView`");
+
+                delegate_state.view = msg_send![root_view_class, alloc];
+                assert!(!delegate_state.view.is_null(), "Failed to create `UIView` instance");
+                delegate_state.view = msg_send![delegate_state.view, initWithFrame:rect];
+                assert!(!delegate_state.view.is_null(), "Failed to initialize `UIView` instance");
+
+                let _: () = msg_send![delegate_state.controller, setView:delegate_state.view];
+                let _: () = msg_send![delegate_state.window, makeKeyAndVisible];
+
+                return Ok(Window {
+                    _events_queue: ev.events_queue.clone(),
+                    delegate_state,
+                });
+            }
+        }
+
+        create_delegate_class();
+        start_app();
+
+        panic!("Couldn't create `UIApplication`!")
+    }
+
+    #[inline]
+    pub fn get_uiwindow(&self) -> id {
+        self.delegate_state.window
+    }
+
+    #[inline]
+    pub fn get_uiview(&self) -> id {
+        self.delegate_state.view
+    }
+
+    #[inline]
+    pub fn set_title(&self, _title: &str) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        // N/A
+        None
+    }
+
+    #[inline]
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        // N/A
+        None
+    }
+
+    #[inline]
+    pub fn set_position(&self, _position: LogicalPosition) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+        Some(self.delegate_state.size)
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
+        self.get_inner_size()
+    }
+
+    #[inline]
+    pub fn set_inner_size(&self, _size: LogicalSize) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_resizable(&self, _resizable: bool) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, _cursor: MouseCursor) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
+        Err("Cursor grabbing is not possible on iOS.".to_owned())
+    }
+
+    #[inline]
+    pub fn hide_cursor(&self, _hide: bool) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        self.delegate_state.scale
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
+        Err("Setting cursor position is not possible on iOS.".to_owned())
+    }
+
+    #[inline]
+    pub fn set_maximized(&self, _maximized: bool) {
+        // N/A
+        // iOS has single screen maximized apps so nothing to do
+    }
+
+    #[inline]
+    pub fn get_fullscreen(&self) -> Option<RootMonitorId> {
+        // N/A
+        // iOS has single screen maximized apps so nothing to do
+        None
+    }
+
+    #[inline]
+    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorId>) {
+        // N/A
+        // iOS has single screen maximized apps so nothing to do
+    }
+
+    #[inline]
+    pub fn set_decorations(&self, _decorations: bool) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_always_on_top(&self, _always_on_top: bool) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_window_icon(&self, _icon: Option<::Icon>) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_ime_spot(&self, _logical_spot: LogicalPosition) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn get_current_monitor(&self) -> RootMonitorId {
+        RootMonitorId { inner: MonitorId }
+    }
+
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        let mut rb = VecDeque::with_capacity(1);
+        rb.push_back(MonitorId);
+        rb
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        WindowId
+    }
+
+    pub fn raw_window_handle(&self) -> RawWindowHandle {
+        let handle = IOSHandle {
+            ui_window: self.get_uiwindow() as *mut _,
+            ui_view: self.get_uiview() as *mut _,
+            ..IOSHandle::empty()
+        };
+        RawWindowHandle::IOS(handle)
+    }
+}
+
+fn create_delegate_class() {
+    extern fn did_finish_launching(this: &mut Object, _: Sel, _: id, _: id) -> BOOL {
+        let screen_class = class!(UIScreen);
+        let window_class = class!(UIWindow);
+        let controller_class = class!(UIViewController);
+        unsafe {
+            let main_screen: id = msg_send![screen_class, mainScreen];
+            let bounds: CGRect = msg_send![main_screen, bounds];
+            let scale: CGFloat = msg_send![main_screen, nativeScale];
+
+            let window: id = msg_send![window_class, alloc];
+            let window: id = msg_send![window, initWithFrame:bounds.clone()];
+
+            let size = (bounds.size.width as f64, bounds.size.height as f64).into();
+
+            let view_controller: id = msg_send![controller_class, alloc];
+            let view_controller: id = msg_send![view_controller, init];
+
+            let _: () = msg_send![window, setRootViewController:view_controller];
+
+            let state = Box::new(DelegateState::new(window, view_controller, ptr::null_mut(), size, scale as f64));
+            let state_ptr: *mut DelegateState = mem::transmute(state);
+            this.set_ivar("winitState", state_ptr as *mut c_void);
+
+            // The `UIView` is setup in `Window::new` which gets `longjmp`'ed to here.
+            // This makes it easier to configure the specific `UIView` type.
+            let _: () = msg_send![this, performSelector:sel!(postLaunch:) withObject:nil afterDelay:0.0];
+        }
+        YES
+    }
+
+    extern fn post_launch(_: &Object, _: Sel, _: id) {
+        unsafe { longjmp(mem::transmute_copy(&mut JMPBUF), 1); }
+    }
+
+    extern fn did_become_active(this: &Object, _: Sel, _: id) {
+        unsafe {
+            let events_queue: *mut c_void = *this.get_ivar("eventsQueue");
+            let events_queue = &*(events_queue as *const RefCell<VecDeque<Event>>);
+            events_queue.borrow_mut().push_back(Event::WindowEvent {
+                window_id: RootEventId(WindowId),
+                event: WindowEvent::Focused(true),
+            });
+        }
+    }
+
+    extern fn will_resign_active(this: &Object, _: Sel, _: id) {
+        unsafe {
+            let events_queue: *mut c_void = *this.get_ivar("eventsQueue");
+            let events_queue = &*(events_queue as *const RefCell<VecDeque<Event>>);
+            events_queue.borrow_mut().push_back(Event::WindowEvent {
+                window_id: RootEventId(WindowId),
+                event: WindowEvent::Focused(false),
+            });
+        }
+    }
+
+    extern fn will_enter_foreground(this: &Object, _: Sel, _: id) {
+        unsafe {
+            let events_queue: *mut c_void = *this.get_ivar("eventsQueue");
+            let events_queue = &*(events_queue as *const RefCell<VecDeque<Event>>);
+            events_queue.borrow_mut().push_back(Event::Suspended(false));
+        }
+    }
+
+    extern fn did_enter_background(this: &Object, _: Sel, _: id) {
+        unsafe {
+            let events_queue: *mut c_void = *this.get_ivar("eventsQueue");
+            let events_queue = &*(events_queue as *const RefCell<VecDeque<Event>>);
+            events_queue.borrow_mut().push_back(Event::Suspended(true));
+        }
+    }
+
+    extern fn will_terminate(this: &Object, _: Sel, _: id) {
+        unsafe {
+            let events_queue: *mut c_void = *this.get_ivar("eventsQueue");
+            let events_queue = &*(events_queue as *const RefCell<VecDeque<Event>>);
+            // push event to the front to garantee that we'll process it
+            // immidiatly after jump
+            events_queue.borrow_mut().push_front(Event::WindowEvent {
+                window_id: RootEventId(WindowId),
+                event: WindowEvent::Destroyed,
+            });
+            longjmp(mem::transmute_copy(&mut JMPBUF), 1);
+        }
+    }
+
+    extern fn handle_touches(this: &Object, _: Sel, touches: id, _:id) {
+        unsafe {
+            let events_queue: *mut c_void = *this.get_ivar("eventsQueue");
+            let events_queue = &*(events_queue as *const RefCell<VecDeque<Event>>);
+
+            let touches_enum: id = msg_send![touches, objectEnumerator];
+
+            loop {
+                let touch: id = msg_send![touches_enum, nextObject];
+                if touch == nil {
+                    break
+                }
+                let location: CGPoint = msg_send![touch, locationInView:nil];
+                let touch_id = touch as u64;
+                let phase: i32 = msg_send![touch, phase];
+
+                events_queue.borrow_mut().push_back(Event::WindowEvent {
+                    window_id: RootEventId(WindowId),
+                    event: WindowEvent::Touch(Touch {
+                        device_id: DEVICE_ID,
+                        id: touch_id,
+                        location: (location.x as f64, location.y as f64).into(),
+                        phase: match phase {
+                            0 => TouchPhase::Started,
+                            1 => TouchPhase::Moved,
+                            // 2 is UITouchPhaseStationary and is not expected here
+                            3 => TouchPhase::Ended,
+                            4 => TouchPhase::Cancelled,
+                            _ => panic!("unexpected touch phase: {:?}", phase)
+                        }
+                    }),
+                });
+            }
+        }
+    }
+
+    let ui_responder = class!(UIResponder);
+    let mut decl = ClassDecl::new("AppDelegate", ui_responder).expect("Failed to declare class `AppDelegate`");
+
+    unsafe {
+        decl.add_method(sel!(application:didFinishLaunchingWithOptions:),
+                        did_finish_launching as extern fn(&mut Object, Sel, id, id) -> BOOL);
+
+        decl.add_method(sel!(applicationDidBecomeActive:),
+                        did_become_active as extern fn(&Object, Sel, id));
+
+        decl.add_method(sel!(applicationWillResignActive:),
+                        will_resign_active as extern fn(&Object, Sel, id));
+
+        decl.add_method(sel!(applicationWillEnterForeground:),
+                        will_enter_foreground as extern fn(&Object, Sel, id));
+
+        decl.add_method(sel!(applicationDidEnterBackground:),
+                        did_enter_background as extern fn(&Object, Sel, id));
+
+        decl.add_method(sel!(applicationWillTerminate:),
+                        will_terminate as extern fn(&Object, Sel, id));
+
+
+        decl.add_method(sel!(touchesBegan:withEvent:),
+                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+        decl.add_method(sel!(touchesMoved:withEvent:),
+                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+        decl.add_method(sel!(touchesEnded:withEvent:),
+                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+        decl.add_method(sel!(touchesCancelled:withEvent:),
+                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+
+        decl.add_method(sel!(postLaunch:),
+                        post_launch as extern fn(&Object, Sel, id));
+
+        decl.add_ivar::<*mut c_void>("winitState");
+        decl.add_ivar::<*mut c_void>("eventsQueue");
+
+        decl.register();
+    }
+}
+
+#[inline]
+fn start_app() {
+    unsafe {
+        UIApplicationMain(0, ptr::null(), nil, NSString::alloc(nil).init_str("AppDelegate"));
+    }
+}
+
+// Constant device ID, to be removed when this backend is updated to report real device IDs.
+const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);

src/platform/linux/dlopen.rs

@@ -1,13 +1,13 @@
 #![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
 #![allow(dead_code)]
 
-use std::os::raw::{c_char, c_int, c_void};
+use std::os::raw::{c_void, c_char, c_int};
 
 pub const RTLD_LAZY: c_int = 0x001;
 pub const RTLD_NOW: c_int = 0x002;
 
 #[link(name = "dl")]
-extern "C" {
+extern {
     pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void;
     pub fn dlerror() -> *mut c_char;
     pub fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void;

src/platform/linux/mod.rs

@@ -0,0 +1,559 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+
+use std::collections::VecDeque;
+use std::{env, mem};
+use std::ffi::CStr;
+use std::os::raw::*;
+use std::sync::Arc;
+
+use parking_lot::Mutex;
+use raw_window_handle::RawWindowHandle;
+use sctk::reexports::client::ConnectError;
+
+use {
+    CreationError,
+    EventsLoopClosed,
+    Icon,
+    MouseCursor,
+    ControlFlow,
+    WindowAttributes,
+};
+use dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
+use window::MonitorId as RootMonitorId;
+use self::x11::{XConnection, XError};
+use self::x11::ffi::XVisualInfo;
+pub use self::x11::XNotSupported;
+
+mod dlopen;
+pub mod wayland;
+pub mod x11;
+
+/// Environment variable specifying which backend should be used on unix platform.
+///
+/// Legal values are x11 and wayland. If this variable is set only the named backend
+/// will be tried by winit. If it is not set, winit will try to connect to a wayland connection,
+/// and if it fails will fallback on x11.
+///
+/// If this variable is set with any other value, winit will panic.
+const BACKEND_PREFERENCE_ENV_VAR: &str = "WINIT_UNIX_BACKEND";
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes {
+    pub visual_infos: Option<XVisualInfo>,
+    pub screen_id: Option<i32>,
+    pub resize_increments: Option<(u32, u32)>,
+    pub base_size: Option<(u32, u32)>,
+    pub class: Option<(String, String)>,
+    pub override_redirect: bool,
+    pub x11_window_type: x11::util::WindowType,
+    pub gtk_theme_variant: Option<String>,
+    pub app_id: Option<String>
+}
+
+lazy_static!(
+    pub static ref X11_BACKEND: Mutex<Result<Arc<XConnection>, XNotSupported>> = {
+        Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new))
+    };
+);
+
+pub enum Window {
+    X(x11::Window),
+    Wayland(wayland::Window),
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum WindowId {
+    X(x11::WindowId),
+    Wayland(wayland::WindowId),
+}
+
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId::X(x11::WindowId::dummy())
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum DeviceId {
+    X(x11::DeviceId),
+    Wayland(wayland::DeviceId),
+}
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId::X(x11::DeviceId::dummy())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum MonitorId {
+    X(x11::MonitorId),
+    Wayland(wayland::MonitorId),
+}
+
+impl MonitorId {
+    #[inline]
+    pub fn get_name(&self) -> Option<String> {
+        match self {
+            &MonitorId::X(ref m) => m.get_name(),
+            &MonitorId::Wayland(ref m) => m.get_name(),
+        }
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> u32 {
+        match self {
+            &MonitorId::X(ref m) => m.get_native_identifier(),
+            &MonitorId::Wayland(ref m) => m.get_native_identifier(),
+        }
+    }
+
+    #[inline]
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        match self {
+            &MonitorId::X(ref m) => m.get_dimensions(),
+            &MonitorId::Wayland(ref m) => m.get_dimensions(),
+        }
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> PhysicalPosition {
+        match self {
+            &MonitorId::X(ref m) => m.get_position(),
+            &MonitorId::Wayland(ref m) => m.get_position(),
+        }
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        match self {
+            &MonitorId::X(ref m) => m.get_hidpi_factor(),
+            &MonitorId::Wayland(ref m) => m.get_hidpi_factor() as f64,
+        }
+    }
+}
+
+impl Window {
+    #[inline]
+    pub fn new(
+        events_loop: &EventsLoop,
+        attribs: WindowAttributes,
+        pl_attribs: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Self, CreationError> {
+        match *events_loop {
+            EventsLoop::Wayland(ref events_loop) => {
+                wayland::Window::new(events_loop, attribs, pl_attribs).map(Window::Wayland)
+            },
+            EventsLoop::X(ref events_loop) => {
+                x11::Window::new(events_loop, attribs, pl_attribs).map(Window::X)
+            },
+        }
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        match self {
+            &Window::X(ref w) => WindowId::X(w.id()),
+            &Window::Wayland(ref w) => WindowId::Wayland(w.id()),
+        }
+    }
+
+    #[inline]
+    pub fn set_title(&self, title: &str) {
+        match self {
+            &Window::X(ref w) => w.set_title(title),
+            &Window::Wayland(ref w) => w.set_title(title),
+        }
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        match self {
+            &Window::X(ref w) => w.show(),
+            &Window::Wayland(ref w) => w.show(),
+        }
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        match self {
+            &Window::X(ref w) => w.hide(),
+            &Window::Wayland(ref w) => w.hide(),
+        }
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        match self {
+            &Window::X(ref w) => w.get_position(),
+            &Window::Wayland(ref w) => w.get_position(),
+        }
+    }
+
+    #[inline]
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        match self {
+            &Window::X(ref m) => m.get_inner_position(),
+            &Window::Wayland(ref m) => m.get_inner_position(),
+        }
+    }
+
+    #[inline]
+    pub fn set_position(&self, position: LogicalPosition) {
+        match self {
+            &Window::X(ref w) => w.set_position(position),
+            &Window::Wayland(ref w) => w.set_position(position),
+        }
+    }
+
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+        match self {
+            &Window::X(ref w) => w.get_inner_size(),
+            &Window::Wayland(ref w) => w.get_inner_size(),
+        }
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
+        match self {
+            &Window::X(ref w) => w.get_outer_size(),
+            &Window::Wayland(ref w) => w.get_outer_size(),
+        }
+    }
+
+    #[inline]
+    pub fn set_inner_size(&self, size: LogicalSize) {
+        match self {
+            &Window::X(ref w) => w.set_inner_size(size),
+            &Window::Wayland(ref w) => w.set_inner_size(size),
+        }
+    }
+
+    #[inline]
+    pub fn set_min_dimensions(&self, dimensions: Option<LogicalSize>) {
+        match self {
+            &Window::X(ref w) => w.set_min_dimensions(dimensions),
+            &Window::Wayland(ref w) => w.set_min_dimensions(dimensions),
+        }
+    }
+
+    #[inline]
+    pub fn set_max_dimensions(&self, dimensions: Option<LogicalSize>) {
+        match self {
+            &Window::X(ref w) => w.set_max_dimensions(dimensions),
+            &Window::Wayland(ref w) => w.set_max_dimensions(dimensions),
+        }
+    }
+
+    #[inline]
+    pub fn set_resizable(&self, resizable: bool) {
+        match self {
+            &Window::X(ref w) => w.set_resizable(resizable),
+            &Window::Wayland(ref w) => w.set_resizable(resizable),
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, cursor: MouseCursor) {
+        match self {
+            &Window::X(ref w) => w.set_cursor(cursor),
+            &Window::Wayland(ref w) => w.set_cursor(cursor)
+        }
+    }
+
+    #[inline]
+    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
+        match self {
+            &Window::X(ref window) => window.grab_cursor(grab),
+            &Window::Wayland(ref window) => window.grab_cursor(grab),
+        }
+    }
+
+    #[inline]
+    pub fn hide_cursor(&self, hide: bool) {
+        match self {
+            &Window::X(ref window) => window.hide_cursor(hide),
+            &Window::Wayland(ref window) => window.hide_cursor(hide),
+        }
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+       match self {
+            &Window::X(ref w) => w.get_hidpi_factor(),
+            &Window::Wayland(ref w) => w.hidpi_factor() as f64,
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), String> {
+        match self {
+            &Window::X(ref w) => w.set_cursor_position(position),
+            &Window::Wayland(ref w) => w.set_cursor_position(position),
+        }
+    }
+
+    #[inline]
+    pub fn set_maximized(&self, maximized: bool) {
+        match self {
+            &Window::X(ref w) => w.set_maximized(maximized),
+            &Window::Wayland(ref w) => w.set_maximized(maximized),
+        }
+    }
+
+    #[inline]
+    pub fn get_fullscreen(&self) -> Option<RootMonitorId> {
+        match self {
+            &Window::X(ref w) => w.get_fullscreen(),
+            &Window::Wayland(ref w) => w.get_fullscreen()
+                .map(|monitor_id| RootMonitorId { inner: MonitorId::Wayland(monitor_id) })
+        }
+    }
+
+    #[inline]
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorId>) {
+        match self {
+            &Window::X(ref w) => w.set_fullscreen(monitor),
+            &Window::Wayland(ref w) => w.set_fullscreen(monitor)
+        }
+    }
+
+    #[inline]
+    pub fn set_decorations(&self, decorations: bool) {
+        match self {
+            &Window::X(ref w) => w.set_decorations(decorations),
+            &Window::Wayland(ref w) => w.set_decorations(decorations)
+        }
+    }
+
+    #[inline]
+    pub fn set_always_on_top(&self, always_on_top: bool) {
+        match self {
+            &Window::X(ref w) => w.set_always_on_top(always_on_top),
+            &Window::Wayland(_) => (),
+        }
+    }
+
+    #[inline]
+    pub fn set_window_icon(&self, window_icon: Option<Icon>) {
+        match self {
+            &Window::X(ref w) => w.set_window_icon(window_icon),
+            &Window::Wayland(_) => (),
+        }
+    }
+
+    #[inline]
+    pub fn set_ime_spot(&self, position: LogicalPosition) {
+        match self {
+            &Window::X(ref w) => w.set_ime_spot(position),
+            &Window::Wayland(_) => (),
+        }
+    }
+
+    #[inline]
+    pub fn get_current_monitor(&self) -> RootMonitorId {
+        match self {
+            &Window::X(ref window) => RootMonitorId { inner: MonitorId::X(window.get_current_monitor()) },
+            &Window::Wayland(ref window) => RootMonitorId { inner: MonitorId::Wayland(window.get_current_monitor()) },
+        }
+    }
+
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        match self {
+            &Window::X(ref window) => window.get_available_monitors()
+                .into_iter()
+                .map(MonitorId::X)
+                .collect(),
+            &Window::Wayland(ref window) => window.get_available_monitors()
+                .into_iter()
+                .map(MonitorId::Wayland)
+                .collect(),
+        }
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        match self {
+            &Window::X(ref window) => MonitorId::X(window.get_primary_monitor()),
+            &Window::Wayland(ref window) => MonitorId::Wayland(window.get_primary_monitor()),
+        }
+    }
+
+    pub fn raw_window_handle(&self) -> RawWindowHandle {
+        match self {
+            &Window::X(ref window) => RawWindowHandle::Xlib(window.raw_window_handle()),
+            &Window::Wayland(ref window) => RawWindowHandle::Wayland(window.raw_window_handle()),
+        }
+    }
+}
+
+unsafe extern "C" fn x_error_callback(
+    display: *mut x11::ffi::Display,
+    event: *mut x11::ffi::XErrorEvent,
+) -> c_int {
+    let xconn_lock = X11_BACKEND.lock();
+    if let Ok(ref xconn) = *xconn_lock {
+        let mut buf: [c_char; 1024] = mem::uninitialized();
+        (xconn.xlib.XGetErrorText)(
+            display,
+            (*event).error_code as c_int,
+            buf.as_mut_ptr(),
+            buf.len() as c_int,
+        );
+        let description = CStr::from_ptr(buf.as_ptr()).to_string_lossy();
+
+        let error = XError {
+            description: description.into_owned(),
+            error_code: (*event).error_code,
+            request_code: (*event).request_code,
+            minor_code: (*event).minor_code,
+        };
+
+        error!("X11 error: {:#?}", error);
+
+        *xconn.latest_error.lock() = Some(error);
+    }
+    // Fun fact: this return value is completely ignored.
+    0
+}
+
+pub enum EventsLoop {
+    Wayland(wayland::EventsLoop),
+    X(x11::EventsLoop)
+}
+
+#[derive(Clone)]
+pub enum EventsLoopProxy {
+    X(x11::EventsLoopProxy),
+    Wayland(wayland::EventsLoopProxy),
+}
+
+impl EventsLoop {
+    pub fn new() -> EventsLoop {
+        if let Ok(env_var) = env::var(BACKEND_PREFERENCE_ENV_VAR) {
+            match env_var.as_str() {
+                "x11" => {
+                    // TODO: propagate
+                    return EventsLoop::new_x11().expect("Failed to initialize X11 backend");
+                },
+                "wayland" => {
+                    return EventsLoop::new_wayland()
+                        .expect("Failed to initialize Wayland backend");
+                },
+                _ => panic!(
+                    "Unknown environment variable value for {}, try one of `x11`,`wayland`",
+                    BACKEND_PREFERENCE_ENV_VAR,
+                ),
+            }
+        }
+
+        let wayland_err = match EventsLoop::new_wayland() {
+            Ok(event_loop) => return event_loop,
+            Err(err) => err,
+        };
+
+        let x11_err = match EventsLoop::new_x11() {
+            Ok(event_loop) => return event_loop,
+            Err(err) => err,
+        };
+
+        let err_string = format!(
+            "Failed to initialize any backend! Wayland status: {:?} X11 status: {:?}",
+            wayland_err,
+            x11_err,
+        );
+        panic!(err_string);
+    }
+
+    pub fn new_wayland() -> Result<EventsLoop, ConnectError> {
+        wayland::EventsLoop::new()
+            .map(EventsLoop::Wayland)
+    }
+
+    pub fn new_x11() -> Result<EventsLoop, XNotSupported> {
+        X11_BACKEND
+            .lock()
+            .as_ref()
+            .map(Arc::clone)
+            .map(x11::EventsLoop::new)
+            .map(EventsLoop::X)
+            .map_err(|err| err.clone())
+    }
+
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        match *self {
+            EventsLoop::Wayland(ref evlp) => evlp
+                .get_available_monitors()
+                .into_iter()
+                .map(MonitorId::Wayland)
+                .collect(),
+            EventsLoop::X(ref evlp) => evlp
+                .x_connection()
+                .get_available_monitors()
+                .into_iter()
+                .map(MonitorId::X)
+                .collect(),
+        }
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        match *self {
+            EventsLoop::Wayland(ref evlp) => MonitorId::Wayland(evlp.get_primary_monitor()),
+            EventsLoop::X(ref evlp) => MonitorId::X(evlp.x_connection().get_primary_monitor()),
+        }
+    }
+
+    pub fn create_proxy(&self) -> EventsLoopProxy {
+        match *self {
+            EventsLoop::Wayland(ref evlp) => EventsLoopProxy::Wayland(evlp.create_proxy()),
+            EventsLoop::X(ref evlp) => EventsLoopProxy::X(evlp.create_proxy()),
+        }
+    }
+
+    pub fn poll_events<F>(&mut self, callback: F)
+        where F: FnMut(::Event)
+    {
+        match *self {
+            EventsLoop::Wayland(ref mut evlp) => evlp.poll_events(callback),
+            EventsLoop::X(ref mut evlp) => evlp.poll_events(callback)
+        }
+    }
+
+    pub fn run_forever<F>(&mut self, callback: F)
+        where F: FnMut(::Event) -> ControlFlow
+    {
+        match *self {
+            EventsLoop::Wayland(ref mut evlp) => evlp.run_forever(callback),
+            EventsLoop::X(ref mut evlp) => evlp.run_forever(callback)
+        }
+    }
+
+    #[inline]
+    pub fn is_wayland(&self) -> bool {
+        match *self {
+            EventsLoop::Wayland(_) => true,
+            EventsLoop::X(_) => false,
+        }
+    }
+
+    #[inline]
+    pub fn x_connection(&self) -> Option<&Arc<XConnection>> {
+        match *self {
+            EventsLoop::Wayland(_) => None,
+            EventsLoop::X(ref ev) => Some(ev.x_connection()),
+        }
+    }
+}
+
+impl EventsLoopProxy {
+    pub fn wakeup(&self) -> Result<(), EventsLoopClosed> {
+        match *self {
+            EventsLoopProxy::Wayland(ref proxy) => proxy.wakeup(),
+            EventsLoopProxy::X(ref proxy) => proxy.wakeup(),
+        }
+    }
+}

src/platform/linux/wayland/event_loop.rs

@@ -0,0 +1,538 @@
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::fmt;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex, Weak};
+
+use {ControlFlow, EventsLoopClosed, PhysicalPosition, PhysicalSize};
+
+use super::window::WindowStore;
+use super::WindowId;
+
+use sctk::output::OutputMgr;
+use sctk::reexports::client::protocol::{
+    wl_keyboard, wl_output, wl_pointer, wl_registry, wl_seat, wl_touch,
+};
+use sctk::reexports::client::{ConnectError, Display, EventQueue, GlobalEvent, Proxy};
+use sctk::Environment;
+
+use sctk::reexports::client::protocol::wl_display::RequestsTrait as DisplayRequests;
+use sctk::reexports::client::protocol::wl_surface::RequestsTrait;
+
+use ModifiersState;
+
+pub struct EventsLoopSink {
+    buffer: VecDeque<::Event>,
+}
+
+impl EventsLoopSink {
+    pub fn new() -> EventsLoopSink {
+        EventsLoopSink {
+            buffer: VecDeque::new(),
+        }
+    }
+
+    pub fn send_event(&mut self, evt: ::WindowEvent, wid: WindowId) {
+        let evt = ::Event::WindowEvent {
+            event: evt,
+            window_id: ::WindowId(::platform::WindowId::Wayland(wid)),
+        };
+        self.buffer.push_back(evt);
+    }
+
+    pub fn send_raw_event(&mut self, evt: ::Event) {
+        self.buffer.push_back(evt);
+    }
+
+    fn empty_with<F>(&mut self, callback: &mut F)
+    where
+        F: FnMut(::Event),
+    {
+        for evt in self.buffer.drain(..) {
+            callback(evt)
+        }
+    }
+}
+
+pub struct EventsLoop {
+    // The Event Queue
+    pub evq: RefCell<EventQueue>,
+    // our sink, shared with some handlers, buffering the events
+    sink: Arc<Mutex<EventsLoopSink>>,
+    // Whether or not there is a pending `Awakened` event to be emitted.
+    pending_wakeup: Arc<AtomicBool>,
+    // The window store
+    pub store: Arc<Mutex<WindowStore>>,
+    // the env
+    pub env: Environment,
+    // a cleanup switch to prune dead windows
+    pub cleanup_needed: Arc<Mutex<bool>>,
+    // The wayland display
+    pub display: Arc<Display>,
+    // The list of seats
+    pub seats: Arc<Mutex<Vec<(u32, Proxy<wl_seat::WlSeat>)>>>,
+}
+
+// A handle that can be sent across threads and used to wake up the `EventsLoop`.
+//
+// We should only try and wake up the `EventsLoop` if it still exists, so we hold Weak ptrs.
+#[derive(Clone)]
+pub struct EventsLoopProxy {
+    display: Weak<Display>,
+    pending_wakeup: Weak<AtomicBool>,
+}
+
+impl EventsLoopProxy {
+    // Causes the `EventsLoop` to stop blocking on `run_forever` and emit an `Awakened` event.
+    //
+    // Returns `Err` if the associated `EventsLoop` no longer exists.
+    pub fn wakeup(&self) -> Result<(), EventsLoopClosed> {
+        let display = self.display.upgrade();
+        let wakeup = self.pending_wakeup.upgrade();
+        match (display, wakeup) {
+            (Some(display), Some(wakeup)) => {
+                // Update the `EventsLoop`'s `pending_wakeup` flag.
+                wakeup.store(true, Ordering::Relaxed);
+                // Cause the `EventsLoop` to break from `dispatch` if it is currently blocked.
+                let _ = display.sync(|callback| callback.implement(|_, _| {}, ()));
+                display.flush().map_err(|_| EventsLoopClosed)?;
+                Ok(())
+            }
+            _ => Err(EventsLoopClosed),
+        }
+    }
+}
+
+impl EventsLoop {
+    pub fn new() -> Result<EventsLoop, ConnectError> {
+        let (display, mut event_queue) = Display::connect_to_env()?;
+
+        let display = Arc::new(display);
+        let pending_wakeup = Arc::new(AtomicBool::new(false));
+        let sink = Arc::new(Mutex::new(EventsLoopSink::new()));
+        let store = Arc::new(Mutex::new(WindowStore::new()));
+        let seats = Arc::new(Mutex::new(Vec::new()));
+
+        let mut seat_manager = SeatManager {
+            sink: sink.clone(),
+            store: store.clone(),
+            seats: seats.clone(),
+            events_loop_proxy: EventsLoopProxy {
+                display: Arc::downgrade(&display),
+                pending_wakeup: Arc::downgrade(&pending_wakeup),
+            },
+        };
+
+        let env = Environment::from_display_with_cb(
+            &display,
+            &mut event_queue,
+            move |event, registry| {
+                match event {
+                    GlobalEvent::New { id, ref interface, version } => {
+                        if interface == "wl_seat" {
+                            seat_manager.add_seat(id, version, registry)
+                        }
+                    },
+                    GlobalEvent::Removed { id, ref interface } => {
+                        if interface == "wl_seat" {
+                            seat_manager.remove_seat(id)
+                        }
+                    },
+                }
+            },
+        ).unwrap();
+
+        Ok(EventsLoop {
+            display,
+            evq: RefCell::new(event_queue),
+            sink,
+            pending_wakeup,
+            store,
+            env,
+            cleanup_needed: Arc::new(Mutex::new(false)),
+            seats,
+        })
+    }
+
+    pub fn create_proxy(&self) -> EventsLoopProxy {
+        EventsLoopProxy {
+            display: Arc::downgrade(&self.display),
+            pending_wakeup: Arc::downgrade(&self.pending_wakeup),
+        }
+    }
+
+    pub fn poll_events<F>(&mut self, mut callback: F)
+    where
+        F: FnMut(::Event),
+    {
+        // send pending events to the server
+        self.display.flush().expect("Wayland connection lost.");
+
+        // dispatch any pre-buffered events
+        self.sink.lock().unwrap().empty_with(&mut callback);
+
+        // try to read pending events
+        if let Some(h) = self.evq.get_mut().prepare_read() {
+            h.read_events().expect("Wayland connection lost.");
+        }
+        // dispatch wayland events
+        self.evq
+            .get_mut()
+            .dispatch_pending()
+            .expect("Wayland connection lost.");
+        self.post_dispatch_triggers();
+
+        // dispatch buffered events to client
+        self.sink.lock().unwrap().empty_with(&mut callback);
+    }
+
+    pub fn run_forever<F>(&mut self, mut callback: F)
+    where
+        F: FnMut(::Event) -> ControlFlow,
+    {
+        // send pending events to the server
+        self.display.flush().expect("Wayland connection lost.");
+
+        // Check for control flow by wrapping the callback.
+        let control_flow = ::std::cell::Cell::new(ControlFlow::Continue);
+        let mut callback = |event| {
+            if let ControlFlow::Break = callback(event) {
+                control_flow.set(ControlFlow::Break);
+            }
+        };
+
+        // dispatch any pre-buffered events
+        self.post_dispatch_triggers();
+        self.sink.lock().unwrap().empty_with(&mut callback);
+
+        loop {
+            // dispatch events blocking if needed
+            self.evq
+                .get_mut()
+                .dispatch()
+                .expect("Wayland connection lost.");
+            self.post_dispatch_triggers();
+
+            // empty buffer of events
+            self.sink.lock().unwrap().empty_with(&mut callback);
+
+            if let ControlFlow::Break = control_flow.get() {
+                break;
+            }
+        }
+    }
+
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        get_primary_monitor(&self.env.outputs)
+    }
+
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        get_available_monitors(&self.env.outputs)
+    }
+
+    pub fn get_display(&self) -> &Display {
+        &*self.display
+    }
+}
+
+/*
+ * Private EventsLoop Internals
+ */
+
+impl EventsLoop {
+    fn post_dispatch_triggers(&mut self) {
+        let mut sink = self.sink.lock().unwrap();
+        // process a possible pending wakeup call
+        if self.pending_wakeup.load(Ordering::Relaxed) {
+            sink.send_raw_event(::Event::Awakened);
+            self.pending_wakeup.store(false, Ordering::Relaxed);
+        }
+        // prune possible dead windows
+        {
+            let mut cleanup_needed = self.cleanup_needed.lock().unwrap();
+            if *cleanup_needed {
+                let pruned = self.store.lock().unwrap().cleanup();
+                *cleanup_needed = false;
+                for wid in pruned {
+                    sink.send_event(::WindowEvent::Destroyed, wid);
+                }
+            }
+        }
+        // process pending resize/refresh
+        self.store.lock().unwrap().for_each(
+            |newsize, size, new_dpi, refresh, frame_refresh, closed, wid, frame| {
+                if let Some(frame) = frame {
+                    if let Some((w, h)) = newsize {
+                        frame.resize(w, h);
+                        frame.refresh();
+                        let logical_size = ::LogicalSize::new(w as f64, h as f64);
+                        sink.send_event(::WindowEvent::Resized(logical_size), wid);
+                        *size = (w, h);
+                    } else if frame_refresh {
+                        frame.refresh();
+                        if !refresh {
+                            frame.surface().commit()
+                        }
+                    }
+                }
+                if let Some(dpi) = new_dpi {
+                    sink.send_event(::WindowEvent::HiDpiFactorChanged(dpi as f64), wid);
+                }
+                if refresh {
+                    sink.send_event(::WindowEvent::Refresh, wid);
+                }
+                if closed {
+                    sink.send_event(::WindowEvent::CloseRequested, wid);
+                }
+            },
+        )
+    }
+}
+
+/*
+ * Wayland protocol implementations
+ */
+
+struct SeatManager {
+    sink: Arc<Mutex<EventsLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    seats: Arc<Mutex<Vec<(u32, Proxy<wl_seat::WlSeat>)>>>,
+    events_loop_proxy: EventsLoopProxy,
+}
+
+impl SeatManager {
+    fn add_seat(&mut self, id: u32, version: u32, registry: Proxy<wl_registry::WlRegistry>) {
+        use self::wl_registry::RequestsTrait as RegistryRequests;
+        use std::cmp::min;
+
+        let mut seat_data = SeatData {
+            sink: self.sink.clone(),
+            store: self.store.clone(),
+            pointer: None,
+            keyboard: None,
+            touch: None,
+            events_loop_proxy: self.events_loop_proxy.clone(),
+            modifiers_tracker: Arc::new(Mutex::new(ModifiersState::default())),
+        };
+        let seat = registry
+            .bind(min(version, 5), id, move |seat| {
+                seat.implement(move |event, seat| {
+                    seat_data.receive(event, seat)
+                }, ())
+            })
+            .unwrap();
+        self.store.lock().unwrap().new_seat(&seat);
+        self.seats.lock().unwrap().push((id, seat));
+    }
+
+    fn remove_seat(&mut self, id: u32) {
+        use self::wl_seat::RequestsTrait as SeatRequests;
+        let mut seats = self.seats.lock().unwrap();
+        if let Some(idx) = seats.iter().position(|&(i, _)| i == id) {
+            let (_, seat) = seats.swap_remove(idx);
+            if seat.version() >= 5 {
+                seat.release();
+            }
+        }
+    }
+}
+
+struct SeatData {
+    sink: Arc<Mutex<EventsLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    pointer: Option<Proxy<wl_pointer::WlPointer>>,
+    keyboard: Option<Proxy<wl_keyboard::WlKeyboard>>,
+    touch: Option<Proxy<wl_touch::WlTouch>>,
+    events_loop_proxy: EventsLoopProxy,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+}
+
+impl SeatData {
+    fn receive(&mut self, evt: wl_seat::Event, seat: Proxy<wl_seat::WlSeat>) {
+        match evt {
+            wl_seat::Event::Name { .. } => (),
+            wl_seat::Event::Capabilities { capabilities } => {
+                // create pointer if applicable
+                if capabilities.contains(wl_seat::Capability::Pointer) && self.pointer.is_none() {
+                    self.pointer = Some(super::pointer::implement_pointer(
+                        &seat,
+                        self.sink.clone(),
+                        self.store.clone(),
+                        self.modifiers_tracker.clone(),
+                    ))
+                }
+                // destroy pointer if applicable
+                if !capabilities.contains(wl_seat::Capability::Pointer) {
+                    if let Some(pointer) = self.pointer.take() {
+                        if pointer.version() >= 3 {
+                            use self::wl_pointer::RequestsTrait;
+                            pointer.release();
+                        }
+                    }
+                }
+                // create keyboard if applicable
+                if capabilities.contains(wl_seat::Capability::Keyboard) && self.keyboard.is_none() {
+                    self.keyboard = Some(super::keyboard::init_keyboard(
+                        &seat,
+                        self.sink.clone(),
+                        self.events_loop_proxy.clone(),
+                        self.modifiers_tracker.clone(),
+                    ))
+                }
+                // destroy keyboard if applicable
+                if !capabilities.contains(wl_seat::Capability::Keyboard) {
+                    if let Some(kbd) = self.keyboard.take() {
+                        if kbd.version() >= 3 {
+                            use self::wl_keyboard::RequestsTrait;
+                            kbd.release();
+                        }
+                    }
+                }
+                // create touch if applicable
+                if capabilities.contains(wl_seat::Capability::Touch) && self.touch.is_none() {
+                    self.touch = Some(super::touch::implement_touch(
+                        &seat,
+                        self.sink.clone(),
+                        self.store.clone(),
+                    ))
+                }
+                // destroy touch if applicable
+                if !capabilities.contains(wl_seat::Capability::Touch) {
+                    if let Some(touch) = self.touch.take() {
+                        if touch.version() >= 3 {
+                            use self::wl_touch::RequestsTrait;
+                            touch.release();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl Drop for SeatData {
+    fn drop(&mut self) {
+        if let Some(pointer) = self.pointer.take() {
+            if pointer.version() >= 3 {
+                use self::wl_pointer::RequestsTrait;
+                pointer.release();
+            }
+        }
+        if let Some(kbd) = self.keyboard.take() {
+            if kbd.version() >= 3 {
+                use self::wl_keyboard::RequestsTrait;
+                kbd.release();
+            }
+        }
+        if let Some(touch) = self.touch.take() {
+            if touch.version() >= 3 {
+                use self::wl_touch::RequestsTrait;
+                touch.release();
+            }
+        }
+    }
+}
+
+/*
+ * Monitor stuff
+ */
+
+pub struct MonitorId {
+    pub(crate) proxy: Proxy<wl_output::WlOutput>,
+    pub(crate) mgr: OutputMgr,
+}
+
+impl Clone for MonitorId {
+    fn clone(&self) -> MonitorId {
+        MonitorId {
+            proxy: self.proxy.clone(),
+            mgr: self.mgr.clone(),
+        }
+    }
+}
+
+impl fmt::Debug for MonitorId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorId {
+            name: Option<String>,
+            native_identifier: u32,
+            dimensions: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: i32,
+        }
+
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            native_identifier: self.get_native_identifier(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
+
+impl MonitorId {
+    pub fn get_name(&self) -> Option<String> {
+        self.mgr.with_info(&self.proxy, |_, info| {
+            format!("{} ({})", info.model, info.make)
+        })
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> u32 {
+        self.mgr.with_info(&self.proxy, |id, _| id).unwrap_or(0)
+    }
+
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        match self.mgr.with_info(&self.proxy, |_, info| {
+            info.modes
+                .iter()
+                .find(|m| m.is_current)
+                .map(|m| m.dimensions)
+        }) {
+            Some(Some((w, h))) => (w as u32, h as u32),
+            _ => (0, 0),
+        }.into()
+    }
+
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.location)
+            .unwrap_or((0, 0))
+            .into()
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> i32 {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.scale_factor)
+            .unwrap_or(1)
+    }
+}
+
+pub fn get_primary_monitor(outputs: &OutputMgr) -> MonitorId {
+    outputs.with_all(|list| {
+        if let Some(&(_, ref proxy, _)) = list.first() {
+            MonitorId {
+                proxy: proxy.clone(),
+                mgr: outputs.clone(),
+            }
+        } else {
+            panic!("No monitor is available.")
+        }
+    })
+}
+
+pub fn get_available_monitors(outputs: &OutputMgr) -> VecDeque<MonitorId> {
+    outputs.with_all(|list| {
+        list.iter()
+            .map(|&(_, ref proxy, _)| MonitorId {
+                proxy: proxy.clone(),
+                mgr: outputs.clone(),
+            })
+            .collect()
+    })
+}

src/platform/linux/wayland/keyboard.rs

@@ -1,20 +1,22 @@
 use std::sync::{Arc, Mutex};
 
-use super::{make_wid, DeviceId};
-use smithay_client_toolkit::{
-    keyboard::{
-        self, map_keyboard_auto_with_repeat, Event as KbEvent, KeyRepeatEvent, KeyRepeatKind,
-    },
-    reexports::client::protocol::{wl_keyboard, wl_seat},
+use super::{make_wid, DeviceId, EventsLoopProxy, EventsLoopSink};
+use sctk::keyboard::{
+    self, map_keyboard_auto_with_repeat, Event as KbEvent, KeyRepeatEvent, KeyRepeatKind,
 };
+use sctk::reexports::client::protocol::wl_keyboard;
+use sctk::reexports::client::Proxy;
+use sctk::reexports::client::protocol::wl_seat;
+use sctk::reexports::client::protocol::wl_seat::RequestsTrait as SeatRequests;
 
-use crate::event::{ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
+use {ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
 
 pub fn init_keyboard(
-    seat: &wl_seat::WlSeat,
-    sink: ::calloop::channel::Sender<(crate::event::WindowEvent, super::WindowId)>,
+    seat: &Proxy<wl_seat::WlSeat>,
+    sink: Arc<Mutex<EventsLoopSink>>,
+    events_loop_proxy: EventsLoopProxy,
     modifiers_tracker: Arc<Mutex<ModifiersState>>,
-) -> wl_keyboard::WlKeyboard {
+) -> Proxy<wl_keyboard::WlKeyboard> {
     // { variables to be captured by the closures
     let target = Arc::new(Mutex::new(None));
     let my_sink = sink.clone();
@@ -25,94 +27,88 @@ pub fn init_keyboard(
     let ret = map_keyboard_auto_with_repeat(
         seat,
         KeyRepeatKind::System,
-        move |evt: KbEvent<'_>, _| {
-            match evt {
-                KbEvent::Enter { surface, .. } => {
-                    let wid = make_wid(&surface);
-                    my_sink.send((WindowEvent::Focused(true), wid)).unwrap();
-                    *target.lock().unwrap() = Some(wid);
-                },
-                KbEvent::Leave { surface, .. } => {
-                    let wid = make_wid(&surface);
-                    my_sink.send((WindowEvent::Focused(false), wid)).unwrap();
-                    *target.lock().unwrap() = None;
-                },
-                KbEvent::Key {
-                    rawkey,
-                    keysym,
-                    state,
-                    utf8,
-                    ..
-                } => {
-                    if let Some(wid) = *target.lock().unwrap() {
-                        let state = match state {
-                            wl_keyboard::KeyState::Pressed => ElementState::Pressed,
-                            wl_keyboard::KeyState::Released => ElementState::Released,
-                            _ => unreachable!(),
-                        };
-                        let vkcode = key_to_vkey(rawkey, keysym);
-                        my_sink
-                            .send((
-                                WindowEvent::KeyboardInput {
-                                    device_id: crate::event::DeviceId(
-                                        crate::platform_impl::DeviceId::Wayland(DeviceId),
-                                    ),
-                                    input: KeyboardInput {
-                                        state,
-                                        scancode: rawkey,
-                                        virtual_keycode: vkcode,
-                                        modifiers: modifiers_tracker.lock().unwrap().clone(),
-                                    },
-                                },
-                                wid,
-                            ))
-                            .unwrap();
-                        // send char event only on key press, not release
-                        if let ElementState::Released = state {
-                            return;
-                        }
-                        if let Some(txt) = utf8 {
-                            for chr in txt.chars() {
-                                my_sink
-                                    .send((WindowEvent::ReceivedCharacter(chr), wid))
-                                    .unwrap();
-                            }
+        move |evt: KbEvent, _| match evt {
+            KbEvent::Enter { surface, .. } => {
+                let wid = make_wid(&surface);
+                my_sink
+                    .lock()
+                    .unwrap()
+                    .send_event(WindowEvent::Focused(true), wid);
+                *target.lock().unwrap() = Some(wid);
+            }
+            KbEvent::Leave { surface, .. } => {
+                let wid = make_wid(&surface);
+                my_sink
+                    .lock()
+                    .unwrap()
+                    .send_event(WindowEvent::Focused(false), wid);
+                *target.lock().unwrap() = None;
+            }
+            KbEvent::Key {
+                rawkey,
+                keysym,
+                state,
+                utf8,
+                ..
+            } => {
+                if let Some(wid) = *target.lock().unwrap() {
+                    let state = match state {
+                        wl_keyboard::KeyState::Pressed => ElementState::Pressed,
+                        wl_keyboard::KeyState::Released => ElementState::Released,
+                    };
+                    let vkcode = key_to_vkey(rawkey, keysym);
+                    let mut guard = my_sink.lock().unwrap();
+                    guard.send_event(
+                        WindowEvent::KeyboardInput {
+                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            input: KeyboardInput {
+                                state: state,
+                                scancode: rawkey,
+                                virtual_keycode: vkcode,
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                        },
+                        wid,
+                    );
+                    // send char event only on key press, not release
+                    if let ElementState::Released = state {
+                        return;
+                    }
+                    if let Some(txt) = utf8 {
+                        for chr in txt.chars() {
+                            guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
                         }
                     }
-                },
-                KbEvent::RepeatInfo { .. } => { /* Handled by smithay client toolkit */ },
-                KbEvent::Modifiers {
-                    modifiers: event_modifiers,
-                } => *modifiers_tracker.lock().unwrap() = event_modifiers.into(),
+                }
+            }
+            KbEvent::RepeatInfo { .. } => { /* Handled by smithay client toolkit */ }
+            KbEvent::Modifiers { modifiers: event_modifiers } => {
+                *modifiers_tracker.lock().unwrap() = event_modifiers.into()
             }
         },
         move |repeat_event: KeyRepeatEvent, _| {
             if let Some(wid) = *repeat_target.lock().unwrap() {
                 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),
-                            ),
-                            input: KeyboardInput {
-                                state,
-                                scancode: repeat_event.rawkey,
-                                virtual_keycode: vkcode,
-                                modifiers: my_modifiers.lock().unwrap().clone(),
-                            },
+                let mut guard = repeat_sink.lock().unwrap();
+                guard.send_event(
+                    WindowEvent::KeyboardInput {
+                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                        input: KeyboardInput {
+                            state: state,
+                            scancode: repeat_event.rawkey,
+                            virtual_keycode: vkcode,
+                            modifiers: my_modifiers.lock().unwrap().clone(),
                         },
-                        wid,
-                    ))
-                    .unwrap();
+                    },
+                    wid,
+                );
                 if let Some(txt) = repeat_event.utf8 {
                     for chr in txt.chars() {
-                        repeat_sink
-                            .send((WindowEvent::ReceivedCharacter(chr), wid))
-                            .unwrap();
+                        guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
                     }
                 }
+                events_loop_proxy.wakeup().unwrap();
             }
         },
     );
@@ -132,54 +128,47 @@ pub fn init_keyboard(
             let my_sink = sink;
             // }
             seat.get_keyboard(|keyboard| {
-                keyboard.implement_closure(
-                    move |evt, _| {
-                        match evt {
-                            wl_keyboard::Event::Enter { surface, .. } => {
-                                let wid = make_wid(&surface);
-                                my_sink.send((WindowEvent::Focused(true), wid)).unwrap();
-                                target = Some(wid);
-                            },
-                            wl_keyboard::Event::Leave { surface, .. } => {
-                                let wid = make_wid(&surface);
-                                my_sink.send((WindowEvent::Focused(false), wid)).unwrap();
-                                target = None;
-                            },
-                            wl_keyboard::Event::Key { key, state, .. } => {
-                                if let Some(wid) = target {
-                                    let state = match state {
-                                        wl_keyboard::KeyState::Pressed => ElementState::Pressed,
-                                        wl_keyboard::KeyState::Released => ElementState::Released,
-                                        _ => unreachable!(),
-                                    };
-                                    my_sink
-                                        .send((
-                                            WindowEvent::KeyboardInput {
-                                                device_id: crate::event::DeviceId(
-                                                    crate::platform_impl::DeviceId::Wayland(
-                                                        DeviceId,
-                                                    ),
-                                                ),
-                                                input: KeyboardInput {
-                                                    state,
-                                                    scancode: key,
-                                                    virtual_keycode: None,
-                                                    modifiers: ModifiersState::default(),
-                                                },
-                                            },
-                                            wid,
-                                        ))
-                                        .unwrap();
-                                }
-                            },
-                            _ => (),
+                keyboard.implement(move |evt, _| match evt {
+                    wl_keyboard::Event::Enter { surface, .. } => {
+                        let wid = make_wid(&surface);
+                        my_sink
+                            .lock()
+                            .unwrap()
+                            .send_event(WindowEvent::Focused(true), wid);
+                        target = Some(wid);
+                    }
+                    wl_keyboard::Event::Leave { surface, .. } => {
+                        let wid = make_wid(&surface);
+                        my_sink
+                            .lock()
+                            .unwrap()
+                            .send_event(WindowEvent::Focused(false), wid);
+                        target = None;
+                    }
+                    wl_keyboard::Event::Key { key, state, .. } => {
+                        if let Some(wid) = target {
+                            let state = match state {
+                                wl_keyboard::KeyState::Pressed => ElementState::Pressed,
+                                wl_keyboard::KeyState::Released => ElementState::Released,
+                            };
+                            my_sink.lock().unwrap().send_event(
+                                WindowEvent::KeyboardInput {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    input: KeyboardInput {
+                                        state: state,
+                                        scancode: key,
+                                        virtual_keycode: None,
+                                        modifiers: ModifiersState::default(),
+                                    },
+                                },
+                                wid,
+                            );
                         }
-                    },
-                    (),
-                )
-            })
-            .unwrap()
-        },
+                    }
+                    _ => (),
+                }, ())
+            }).unwrap()
+        }
     }
 }
 
@@ -201,7 +190,7 @@ fn key_to_vkey(rawkey: u32, keysym: u32) -> Option<VirtualKeyCode> {
 }
 
 fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
-    use smithay_client_toolkit::keyboard::keysyms;
+    use sctk::keyboard::keysyms;
     match keysym {
         // letters
         keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),

src/platform/linux/wayland/mod.rs

@@ -0,0 +1,25 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd",
+           target_os = "netbsd", target_os = "openbsd"))]
+
+pub use self::window::Window;
+pub use self::event_loop::{EventsLoop, EventsLoopProxy, EventsLoopSink, MonitorId};
+
+use sctk::reexports::client::protocol::wl_surface;
+use sctk::reexports::client::Proxy;
+
+mod event_loop;
+mod pointer;
+mod touch;
+mod keyboard;
+mod window;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(usize);
+
+#[inline]
+fn make_wid(s: &Proxy<wl_surface::WlSurface>) -> WindowId {
+    WindowId(s.c_ptr() as usize)
+}

src/platform/linux/wayland/pointer.rs

@@ -0,0 +1,189 @@
+use std::sync::{Arc, Mutex};
+
+use {ElementState, MouseButton, MouseScrollDelta, TouchPhase, WindowEvent};
+use events::ModifiersState;
+
+use super::DeviceId;
+use super::event_loop::EventsLoopSink;
+use super::window::WindowStore;
+
+use sctk::reexports::client::Proxy;
+use sctk::reexports::client::protocol::wl_pointer::{self, Event as PtrEvent, WlPointer};
+use sctk::reexports::client::protocol::wl_seat;
+use sctk::reexports::client::protocol::wl_seat::RequestsTrait as SeatRequests;
+
+pub fn implement_pointer(
+    seat: &Proxy<wl_seat::WlSeat>,
+    sink: Arc<Mutex<EventsLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+) -> Proxy<WlPointer> {
+    let mut mouse_focus = None;
+    let mut axis_buffer = None;
+    let mut axis_discrete_buffer = None;
+    let mut axis_state = TouchPhase::Ended;
+
+    seat.get_pointer(|pointer| {
+        pointer.implement(move |evt, pointer| {
+            let mut sink = sink.lock().unwrap();
+            let store = store.lock().unwrap();
+            match evt {
+                PtrEvent::Enter {
+                    surface,
+                    surface_x,
+                    surface_y,
+                    ..
+                } => {
+                    let wid = store.find_wid(&surface);
+                    if let Some(wid) = wid {
+                        mouse_focus = Some(wid);
+                        sink.send_event(
+                            WindowEvent::CursorEntered {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            },
+                            wid,
+                        );
+                        sink.send_event(
+                            WindowEvent::CursorMoved {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                position: (surface_x, surface_y).into(),
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Leave { surface, .. } => {
+                    mouse_focus = None;
+                    let wid = store.find_wid(&surface);
+                    if let Some(wid) = wid {
+                        sink.send_event(
+                            WindowEvent::CursorLeft {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Motion {
+                    surface_x,
+                    surface_y,
+                    ..
+                } => {
+                    if let Some(wid) = mouse_focus {
+                        sink.send_event(
+                            WindowEvent::CursorMoved {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                position: (surface_x, surface_y).into(),
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Button { button, state, .. } => {
+                    if let Some(wid) = mouse_focus {
+                        let state = match state {
+                            wl_pointer::ButtonState::Pressed => ElementState::Pressed,
+                            wl_pointer::ButtonState::Released => ElementState::Released,
+                        };
+                        let button = match button {
+                            0x110 => MouseButton::Left,
+                            0x111 => MouseButton::Right,
+                            0x112 => MouseButton::Middle,
+                            // TODO figure out the translation ?
+                            _ => return,
+                        };
+                        sink.send_event(
+                            WindowEvent::MouseInput {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                state: state,
+                                button: button,
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Axis { axis, value, .. } => {
+                    if let Some(wid) = mouse_focus {
+                        if pointer.version() < 5 {
+                            let (mut x, mut y) = (0.0, 0.0);
+                            // old seat compatibility
+                            match axis {
+                                // wayland vertical sign convention is the inverse of winit
+                                wl_pointer::Axis::VerticalScroll => y -= value as f32,
+                                wl_pointer::Axis::HorizontalScroll => x += value as f32,
+                            }
+                            sink.send_event(
+                                WindowEvent::MouseWheel {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    delta: MouseScrollDelta::PixelDelta((x as f64, y as f64).into()),
+                                    phase: TouchPhase::Moved,
+                                    modifiers: modifiers_tracker.lock().unwrap().clone(),
+                                },
+                                wid,
+                            );
+                        } else {
+                            let (mut x, mut y) = axis_buffer.unwrap_or((0.0, 0.0));
+                            match axis {
+                                // wayland vertical sign convention is the inverse of winit
+                                wl_pointer::Axis::VerticalScroll => y -= value as f32,
+                                wl_pointer::Axis::HorizontalScroll => x += value as f32,
+                            }
+                            axis_buffer = Some((x, y));
+                            axis_state = match axis_state {
+                                TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
+                                _ => TouchPhase::Started,
+                            }
+                        }
+                    }
+                }
+                PtrEvent::Frame => {
+                    let axis_buffer = axis_buffer.take();
+                    let axis_discrete_buffer = axis_discrete_buffer.take();
+                    if let Some(wid) = mouse_focus {
+                        if let Some((x, y)) = axis_discrete_buffer {
+                            sink.send_event(
+                                WindowEvent::MouseWheel {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    delta: MouseScrollDelta::LineDelta(x as f32, y as f32),
+                                    phase: axis_state,
+                                    modifiers: modifiers_tracker.lock().unwrap().clone(),
+                                },
+                                wid,
+                            );
+                        } else if let Some((x, y)) = axis_buffer {
+                            sink.send_event(
+                                WindowEvent::MouseWheel {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    delta: MouseScrollDelta::PixelDelta((x as f64, y as f64).into()),
+                                    phase: axis_state,
+                                    modifiers: modifiers_tracker.lock().unwrap().clone(),
+                                },
+                                wid,
+                            );
+                        }
+                    }
+                }
+                PtrEvent::AxisSource { .. } => (),
+                PtrEvent::AxisStop { .. } => {
+                    axis_state = TouchPhase::Ended;
+                }
+                PtrEvent::AxisDiscrete { axis, discrete } => {
+                    let (mut x, mut y) = axis_discrete_buffer.unwrap_or((0, 0));
+                    match axis {
+                        // wayland vertical sign convention is the inverse of winit
+                        wl_pointer::Axis::VerticalScroll => y -= discrete,
+                        wl_pointer::Axis::HorizontalScroll => x += discrete,
+                    }
+                    axis_discrete_buffer = Some((x, y));
+                    axis_state = match axis_state {
+                        TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
+                        _ => TouchPhase::Started,
+                    }
+                }
+            }
+        }, ())
+    }).unwrap()
+}

src/platform/linux/wayland/touch.rs

@@ -0,0 +1,97 @@
+use std::sync::{Arc, Mutex};
+
+use {TouchPhase, WindowEvent};
+
+use super::{DeviceId, WindowId};
+use super::event_loop::EventsLoopSink;
+use super::window::WindowStore;
+
+use sctk::reexports::client::Proxy;
+use sctk::reexports::client::protocol::wl_touch::{Event as TouchEvent, WlTouch};
+use sctk::reexports::client::protocol::wl_seat;
+use sctk::reexports::client::protocol::wl_seat::RequestsTrait as SeatRequests;
+
+struct TouchPoint {
+    wid: WindowId,
+    location: (f64, f64),
+    id: i32,
+}
+
+pub(crate) fn implement_touch(
+    seat: &Proxy<wl_seat::WlSeat>,
+    sink: Arc<Mutex<EventsLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+) -> Proxy<WlTouch> {
+    let mut pending_ids = Vec::new();
+    seat.get_touch(|touch| {
+        touch.implement(move |evt, _| {
+            let mut sink = sink.lock().unwrap();
+            let store = store.lock().unwrap();
+            match evt {
+                TouchEvent::Down {
+                    surface, id, x, y, ..
+                } => {
+                    let wid = store.find_wid(&surface);
+                    if let Some(wid) = wid {
+                        sink.send_event(
+                            WindowEvent::Touch(::Touch {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                phase: TouchPhase::Started,
+                                location: (x, y).into(),
+                                id: id as u64,
+                            }),
+                            wid,
+                        );
+                        pending_ids.push(TouchPoint {
+                            wid: wid,
+                            location: (x, y),
+                            id: id,
+                        });
+                    }
+                }
+                TouchEvent::Up { id, .. } => {
+                    let idx = pending_ids.iter().position(|p| p.id == id);
+                    if let Some(idx) = idx {
+                        let pt = pending_ids.remove(idx);
+                        sink.send_event(
+                            WindowEvent::Touch(::Touch {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                phase: TouchPhase::Ended,
+                                location: pt.location.into(),
+                                id: id as u64,
+                            }),
+                            pt.wid,
+                        );
+                    }
+                }
+                TouchEvent::Motion { id, x, y, .. } => {
+                    let pt = pending_ids.iter_mut().find(|p| p.id == id);
+                    if let Some(pt) = pt {
+                        pt.location = (x, y);
+                        sink.send_event(
+                            WindowEvent::Touch(::Touch {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                phase: TouchPhase::Moved,
+                                location: (x, y).into(),
+                                id: id as u64,
+                            }),
+                            pt.wid,
+                        );
+                    }
+                }
+                TouchEvent::Frame => (),
+                TouchEvent::Cancel => for pt in pending_ids.drain(..) {
+                    sink.send_event(
+                        WindowEvent::Touch(::Touch {
+                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            phase: TouchPhase::Cancelled,
+                            location: pt.location.into(),
+                            id: pt.id as u64,
+                        }),
+                        pt.wid,
+                    );
+                },
+            }
+        }, ())
+    }).unwrap()
+}

src/platform/linux/wayland/window.rs

@@ -0,0 +1,415 @@
+use raw_window_handle::unix::WaylandHandle;
+use std::collections::VecDeque;
+use std::sync::{Arc, Mutex, Weak};
+
+use {CreationError, MouseCursor, WindowAttributes};
+use dpi::{LogicalPosition, LogicalSize};
+use platform::{MonitorId as PlatformMonitorId, PlatformSpecificWindowBuilderAttributes as PlAttributes};
+use window::MonitorId as RootMonitorId;
+
+use sctk::surface::{get_dpi_factor, get_outputs};
+use sctk::window::{ConceptFrame, Event as WEvent, State as WState, Window as SWindow, Theme};
+use sctk::reexports::client::{Display, Proxy};
+use sctk::reexports::client::protocol::{wl_seat, wl_surface};
+use sctk::reexports::client::protocol::wl_surface::RequestsTrait as SurfaceRequests;
+use sctk::output::OutputMgr;
+
+use super::{make_wid, EventsLoop, MonitorId, WindowId};
+use platform::platform::wayland::event_loop::{get_available_monitors, get_primary_monitor};
+
+pub struct Window {
+    surface: Proxy<wl_surface::WlSurface>,
+    frame: Arc<Mutex<SWindow<ConceptFrame>>>,
+    outputs: OutputMgr, // Access to info for all monitors
+    size: Arc<Mutex<(u32, u32)>>,
+    kill_switch: (Arc<Mutex<bool>>, Arc<Mutex<bool>>),
+    display: Arc<Display>,
+    need_frame_refresh: Arc<Mutex<bool>>,
+    fullscreen: Arc<Mutex<bool>>,
+}
+
+impl Window {
+    pub fn new(evlp: &EventsLoop, attributes: WindowAttributes, pl_attribs: PlAttributes) -> Result<Window, CreationError> {
+        let (width, height) = attributes.dimensions.map(Into::into).unwrap_or((800, 600));
+        // Create the window
+        let size = Arc::new(Mutex::new((width, height)));
+        let fullscreen = Arc::new(Mutex::new(false));
+
+        let window_store = evlp.store.clone();
+        let surface = evlp.env.create_surface(move |dpi, surface| {
+            window_store.lock().unwrap().dpi_change(&surface, dpi);
+            surface.set_buffer_scale(dpi);
+        });
+
+        let window_store = evlp.store.clone();
+        let my_surface = surface.clone();
+        let mut frame = SWindow::<ConceptFrame>::init_from_env(
+            &evlp.env,
+            surface.clone(),
+            (width, height),
+            move |event| match event {
+                WEvent::Configure { new_size, states } => {
+                    let mut store = window_store.lock().unwrap();
+                    let is_fullscreen = states.contains(&WState::Fullscreen);
+
+                    for window in &mut store.windows {
+                        if window.surface.equals(&my_surface) {
+                            window.newsize = new_size;
+                            window.need_refresh = true;
+                            *(window.fullscreen.lock().unwrap()) = is_fullscreen;
+                            *(window.need_frame_refresh.lock().unwrap()) = true;
+                            return;
+                        }
+                    }
+                }
+                WEvent::Refresh => {
+                    let store = window_store.lock().unwrap();
+                    for window in &store.windows {
+                        if window.surface.equals(&my_surface) {
+                            *(window.need_frame_refresh.lock().unwrap()) = true;
+                            return;
+                        }
+                    }
+                }
+                WEvent::Close => {
+                    let mut store = window_store.lock().unwrap();
+                    for window in &mut store.windows {
+                        if window.surface.equals(&my_surface) {
+                            window.closed = true;
+                            return;
+                        }
+                    }
+                }
+            },
+        ).unwrap();
+
+        if let Some(app_id) = pl_attribs.app_id {
+            frame.set_app_id(app_id);
+        }
+
+        frame.set_title(attributes.title);
+
+        for &(_, ref seat) in evlp.seats.lock().unwrap().iter() {
+            frame.new_seat(seat);
+        }
+
+        // Check for fullscreen requirements
+        if let Some(RootMonitorId {
+            inner: PlatformMonitorId::Wayland(ref monitor_id),
+        }) = attributes.fullscreen
+        {
+            frame.set_fullscreen(Some(&monitor_id.proxy));
+        } else if attributes.maximized {
+            frame.set_maximized();
+        }
+
+        frame.set_resizable(attributes.resizable);
+
+        // set decorations
+        frame.set_decorate(attributes.decorations);
+
+        // min-max dimensions
+        frame.set_min_size(attributes.min_dimensions.map(Into::into));
+        frame.set_max_size(attributes.max_dimensions.map(Into::into));
+
+        let kill_switch = Arc::new(Mutex::new(false));
+        let need_frame_refresh = Arc::new(Mutex::new(true));
+        let frame = Arc::new(Mutex::new(frame));
+
+        evlp.store.lock().unwrap().windows.push(InternalWindow {
+            closed: false,
+            newsize: None,
+            size: size.clone(),
+            fullscreen: fullscreen.clone(),
+            need_refresh: false,
+            need_frame_refresh: need_frame_refresh.clone(),
+            surface: surface.clone(),
+            kill_switch: kill_switch.clone(),
+            frame: Arc::downgrade(&frame),
+            current_dpi: 1,
+            new_dpi: None,
+        });
+        evlp.evq.borrow_mut().sync_roundtrip().unwrap();
+
+        Ok(Window {
+            display: evlp.display.clone(),
+            surface: surface,
+            frame: frame,
+            outputs: evlp.env.outputs.clone(),
+            size: size,
+            kill_switch: (kill_switch, evlp.cleanup_needed.clone()),
+            need_frame_refresh: need_frame_refresh,
+            fullscreen: fullscreen,
+        })
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        make_wid(&self.surface)
+    }
+
+    pub fn set_title(&self, title: &str) {
+        self.frame.lock().unwrap().set_title(title.into());
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        // Not possible with wayland
+        None
+    }
+
+    #[inline]
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        // Not possible with wayland
+        None
+    }
+
+    #[inline]
+    pub fn set_position(&self, _pos: LogicalPosition) {
+        // Not possible with wayland
+    }
+
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+        Some(self.size.lock().unwrap().clone().into())
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
+        let (w, h) = self.size.lock().unwrap().clone();
+        // let (w, h) = super::wayland_window::add_borders(w as i32, h as i32);
+        Some((w, h).into())
+    }
+
+    #[inline]
+    // NOTE: This will only resize the borders, the contents must be updated by the user
+    pub fn set_inner_size(&self, size: LogicalSize) {
+        let (w, h) = size.into();
+        self.frame.lock().unwrap().resize(w, h);
+        *(self.size.lock().unwrap()) = (w, h);
+    }
+
+    #[inline]
+    pub fn set_min_dimensions(&self, dimensions: Option<LogicalSize>) {
+        self.frame.lock().unwrap().set_min_size(dimensions.map(Into::into));
+    }
+
+    #[inline]
+    pub fn set_max_dimensions(&self, dimensions: Option<LogicalSize>) {
+        self.frame.lock().unwrap().set_max_size(dimensions.map(Into::into));
+    }
+
+    #[inline]
+    pub fn set_resizable(&self, resizable: bool) {
+        self.frame.lock().unwrap().set_resizable(resizable);
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> i32 {
+        get_dpi_factor(&self.surface)
+    }
+
+    pub fn set_decorations(&self, decorate: bool) {
+        self.frame.lock().unwrap().set_decorate(decorate);
+        *(self.need_frame_refresh.lock().unwrap()) = true;
+    }
+
+    pub fn set_maximized(&self, maximized: bool) {
+        if maximized {
+            self.frame.lock().unwrap().set_maximized();
+        } else {
+            self.frame.lock().unwrap().unset_maximized();
+        }
+    }
+
+    pub fn get_fullscreen(&self) -> Option<MonitorId> {
+        if *(self.fullscreen.lock().unwrap()) {
+            Some(self.get_current_monitor())
+        } else {
+            None
+        }
+    }
+
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorId>) {
+        if let Some(RootMonitorId {
+            inner: PlatformMonitorId::Wayland(ref monitor_id),
+        }) = monitor
+        {
+            self.frame
+                .lock()
+                .unwrap()
+                .set_fullscreen(Some(&monitor_id.proxy));
+        } else {
+            self.frame.lock().unwrap().unset_fullscreen();
+        }
+    }
+
+
+    pub fn set_theme<T: Theme>(&self, theme: T) {
+        self.frame.lock().unwrap().set_theme(theme)
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, _cursor: MouseCursor) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn hide_cursor(&self, _hide: bool) {
+        // TODO: This isn't possible on Wayland yet
+    }
+
+    #[inline]
+    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
+        Err("Cursor grabbing is not yet possible on Wayland.".to_owned())
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _pos: LogicalPosition) -> Result<(), String> {
+        Err("Setting the cursor position is not yet possible on Wayland.".to_owned())
+    }
+
+    pub fn get_display(&self) -> &Display {
+        &*self.display
+    }
+
+    pub fn get_surface(&self) -> &Proxy<wl_surface::WlSurface> {
+        &self.surface
+    }
+
+    pub fn get_current_monitor(&self) -> MonitorId {
+        let output = get_outputs(&self.surface).last().unwrap().clone();
+        MonitorId {
+            proxy: output,
+            mgr: self.outputs.clone(),
+        }
+    }
+
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        get_available_monitors(&self.outputs)
+    }
+
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        get_primary_monitor(&self.outputs)
+    }
+
+    pub fn raw_window_handle(&self) -> WaylandHandle {
+        WaylandHandle {
+            surface: self.get_surface().c_ptr() as *mut _,
+            display: self.get_display().c_ptr() as *mut _,
+            ..WaylandHandle::empty()
+        }
+    }
+}
+
+impl Drop for Window {
+    fn drop(&mut self) {
+        *(self.kill_switch.0.lock().unwrap()) = true;
+        *(self.kill_switch.1.lock().unwrap()) = true;
+    }
+}
+
+/*
+ * Internal store for windows
+ */
+
+struct InternalWindow {
+    surface: Proxy<wl_surface::WlSurface>,
+    newsize: Option<(u32, u32)>,
+    size: Arc<Mutex<(u32, u32)>>,
+    fullscreen: Arc<Mutex<bool>>,
+    need_refresh: bool,
+    need_frame_refresh: Arc<Mutex<bool>>,
+    closed: bool,
+    kill_switch: Arc<Mutex<bool>>,
+    frame: Weak<Mutex<SWindow<ConceptFrame>>>,
+    current_dpi: i32,
+    new_dpi: Option<i32>,
+}
+
+pub struct WindowStore {
+    windows: Vec<InternalWindow>,
+}
+
+impl WindowStore {
+    pub fn new() -> WindowStore {
+        WindowStore {
+            windows: Vec::new(),
+        }
+    }
+
+    pub fn find_wid(&self, surface: &Proxy<wl_surface::WlSurface>) -> Option<WindowId> {
+        for window in &self.windows {
+            if surface.equals(&window.surface) {
+                return Some(make_wid(surface));
+            }
+        }
+        None
+    }
+
+    pub fn cleanup(&mut self) -> Vec<WindowId> {
+        let mut pruned = Vec::new();
+        self.windows.retain(|w| {
+            if *w.kill_switch.lock().unwrap() {
+                // window is dead, cleanup
+                pruned.push(make_wid(&w.surface));
+                w.surface.destroy();
+                false
+            } else {
+                true
+            }
+        });
+        pruned
+    }
+
+    pub fn new_seat(&self, seat: &Proxy<wl_seat::WlSeat>) {
+        for window in &self.windows {
+            if let Some(w) = window.frame.upgrade() {
+                w.lock().unwrap().new_seat(seat);
+            }
+        }
+    }
+
+    fn dpi_change(&mut self, surface: &Proxy<wl_surface::WlSurface>, new: i32) {
+        for window in &mut self.windows {
+            if surface.equals(&window.surface) {
+                window.new_dpi = Some(new);
+            }
+        }
+    }
+
+    pub fn for_each<F>(&mut self, mut f: F)
+    where
+        F: FnMut(Option<(u32, u32)>, &mut (u32, u32), Option<i32>, bool, 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(
+                window.newsize.take(),
+                &mut *(window.size.lock().unwrap()),
+                window.new_dpi,
+                window.need_refresh,
+                ::std::mem::replace(&mut *window.need_frame_refresh.lock().unwrap(), false),
+                window.closed,
+                make_wid(&window.surface),
+                opt_mutex_lock.as_mut().map(|m| &mut **m),
+            );
+            if let Some(dpi) = window.new_dpi.take() {
+                window.current_dpi = dpi;
+            }
+            window.need_refresh = false;
+            // avoid re-spamming the event
+            window.closed = false;
+        }
+    }
+}

src/platform/linux/x11/dnd.rs

@@ -1,10 +1,8 @@
-use std::{
-    io,
-    os::raw::*,
-    path::{Path, PathBuf},
-    str::Utf8Error,
-    sync::Arc,
-};
+use std::io;
+use std::sync::Arc;
+use std::path::{Path, PathBuf};
+use std::str::Utf8Error;
+use std::os::raw::*;
 
 use percent_encoding::percent_decode;
 
@@ -129,15 +127,13 @@ impl Dnd {
             DndState::Accepted => (1, self.atoms.action_private as c_long),
             DndState::Rejected => (0, self.atoms.none as c_long),
         };
-        self.xconn
-            .send_client_msg(
-                target_window,
-                target_window,
-                self.atoms.status,
-                None,
-                [this_window as c_long, accepted, 0, 0, action],
-            )
-            .flush()
+        self.xconn.send_client_msg(
+            target_window,
+            target_window,
+            self.atoms.status,
+            None,
+            [this_window as c_long, accepted, 0, 0, action],
+        ).flush()
     }
 
     pub unsafe fn send_finished(
@@ -150,23 +146,24 @@ impl Dnd {
             DndState::Accepted => (1, self.atoms.action_private as c_long),
             DndState::Rejected => (0, self.atoms.none as c_long),
         };
-        self.xconn
-            .send_client_msg(
-                target_window,
-                target_window,
-                self.atoms.finished,
-                None,
-                [this_window as c_long, accepted, action, 0, 0],
-            )
-            .flush()
+        self.xconn.send_client_msg(
+            target_window,
+            target_window,
+            self.atoms.finished,
+            None,
+            [this_window as c_long, accepted, action, 0, 0],
+        ).flush()
     }
 
     pub unsafe fn get_type_list(
         &self,
         source_window: c_ulong,
     ) -> Result<Vec<ffi::Atom>, util::GetPropertyError> {
-        self.xconn
-            .get_property(source_window, self.atoms.type_list, ffi::XA_ATOM)
+        self.xconn.get_property(
+            source_window,
+            self.atoms.type_list,
+            ffi::XA_ATOM,
+        )
     }
 
     pub unsafe fn convert_selection(&self, window: c_ulong, time: c_ulong) {
@@ -184,8 +181,11 @@ impl Dnd {
         &self,
         window: c_ulong,
     ) -> Result<Vec<c_uchar>, util::GetPropertyError> {
-        self.xconn
-            .get_property(window, self.atoms.selection, self.atoms.uri_list)
+        self.xconn.get_property(
+            window,
+            self.atoms.selection,
+            self.atoms.uri_list,
+        )
     }
 
     pub fn parse_data(&self, data: &mut Vec<c_uchar>) -> Result<Vec<PathBuf>, DndDataParseError> {

src/platform/linux/x11/ffi.rs

@@ -0,0 +1,8 @@
+pub use x11_dl::keysym::*;
+pub use x11_dl::xcursor::*;
+pub use x11_dl::xlib::*;
+pub use x11_dl::xinput::*;
+pub use x11_dl::xinput2::*;
+pub use x11_dl::xlib_xcb::*;
+pub use x11_dl::error::OpenError;
+pub use x11_dl::xrandr::*;

src/platform/linux/x11/ime/callbacks.rs

@@ -1,12 +1,13 @@
-use std::{collections::HashMap, os::raw::c_char, ptr, sync::Arc};
+use std::ptr;
+use std::sync::Arc;
+use std::collections::HashMap;
+use std::os::raw::c_char;
 
 use super::{ffi, XConnection, XError};
 
-use super::{
-    context::{ImeContext, ImeContextCreationError},
-    inner::{close_im, ImeInner},
-    input_method::PotentialInputMethods,
-};
+use super::inner::{close_im, ImeInner};
+use super::input_method::PotentialInputMethods;
+use super::context::{ImeContextCreationError, ImeContext};
 
 pub unsafe fn xim_set_callback(
     xconn: &Arc<XConnection>,
@@ -16,7 +17,12 @@ pub unsafe fn xim_set_callback(
 ) -> Result<(), XError> {
     // It's advisable to wrap variadic FFI functions in our own functions, as we want to minimize
     // access that isn't type-checked.
-    (xconn.xlib.XSetIMValues)(xim, field, callback, ptr::null_mut::<()>());
+    (xconn.xlib.XSetIMValues)(
+        xim,
+        field,
+        callback,
+        ptr::null_mut::<()>(),
+    );
     xconn.check_errors()
 }
 
@@ -101,14 +107,18 @@ unsafe fn replace_im(inner: *mut ImeInner) -> Result<(), ReplaceImError> {
             let _ = close_im(xconn, new_im.im);
         }
         result
-    }
-    .map_err(ReplaceImError::SetDestroyCallbackFailed)?;
+    }.map_err(ReplaceImError::SetDestroyCallbackFailed)?;
 
     let mut new_contexts = HashMap::new();
     for (window, old_context) in (*inner).contexts.iter() {
         let spot = old_context.as_ref().map(|old_context| old_context.ic_spot);
         let new_context = {
-            let result = ImeContext::new(xconn, new_im.im, *window, spot);
+            let result = ImeContext::new(
+                xconn,
+                new_im.im,
+                *window,
+                spot,
+            );
             if result.is_err() {
                 let _ = close_im(xconn, new_im.im);
             }
@@ -127,7 +137,7 @@ unsafe fn replace_im(inner: *mut ImeInner) -> Result<(), ReplaceImError> {
     Ok(())
 }
 
-pub unsafe extern "C" fn xim_instantiate_callback(
+pub unsafe extern fn xim_instantiate_callback(
     _display: *mut ffi::Display,
     client_data: ffi::XPointer,
     // This field is unsupplied.
@@ -150,7 +160,7 @@ pub unsafe extern "C" fn xim_instantiate_callback(
 // This callback is triggered when the input method is closed on the server end. When this
 // happens, XCloseIM/XDestroyIC doesn't need to be called, as the resources have already been
 // free'd (attempting to do so causes our connection to freeze).
-pub unsafe extern "C" fn xim_destroy_callback(
+pub unsafe extern fn xim_destroy_callback(
     _xim: ffi::XIM,
     client_data: ffi::XPointer,
     // This field is unsupplied.

src/platform/linux/x11/ime/context.rs

@@ -1,8 +1,6 @@
-use std::{
-    os::raw::{c_short, c_void},
-    ptr,
-    sync::Arc,
-};
+use std::ptr;
+use std::sync::Arc;
+use std::os::raw::{c_short, c_void};
 
 use super::{ffi, util, XConnection, XError};
 
@@ -24,8 +22,7 @@ unsafe fn create_pre_edit_attr<'a>(
             ic_spot,
             ptr::null_mut::<()>(),
         ),
-    )
-    .expect("XVaCreateNestedList returned NULL")
+    ).expect("XVaCreateNestedList returned NULL")
 }
 
 // WARNING: this struct doesn't destroy its XIC resource when dropped.
@@ -52,9 +49,7 @@ impl ImeContext {
         };
 
         let ic = ic.ok_or(ImeContextCreationError::Null)?;
-        xconn
-            .check_errors()
-            .map_err(ImeContextCreationError::XError)?;
+        xconn.check_errors().map_err(ImeContextCreationError::XError)?;
 
         Ok(ImeContext {
             ic,

src/platform/linux/x11/ime/inner.rs

@@ -1,8 +1,12 @@
-use std::{collections::HashMap, mem, ptr, sync::Arc};
+use std::mem;
+use std::ptr;
+use std::sync::Arc;
+use std::collections::HashMap;
 
 use super::{ffi, XConnection, XError};
 
-use super::{context::ImeContext, input_method::PotentialInputMethods};
+use super::input_method::PotentialInputMethods;
+use super::context::ImeContext;
 
 pub unsafe fn close_im(xconn: &Arc<XConnection>, im: ffi::XIM) -> Result<(), XError> {
     (xconn.xlib.XCloseIM)(im);
@@ -29,7 +33,10 @@ pub struct ImeInner {
 }
 
 impl ImeInner {
-    pub fn new(xconn: Arc<XConnection>, potential_input_methods: PotentialInputMethods) -> Self {
+    pub fn new(
+        xconn: Arc<XConnection>,
+        potential_input_methods: PotentialInputMethods,
+    ) -> Self {
         ImeInner {
             xconn,
             im: ptr::null_mut(),

src/platform/linux/x11/ime/input_method.rs

@@ -1,11 +1,9 @@
-use std::{
-    env,
-    ffi::{CStr, CString, IntoStringError},
-    fmt,
-    os::raw::c_char,
-    ptr,
-    sync::Arc,
-};
+use std::env;
+use std::fmt;
+use std::ptr;
+use std::sync::Arc;
+use std::os::raw::c_char;
+use std::ffi::{CStr, CString, IntoStringError};
 
 use parking_lot::Mutex;
 
@@ -15,7 +13,10 @@ lazy_static! {
     static ref GLOBAL_LOCK: Mutex<()> = Default::default();
 }
 
-unsafe fn open_im(xconn: &Arc<XConnection>, locale_modifiers: &CStr) -> Option<ffi::XIM> {
+unsafe fn open_im(
+    xconn: &Arc<XConnection>,
+    locale_modifiers: &CStr,
+) -> Option<ffi::XIM> {
     let _lock = GLOBAL_LOCK.lock();
 
     // XSetLocaleModifiers returns...
@@ -96,9 +97,11 @@ unsafe fn get_xim_servers(xconn: &Arc<XConnection>) -> Result<Vec<String>, GetXi
 
     let root = (xconn.xlib.XDefaultRootWindow)(xconn.display);
 
-    let mut atoms: Vec<ffi::Atom> = xconn
-        .get_property(root, servers_atom, ffi::XA_ATOM)
-        .map_err(GetXimServersError::GetPropertyError)?;
+    let mut atoms: Vec<ffi::Atom> = xconn.get_property(
+        root,
+        servers_atom,
+        ffi::XA_ATOM,
+    ).map_err(GetXimServersError::GetPropertyError)?;
 
     let mut names: Vec<*const c_char> = Vec::with_capacity(atoms.len());
     (xconn.xlib.XGetAtomNames)(
@@ -132,12 +135,15 @@ impl InputMethodName {
     pub fn from_string(string: String) -> Self {
         let c_string = CString::new(string.clone())
             .expect("String used to construct CString contained null byte");
-        InputMethodName { c_string, string }
+        InputMethodName {
+            c_string,
+            string,
+        }
     }
 
     pub fn from_str(string: &str) -> Self {
-        let c_string =
-            CString::new(string).expect("String used to construct CString contained null byte");
+        let c_string = CString::new(string)
+            .expect("String used to construct CString contained null byte");
         InputMethodName {
             c_string,
             string: string.to_owned(),
@@ -146,7 +152,7 @@ impl InputMethodName {
 }
 
 impl fmt::Debug for InputMethodName {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.string.fmt(f)
     }
 }
@@ -248,7 +254,7 @@ impl PotentialInputMethods {
     pub fn open_im(
         &mut self,
         xconn: &Arc<XConnection>,
-        callback: Option<&dyn Fn() -> ()>,
+        callback: Option<&Fn() -> ()>,
     ) -> InputMethodResult {
         use self::InputMethodResult::*;
 

src/platform/linux/x11/ime/mod.rs

@@ -1,24 +1,19 @@
 // Important: all XIM calls need to happen from the same thread!
 
-mod callbacks;
-mod context;
 mod inner;
 mod input_method;
+mod context;
+mod callbacks;
 
-use std::sync::{
-    mpsc::{Receiver, Sender},
-    Arc,
-};
+use std::sync::Arc;
+use std::sync::mpsc::{Receiver, Sender};
 
 use super::{ffi, util, XConnection, XError};
 
-pub use self::context::ImeContextCreationError;
-use self::{
-    callbacks::*,
-    context::ImeContext,
-    inner::{close_im, ImeInner},
-    input_method::PotentialInputMethods,
-};
+use self::inner::{close_im, ImeInner};
+use self::input_method::PotentialInputMethods;
+use self::context::{ImeContextCreationError, ImeContext};
+use self::callbacks::*;
 
 pub type ImeReceiver = Receiver<(ffi::Window, i16, i16)>;
 pub type ImeSender = Sender<(ffi::Window, i16, i16)>;
@@ -41,7 +36,10 @@ impl Ime {
         let potential_input_methods = PotentialInputMethods::new(&xconn);
 
         let (mut inner, client_data) = {
-            let mut inner = Box::new(ImeInner::new(xconn, potential_input_methods));
+            let mut inner = Box::new(ImeInner::new(
+                xconn,
+                potential_input_methods,
+            ));
             let inner_ptr = Box::into_raw(inner);
             let client_data = inner_ptr as _;
             let destroy_callback = ffi::XIMCallback {
@@ -55,12 +53,9 @@ impl Ime {
 
         let xconn = Arc::clone(&inner.xconn);
 
-        let input_method = inner.potential_input_methods.open_im(
-            &xconn,
-            Some(&|| {
-                let _ = unsafe { set_instantiate_callback(&xconn, client_data) };
-            }),
-        );
+        let input_method = inner.potential_input_methods.open_im(&xconn, Some(&|| {
+            let _ = unsafe { set_instantiate_callback(&xconn, client_data) };
+        }));
 
         let is_fallback = input_method.is_fallback();
         if let Some(input_method) = input_method.ok() {
@@ -88,12 +83,19 @@ impl Ime {
     // Ok(_) indicates that nothing went wrong internally
     // Ok(true) indicates that the action was actually performed
     // Ok(false) indicates that the action is not presently applicable
-    pub fn create_context(&mut self, window: ffi::Window) -> Result<bool, ImeContextCreationError> {
+    pub fn create_context(&mut self, window: ffi::Window)
+        -> Result<bool, ImeContextCreationError>
+    {
         let context = if self.is_destroyed() {
             // Create empty entry in map, so that when IME is rebuilt, this window has a context.
             None
         } else {
-            Some(unsafe { ImeContext::new(&self.inner.xconn, self.inner.im, window, None) }?)
+            Some(unsafe { ImeContext::new(
+                &self.inner.xconn,
+                self.inner.im,
+                window,
+                None,
+            ) }?)
         };
         self.inner.contexts.insert(window, context);
         Ok(!self.is_destroyed())

src/platform/linux/x11/monitor.rs

@@ -2,16 +2,15 @@ use std::os::raw::*;
 
 use parking_lot::Mutex;
 
-use super::{
-    ffi::{
-        RRCrtcChangeNotifyMask, RROutputPropertyNotifyMask, RRScreenChangeNotifyMask, True, Window,
-        XRRScreenResources,
-    },
-    util, XConnection, XError,
-};
-use crate::{
-    dpi::{PhysicalPosition, PhysicalSize},
-    monitor::VideoMode,
+use {PhysicalPosition, PhysicalSize};
+use super::{util, XConnection, XError};
+use super::ffi::{
+    RRCrtcChangeNotifyMask,
+    RROutputPropertyNotifyMask,
+    RRScreenChangeNotifyMask,
+    True,
+    Window,
+    XRRScreenResources,
 };
 
 // Used to test XRandR < 1.5 code path. This should always be committed as false.
@@ -21,7 +20,7 @@ const DISABLE_MONITOR_LIST_CACHING: bool = false;
 
 lazy_static! {
     static ref XRANDR_VERSION: Mutex<Option<(c_int, c_int)>> = Mutex::default();
-    static ref MONITORS: Mutex<Option<Vec<MonitorHandle>>> = Mutex::default();
+    static ref MONITORS: Mutex<Option<Vec<MonitorId>>> = Mutex::default();
 }
 
 fn version_is_at_least(major: c_int, minor: c_int) -> bool {
@@ -36,13 +35,13 @@ fn version_is_at_least(major: c_int, minor: c_int) -> bool {
     }
 }
 
-pub fn invalidate_cached_monitor_list() -> Option<Vec<MonitorHandle>> {
+pub fn invalidate_cached_monitor_list() -> Option<Vec<MonitorId>> {
     // We update this lazily.
     (*MONITORS.lock()).take()
 }
 
 #[derive(Debug, Clone)]
-pub struct MonitorHandle {
+pub struct MonitorId {
     /// The actual id
     id: u32,
     /// The name of the monitor
@@ -57,11 +56,9 @@ pub struct MonitorHandle {
     pub(crate) hidpi_factor: f64,
     /// Used to determine which windows are on this monitor
     pub(crate) rect: util::AaRect,
-    /// Supported video modes on this monitor
-    video_modes: Vec<VideoMode>,
 }
 
-impl MonitorHandle {
+impl MonitorId {
     fn from_repr(
         xconn: &XConnection,
         resources: *mut XRRScreenResources,
@@ -69,10 +66,10 @@ impl MonitorHandle {
         repr: util::MonitorRepr,
         primary: bool,
     ) -> Option<Self> {
-        let (name, hidpi_factor, video_modes) = unsafe { xconn.get_output_info(resources, &repr)? };
-        let (dimensions, position) = unsafe { (repr.size(), repr.position()) };
+        let (name, hidpi_factor) = unsafe { xconn.get_output_info(resources, &repr)? };
+        let (dimensions, position) = unsafe { (repr.get_dimensions(), repr.get_position()) };
         let rect = util::AaRect::new(position, dimensions);
-        Some(MonitorHandle {
+        Some(MonitorId {
             id,
             name,
             hidpi_factor,
@@ -80,41 +77,35 @@ impl MonitorHandle {
             position,
             primary,
             rect,
-            video_modes,
         })
     }
 
-    pub fn name(&self) -> Option<String> {
+    pub fn get_name(&self) -> Option<String> {
         Some(self.name.clone())
     }
 
     #[inline]
-    pub fn native_identifier(&self) -> u32 {
+    pub fn get_native_identifier(&self) -> u32 {
         self.id as u32
     }
 
-    pub fn size(&self) -> PhysicalSize {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         self.dimensions.into()
     }
 
-    pub fn position(&self) -> PhysicalPosition {
+    pub fn get_position(&self) -> PhysicalPosition {
         self.position.into()
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f64 {
+    pub fn get_hidpi_factor(&self) -> f64 {
         self.hidpi_factor
     }
-
-    #[inline]
-    pub fn video_modes(&self) -> impl Iterator<Item = VideoMode> {
-        self.video_modes.clone().into_iter()
-    }
 }
 
 impl XConnection {
-    pub fn get_monitor_for_window(&self, window_rect: Option<util::AaRect>) -> MonitorHandle {
-        let monitors = self.available_monitors();
+    pub fn get_monitor_for_window(&self, window_rect: Option<util::AaRect>) -> MonitorId {
+        let monitors = self.get_available_monitors();
         let default = monitors
             .get(0)
             .expect("[winit] Failed to find any monitors using XRandR.");
@@ -137,7 +128,7 @@ impl XConnection {
         matched_monitor.to_owned()
     }
 
-    fn query_monitor_list(&self) -> Vec<MonitorHandle> {
+    fn query_monitor_list(&self) -> Vec<MonitorId> {
         unsafe {
             let root = (self.xlib.XDefaultRootWindow)(self.display);
             let resources = if version_is_at_least(1, 3) {
@@ -160,22 +151,20 @@ impl XConnection {
                 // videowalls.
                 let xrandr_1_5 = self.xrandr_1_5.as_ref().unwrap();
                 let mut monitor_count = 0;
-                let monitors =
-                    (xrandr_1_5.XRRGetMonitors)(self.display, root, 1, &mut monitor_count);
+                let monitors = (xrandr_1_5.XRRGetMonitors)(self.display, root, 1, &mut monitor_count);
                 assert!(monitor_count >= 0);
                 available = Vec::with_capacity(monitor_count as usize);
                 for monitor_index in 0..monitor_count {
                     let monitor = monitors.offset(monitor_index as isize);
                     let is_primary = (*monitor).primary != 0;
                     has_primary |= is_primary;
-                    MonitorHandle::from_repr(
+                    MonitorId::from_repr(
                         self,
                         resources,
                         monitor_index as u32,
                         monitor.into(),
                         is_primary,
-                    )
-                    .map(|monitor_id| available.push(monitor_id));
+                    ).map(|monitor_id| available.push(monitor_id));
                 }
                 (xrandr_1_5.XRRFreeMonitors)(monitors);
             } else {
@@ -192,8 +181,13 @@ impl XConnection {
                         let crtc = util::MonitorRepr::from(crtc);
                         let is_primary = crtc.get_output() == primary;
                         has_primary |= is_primary;
-                        MonitorHandle::from_repr(self, resources, crtc_id as u32, crtc, is_primary)
-                            .map(|monitor_id| available.push(monitor_id));
+                        MonitorId::from_repr(
+                            self,
+                            resources,
+                            crtc_id as u32,
+                            crtc,
+                            is_primary,
+                        ).map(|monitor_id| available.push(monitor_id));
                     }
                     (self.xrandr.XRRFreeCrtcInfo)(crtc);
                 }
@@ -212,7 +206,7 @@ impl XConnection {
         }
     }
 
-    pub fn available_monitors(&self) -> Vec<MonitorHandle> {
+    pub fn get_available_monitors(&self) -> Vec<MonitorId> {
         let mut monitors_lock = MONITORS.lock();
         (*monitors_lock)
             .as_ref()
@@ -228,8 +222,8 @@ impl XConnection {
     }
 
     #[inline]
-    pub fn primary_monitor(&self) -> MonitorHandle {
-        self.available_monitors()
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        self.get_available_monitors()
             .into_iter()
             .find(|monitor| monitor.primary)
             .expect("[winit] Failed to find any monitors using XRandR.")
@@ -241,8 +235,13 @@ impl XConnection {
             if version_lock.is_none() {
                 let mut major = 0;
                 let mut minor = 0;
-                let has_extension =
-                    unsafe { (self.xrandr.XRRQueryVersion)(self.display, &mut major, &mut minor) };
+                let has_extension = unsafe {
+                    (self.xrandr.XRRQueryVersion)(
+                        self.display,
+                        &mut major,
+                        &mut minor,
+                    )
+                };
                 if has_extension != True {
                     panic!("[winit] XRandR extension not available.");
                 }
@@ -253,7 +252,11 @@ impl XConnection {
         let mut event_offset = 0;
         let mut error_offset = 0;
         let status = unsafe {
-            (self.xrandr.XRRQueryExtension)(self.display, &mut event_offset, &mut error_offset)
+            (self.xrandr.XRRQueryExtension)(
+                self.display,
+                &mut event_offset,
+                &mut error_offset,
+            )
         };
 
         if status != True {
@@ -261,7 +264,9 @@ impl XConnection {
             unreachable!("[winit] `XRRQueryExtension` failed but no error was received.");
         }
 
-        let mask = RRCrtcChangeNotifyMask | RROutputPropertyNotifyMask | RRScreenChangeNotifyMask;
+        let mask = RRCrtcChangeNotifyMask
+            | RROutputPropertyNotifyMask
+            | RRScreenChangeNotifyMask;
         unsafe { (self.xrandr.XRRSelectInput)(self.display, root, mask) };
 
         Ok(event_offset)

src/platform/linux/x11/util/atom.rs

@@ -1,9 +1,7 @@
-use std::{
-    collections::HashMap,
-    ffi::{CStr, CString},
-    fmt::Debug,
-    os::raw::*,
-};
+use std::collections::HashMap;
+use std::ffi::{CStr, CString};
+use std::fmt::Debug;
+use std::os::raw::*;
 
 use parking_lot::Mutex;
 
@@ -23,9 +21,11 @@ impl XConnection {
         if let Some(atom) = cached_atom {
             atom
         } else {
-            let atom = unsafe {
-                (self.xlib.XInternAtom)(self.display, name.as_ptr() as *const c_char, ffi::False)
-            };
+            let atom = unsafe { (self.xlib.XInternAtom)(
+                self.display,
+                name.as_ptr() as *const c_char,
+                ffi::False,
+            ) };
             if atom == 0 {
                 let msg = format!(
                     "`XInternAtom` failed, which really shouldn't happen. Atom: {:?}, Error: {:#?}",
@@ -52,7 +52,7 @@ impl XConnection {
 
     // Note: this doesn't use caching, for the sake of simplicity.
     // If you're dealing with this many atoms, you'll usually want to cache them locally anyway.
-    pub unsafe fn get_atoms(&self, names: &[*mut c_char]) -> Result<Vec<ffi::Atom>, XError> {
+    pub unsafe fn get_atoms(&self,  names: &[*mut c_char]) -> Result<Vec<ffi::Atom>, XError> {
         let mut atoms = Vec::with_capacity(names.len());
         (self.xlib.XInternAtoms)(
             self.display,

src/platform/linux/x11/util/client_msg.rs

@@ -8,7 +8,7 @@ impl XConnection {
         target_window: c_ulong,
         event_mask: Option<c_long>,
         event: T,
-    ) -> Flusher<'_> {
+    ) -> Flusher {
         let event_mask = event_mask.unwrap_or(ffi::NoEventMask);
         unsafe {
             (self.xlib.XSendEvent)(
@@ -24,12 +24,12 @@ impl XConnection {
 
     pub fn send_client_msg(
         &self,
-        window: c_ulong, // The window this is "about"; not necessarily this window
+        window: c_ulong,        // The window this is "about"; not necessarily this window
         target_window: c_ulong, // The window we're sending to
         message_type: ffi::Atom,
         event_mask: Option<c_long>,
         data: ClientMsgPayload,
-    ) -> Flusher<'_> {
+    ) -> Flusher {
         let mut event: ffi::XClientMessageEvent = unsafe { mem::uninitialized() };
         event.type_ = ffi::ClientMessage;
         event.display = self.display;
@@ -45,12 +45,12 @@ impl XConnection {
     // to send more than one message worth of data.
     pub fn send_client_msg_multi<T: Formattable>(
         &self,
-        window: c_ulong, // The window this is "about"; not necessarily this window
+        window: c_ulong,        // The window this is "about"; not necessarily this window
         target_window: c_ulong, // The window we're sending to
         message_type: ffi::Atom,
         event_mask: Option<c_long>,
         data: &[T],
-    ) -> Flusher<'_> {
+    ) -> Flusher {
         let format = T::FORMAT;
         let size_of_t = mem::size_of::<T>();
         debug_assert_eq!(size_of_t, format.get_actual_size());

src/platform/linux/x11/util/format.rs

@@ -1,4 +1,6 @@
-use std::{fmt::Debug, mem, os::raw::*};
+use std::fmt::Debug;
+use std::mem;
+use std::os::raw::*;
 
 // This isn't actually the number of the bits in the format.
 // X11 does a match on this value to determine which type to call sizeof on.
@@ -48,21 +50,9 @@ pub trait Formattable: Debug + Clone + Copy + PartialEq + PartialOrd {
 }
 
 // You might be surprised by the absence of c_int, but not as surprised as X11 would be by the presence of it.
-impl Formattable for c_schar {
-    const FORMAT: Format = Format::Char;
-}
-impl Formattable for c_uchar {
-    const FORMAT: Format = Format::Char;
-}
-impl Formattable for c_short {
-    const FORMAT: Format = Format::Short;
-}
-impl Formattable for c_ushort {
-    const FORMAT: Format = Format::Short;
-}
-impl Formattable for c_long {
-    const FORMAT: Format = Format::Long;
-}
-impl Formattable for c_ulong {
-    const FORMAT: Format = Format::Long;
-}
+impl Formattable for c_schar { const FORMAT: Format = Format::Char; }
+impl Formattable for c_uchar { const FORMAT: Format = Format::Char; }
+impl Formattable for c_short { const FORMAT: Format = Format::Short; }
+impl Formattable for c_ushort { const FORMAT: Format = Format::Short; }
+impl Formattable for c_long { const FORMAT: Format = Format::Long; }
+impl Formattable for c_ulong { const FORMAT: Format = Format::Long; }

src/platform/linux/x11/util/geometry.rs

@@ -1,7 +1,7 @@
 use std::cmp;
 
 use super::*;
-use crate::dpi::{LogicalPosition, LogicalSize};
+use {LogicalPosition, LogicalSize};
 
 // Friendly neighborhood axis-aligned rectangle
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -16,12 +16,7 @@ impl AaRect {
     pub fn new((x, y): (i32, i32), (width, height): (u32, u32)) -> Self {
         let (x, y) = (x as i64, y as i64);
         let (width, height) = (width as i64, height as i64);
-        AaRect {
-            x,
-            y,
-            width,
-            height,
-        }
+        AaRect { x, y, width, height }
     }
 
     pub fn contains_point(&self, x: i64, y: i64) -> bool {
@@ -78,12 +73,7 @@ pub struct FrameExtents {
 
 impl FrameExtents {
     pub fn new(left: c_ulong, right: c_ulong, top: c_ulong, bottom: c_ulong) -> Self {
-        FrameExtents {
-            left,
-            right,
-            top,
-            bottom,
-        }
+        FrameExtents { left, right, top, bottom }
     }
 
     pub fn from_border(border: c_ulong) -> Self {
@@ -126,20 +116,13 @@ impl FrameExtentsHeuristic {
     pub fn inner_pos_to_outer(&self, x: i32, y: i32) -> (i32, i32) {
         use self::FrameExtentsHeuristicPath::*;
         if self.heuristic_path != UnsupportedBordered {
-            (
-                x - self.frame_extents.left as i32,
-                y - self.frame_extents.top as i32,
-            )
+            (x - self.frame_extents.left as i32, y - self.frame_extents.top as i32)
         } else {
             (x, y)
         }
     }
 
-    pub fn inner_pos_to_outer_logical(
-        &self,
-        mut logical: LogicalPosition,
-        factor: f64,
-    ) -> LogicalPosition {
+    pub fn inner_pos_to_outer_logical(&self, mut logical: LogicalPosition, factor: f64) -> LogicalPosition {
         use self::FrameExtentsHeuristicPath::*;
         if self.heuristic_path != UnsupportedBordered {
             let frame_extents = self.frame_extents.as_logical(factor);
@@ -152,23 +135,15 @@ impl FrameExtentsHeuristic {
     pub fn inner_size_to_outer(&self, width: u32, height: u32) -> (u32, u32) {
         (
             width.saturating_add(
-                self.frame_extents
-                    .left
-                    .saturating_add(self.frame_extents.right) as u32,
+                self.frame_extents.left.saturating_add(self.frame_extents.right) as u32
             ),
             height.saturating_add(
-                self.frame_extents
-                    .top
-                    .saturating_add(self.frame_extents.bottom) as u32,
+                self.frame_extents.top.saturating_add(self.frame_extents.bottom) as u32
             ),
         )
     }
 
-    pub fn inner_size_to_outer_logical(
-        &self,
-        mut logical: LogicalSize,
-        factor: f64,
-    ) -> LogicalSize {
+    pub fn inner_size_to_outer_logical(&self, mut logical: LogicalSize, factor: f64) -> LogicalSize {
         let frame_extents = self.frame_extents.as_logical(factor);
         logical.width += frame_extents.left + frame_extents.right;
         logical.height += frame_extents.top + frame_extents.bottom;
@@ -177,12 +152,8 @@ impl FrameExtentsHeuristic {
 }
 
 impl XConnection {
-    // This is adequate for inner_position
-    pub fn translate_coords(
-        &self,
-        window: ffi::Window,
-        root: ffi::Window,
-    ) -> Result<TranslatedCoords, XError> {
+    // This is adequate for get_inner_position
+    pub fn translate_coords(&self, window: ffi::Window, root: ffi::Window) -> Result<TranslatedCoords, XError> {
         let mut translated_coords: TranslatedCoords = unsafe { mem::uninitialized() };
         unsafe {
             (self.xlib.XTranslateCoordinates)(
@@ -200,7 +171,7 @@ impl XConnection {
         self.check_errors().map(|_| translated_coords)
     }
 
-    // This is adequate for inner_size
+    // This is adequate for get_inner_size
     pub fn get_geometry(&self, window: ffi::Window) -> Result<Geometry, XError> {
         let mut geometry: Geometry = unsafe { mem::uninitialized() };
         let _status = unsafe {
@@ -230,9 +201,11 @@ impl XConnection {
         // Of the WMs tested, xmonad, i3, dwm, IceWM (1.3.x and earlier), and blackbox don't
         // support this. As this is part of EWMH (Extended Window Manager Hints), it's likely to
         // be unsupported by many smaller WMs.
-        let extents: Option<Vec<c_ulong>> = self
-            .get_property(window, extents_atom, ffi::XA_CARDINAL)
-            .ok();
+        let extents: Option<Vec<c_ulong>> = self.get_property(
+            window,
+            extents_atom,
+            ffi::XA_CARDINAL,
+        ).ok();
 
         extents.and_then(|extents| {
             if extents.len() >= 4 {
@@ -255,9 +228,11 @@ impl XConnection {
             return None;
         }
 
-        let client_list: Option<Vec<ffi::Window>> = self
-            .get_property(root, client_list_atom, ffi::XA_WINDOW)
-            .ok();
+        let client_list: Option<Vec<ffi::Window>> = self.get_property(
+            root,
+            client_list_atom,
+            ffi::XA_WINDOW,
+        ).ok();
 
         client_list.map(|client_list| client_list.contains(&window))
     }
@@ -289,11 +264,7 @@ impl XConnection {
         self.check_errors().map(|_| parent)
     }
 
-    fn climb_hierarchy(
-        &self,
-        window: ffi::Window,
-        root: ffi::Window,
-    ) -> Result<ffi::Window, XError> {
+    fn climb_hierarchy(&self, window: ffi::Window, root: ffi::Window) -> Result<ffi::Window, XError> {
         let mut outer_window = window;
         loop {
             let candidate = self.get_parent_window(outer_window)?;
@@ -305,11 +276,7 @@ impl XConnection {
         Ok(outer_window)
     }
 
-    pub fn get_frame_extents_heuristic(
-        &self,
-        window: ffi::Window,
-        root: ffi::Window,
-    ) -> FrameExtentsHeuristic {
+    pub fn get_frame_extents_heuristic(&self, window: ffi::Window, root: ffi::Window) -> FrameExtentsHeuristic {
         use self::FrameExtentsHeuristicPath::*;
 
         // Position relative to root window.
@@ -317,16 +284,15 @@ impl XConnection {
         // isn't nested are outlined in the comments throghout this function, but in addition to
         // that, fullscreen windows often aren't nested.
         let (inner_y_rel_root, child) = {
-            let coords = self
-                .translate_coords(window, root)
-                .expect("Failed to translate window coordinates");
-            (coords.y_rel_root, coords.child)
+            let coords = self.translate_coords(window, root).expect("Failed to translate window coordinates");
+            (
+                coords.y_rel_root,
+                coords.child,
+            )
         };
 
         let (width, height, border) = {
-            let inner_geometry = self
-                .get_geometry(window)
-                .expect("Failed to get inner window geometry");
+            let inner_geometry = self.get_geometry(window).expect("Failed to get inner window geometry");
             (
                 inner_geometry.width,
                 inner_geometry.height,
@@ -377,13 +343,9 @@ impl XConnection {
             // If the position value we have is for a nested window used as the client area, we'll
             // just climb up the hierarchy and get the geometry of the outermost window we're
             // nested in.
-            let outer_window = self
-                .climb_hierarchy(window, root)
-                .expect("Failed to climb window hierarchy");
+            let outer_window = self.climb_hierarchy(window, root).expect("Failed to climb window hierarchy");
             let (outer_y, outer_width, outer_height) = {
-                let outer_geometry = self
-                    .get_geometry(outer_window)
-                    .expect("Failed to get outer window geometry");
+                let outer_geometry = self.get_geometry(outer_window).expect("Failed to get outer window geometry");
                 (
                     outer_geometry.y_rel_parent,
                     outer_geometry.width,
@@ -402,8 +364,12 @@ impl XConnection {
             let top = offset_y;
             let bottom = diff_y.saturating_sub(offset_y);
 
-            let frame_extents =
-                FrameExtents::new(left.into(), right.into(), top.into(), bottom.into());
+            let frame_extents = FrameExtents::new(
+                left.into(),
+                right.into(),
+                top.into(),
+                bottom.into(),
+            );
             FrameExtentsHeuristic {
                 frame_extents,
                 heuristic_path: UnsupportedNested,

src/platform/linux/x11/util/hint.rs

@@ -99,9 +99,7 @@ pub struct NormalHints<'a> {
 
 impl<'a> NormalHints<'a> {
     pub fn new(xconn: &'a XConnection) -> Self {
-        NormalHints {
-            size_hints: xconn.alloc_size_hints(),
-        }
+        NormalHints { size_hints: xconn.alloc_size_hints() }
     }
 
     pub fn has_flag(&self, flag: c_long) -> bool {
@@ -132,11 +130,7 @@ impl<'a> NormalHints<'a> {
     }
 
     pub fn get_max_size(&self) -> Option<(u32, u32)> {
-        self.getter(
-            ffi::PMaxSize,
-            &self.size_hints.max_width,
-            &self.size_hints.max_height,
-        )
+        self.getter(ffi::PMaxSize, &self.size_hints.max_width, &self.size_hints.max_height)
     }
 
     pub fn set_max_size(&mut self, max_size: Option<(u32, u32)>) {
@@ -150,11 +144,7 @@ impl<'a> NormalHints<'a> {
     }
 
     pub fn get_min_size(&self) -> Option<(u32, u32)> {
-        self.getter(
-            ffi::PMinSize,
-            &self.size_hints.min_width,
-            &self.size_hints.min_height,
-        )
+        self.getter(ffi::PMinSize, &self.size_hints.min_width, &self.size_hints.min_height)
     }
 
     pub fn set_min_size(&mut self, min_size: Option<(u32, u32)>) {
@@ -168,11 +158,7 @@ impl<'a> NormalHints<'a> {
     }
 
     pub fn get_resize_increments(&self) -> Option<(u32, u32)> {
-        self.getter(
-            ffi::PResizeInc,
-            &self.size_hints.width_inc,
-            &self.size_hints.height_inc,
-        )
+        self.getter(ffi::PResizeInc, &self.size_hints.width_inc, &self.size_hints.height_inc)
     }
 
     pub fn set_resize_increments(&mut self, resize_increments: Option<(u32, u32)>) {
@@ -186,11 +172,7 @@ impl<'a> NormalHints<'a> {
     }
 
     pub fn get_base_size(&self) -> Option<(u32, u32)> {
-        self.getter(
-            ffi::PBaseSize,
-            &self.size_hints.base_width,
-            &self.size_hints.base_height,
-        )
+        self.getter(ffi::PBaseSize, &self.size_hints.base_width, &self.size_hints.base_height)
     }
 
     pub fn set_base_size(&mut self, base_size: Option<(u32, u32)>) {
@@ -205,10 +187,7 @@ impl<'a> NormalHints<'a> {
 }
 
 impl XConnection {
-    pub fn get_wm_hints(
-        &self,
-        window: ffi::Window,
-    ) -> Result<XSmartPointer<'_, ffi::XWMHints>, XError> {
+    pub fn get_wm_hints(&self, window: ffi::Window) -> Result<XSmartPointer<ffi::XWMHints>, XError> {
         let wm_hints = unsafe { (self.xlib.XGetWMHints)(self.display, window) };
         self.check_errors()?;
         let wm_hints = if wm_hints.is_null() {
@@ -219,18 +198,18 @@ impl XConnection {
         Ok(wm_hints)
     }
 
-    pub fn set_wm_hints(
-        &self,
-        window: ffi::Window,
-        wm_hints: XSmartPointer<'_, ffi::XWMHints>,
-    ) -> Flusher<'_> {
+    pub fn set_wm_hints(&self, window: ffi::Window, wm_hints: XSmartPointer<ffi::XWMHints>) -> Flusher {
         unsafe {
-            (self.xlib.XSetWMHints)(self.display, window, wm_hints.ptr);
+            (self.xlib.XSetWMHints)(
+                self.display,
+                window,
+                wm_hints.ptr,
+            );
         }
         Flusher::new(self)
     }
 
-    pub fn get_normal_hints(&self, window: ffi::Window) -> Result<NormalHints<'_>, XError> {
+    pub fn get_normal_hints(&self, window: ffi::Window) -> Result<NormalHints, XError> {
         let size_hints = self.alloc_size_hints();
         let mut supplied_by_user: c_long = unsafe { mem::uninitialized() };
         unsafe {
@@ -244,13 +223,13 @@ impl XConnection {
         self.check_errors().map(|_| NormalHints { size_hints })
     }
 
-    pub fn set_normal_hints(
-        &self,
-        window: ffi::Window,
-        normal_hints: NormalHints<'_>,
-    ) -> Flusher<'_> {
+    pub fn set_normal_hints(&self, window: ffi::Window, normal_hints: NormalHints) -> Flusher {
         unsafe {
-            (self.xlib.XSetWMNormalHints)(self.display, window, normal_hints.size_hints.ptr);
+            (self.xlib.XSetWMNormalHints)(
+                self.display,
+                window,
+                normal_hints.size_hints.ptr,
+            );
         }
         Flusher::new(self)
     }

src/platform/linux/x11/util/icon.rs

@@ -1,5 +1,5 @@
+use {Icon, Pixel, PIXEL_SIZE};
 use super::*;
-use crate::window::{Icon, Pixel, PIXEL_SIZE};
 
 impl Pixel {
     pub fn to_packed_argb(&self) -> Cardinal {

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

@@ -1,7 +1,7 @@
 use std::str;
 
 use super::*;
-use crate::event::ModifiersState;
+use events::ModifiersState;
 
 pub const VIRTUAL_CORE_POINTER: c_int = 2;
 pub const VIRTUAL_CORE_KEYBOARD: c_int = 3;
@@ -55,12 +55,7 @@ impl<'a> Drop for PointerState<'a> {
 }
 
 impl XConnection {
-    pub fn select_xinput_events(
-        &self,
-        window: c_ulong,
-        device_id: c_int,
-        mask: i32,
-    ) -> Flusher<'_> {
+    pub fn select_xinput_events(&self, window: c_ulong, device_id: c_int, mask: i32) -> Flusher {
         let mut event_mask = ffi::XIEventMask {
             deviceid: device_id,
             mask: &mask as *const _ as *mut c_uchar,
@@ -78,8 +73,15 @@ impl XConnection {
     }
 
     #[allow(dead_code)]
-    pub fn select_xkb_events(&self, device_id: c_uint, mask: c_ulong) -> Option<Flusher<'_>> {
-        let status = unsafe { (self.xlib.XkbSelectEvents)(self.display, device_id, mask, mask) };
+    pub fn select_xkb_events(&self, device_id: c_uint, mask: c_ulong) -> Option<Flusher> {
+        let status = unsafe {
+            (self.xlib.XkbSelectEvents)(
+                self.display,
+                device_id,
+                mask,
+                mask,
+            )
+        };
         if status == ffi::True {
             Some(Flusher::new(self))
         } else {
@@ -87,13 +89,9 @@ impl XConnection {
         }
     }
 
-    pub fn query_pointer(
-        &self,
-        window: ffi::Window,
-        device_id: c_int,
-    ) -> Result<PointerState<'_>, XError> {
+    pub fn query_pointer(&self, window: ffi::Window, device_id: c_int) -> Result<PointerState, XError> {
         unsafe {
-            let mut pointer_state: PointerState<'_> = mem::uninitialized();
+            let mut pointer_state: PointerState = mem::uninitialized();
             pointer_state.xconn = self;
             pointer_state.relative_to_window = (self.xinput2.XIQueryPointer)(
                 self.display,

src/platform/linux/x11/util/memory.rs

@@ -12,7 +12,10 @@ impl<'a, T> XSmartPointer<'a, T> {
     // Returns None if ptr is null.
     pub fn new(xconn: &'a XConnection, ptr: *mut T) -> Option<Self> {
         if !ptr.is_null() {
-            Some(XSmartPointer { xconn, ptr })
+            Some(XSmartPointer {
+                xconn,
+                ptr,
+            })
         } else {
             None
         }
@@ -42,17 +45,17 @@ impl<'a, T> Drop for XSmartPointer<'a, T> {
 }
 
 impl XConnection {
-    pub fn alloc_class_hint(&self) -> XSmartPointer<'_, ffi::XClassHint> {
+    pub fn alloc_class_hint(&self) -> XSmartPointer<ffi::XClassHint> {
         XSmartPointer::new(self, unsafe { (self.xlib.XAllocClassHint)() })
             .expect("`XAllocClassHint` returned null; out of memory")
     }
 
-    pub fn alloc_size_hints(&self) -> XSmartPointer<'_, ffi::XSizeHints> {
+    pub fn alloc_size_hints(&self) -> XSmartPointer<ffi::XSizeHints> {
         XSmartPointer::new(self, unsafe { (self.xlib.XAllocSizeHints)() })
             .expect("`XAllocSizeHints` returned null; out of memory")
     }
 
-    pub fn alloc_wm_hints(&self) -> XSmartPointer<'_, ffi::XWMHints> {
+    pub fn alloc_wm_hints(&self) -> XSmartPointer<ffi::XWMHints> {
         XSmartPointer::new(self, unsafe { (self.xlib.XAllocWMHints)() })
             .expect("`XAllocWMHints` returned null; out of memory")
     }

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

@@ -13,12 +13,22 @@ mod randr;
 mod window_property;
 mod wm;
 
-pub use self::{
-    atom::*, client_msg::*, format::*, geometry::*, hint::*, icon::*, input::*, memory::*,
-    randr::*, window_property::*, wm::*,
-};
+pub use self::atom::*;
+pub use self::client_msg::*;
+pub use self::format::*;
+pub use self::geometry::*;
+pub use self::hint::*;
+pub use self::icon::*;
+pub use self::input::*;
+pub use self::memory::*;
+pub use self::randr::*;
+pub use self::window_property::*;
+pub use self::wm::*;
 
-use std::{mem, ops::BitAnd, os::raw::*, ptr};
+use std::mem;
+use std::ptr;
+use std::ops::BitAnd;
+use std::os::raw::*;
 
 use super::{ffi, XConnection, XError};
 
@@ -38,8 +48,8 @@ pub fn maybe_change<T: PartialEq>(field: &mut Option<T>, value: T) -> bool {
 }
 
 pub fn has_flag<T>(bitset: T, flag: T) -> bool
-where
-    T: Copy + PartialEq + BitAnd<T, Output = T>,
+where T:
+    Copy + PartialEq + BitAnd<T, Output = T>
 {
     bitset & flag == flag
 }

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

@@ -1,7 +1,8 @@
-use std::{env, slice, str::FromStr};
+use std::{env, slice};
+use std::str::FromStr;
 
+use validate_hidpi_factor;
 use super::*;
-use crate::{dpi::validate_hidpi_factor, monitor::VideoMode};
 
 pub fn calc_dpi_factor(
     (width_px, height_px): (u32, u32),
@@ -22,12 +23,14 @@ pub fn calc_dpi_factor(
     }
 
     // See http://xpra.org/trac/ticket/728 for more information.
-    if width_mm == 0 || width_mm == 0 {
+    if width_mm == 0 || height_mm == 0 {
         warn!("XRandR reported that the display's 0mm in size, which is certifiably insane");
         return 1.0;
     }
 
-    let ppmm = ((width_px as f64 * height_px as f64) / (width_mm as f64 * height_mm as f64)).sqrt();
+    let ppmm = (
+        (width_px as f64 * height_px as f64) / (width_mm as f64 * height_mm as f64)
+    ).sqrt();
     // Quantize 1/12 step size
     let dpi_factor = ((ppmm * (12.0 * 25.4 / 96.0)).round() / 12.0).max(1.0);
     assert!(validate_hidpi_factor(dpi_factor));
@@ -48,14 +51,14 @@ impl MonitorRepr {
         }
     }
 
-    pub unsafe fn size(&self) -> (u32, u32) {
+    pub unsafe fn get_dimensions(&self) -> (u32, u32) {
         match *self {
             MonitorRepr::Monitor(monitor) => ((*monitor).width as u32, (*monitor).height as u32),
             MonitorRepr::Crtc(crtc) => ((*crtc).width as u32, (*crtc).height as u32),
         }
     }
 
-    pub unsafe fn position(&self) -> (i32, i32) {
+    pub unsafe fn get_position(&self) -> (i32, i32) {
         match *self {
             MonitorRepr::Monitor(monitor) => ((*monitor).x as i32, (*monitor).y as i32),
             MonitorRepr::Crtc(crtc) => ((*crtc).x as i32, (*crtc).y as i32),
@@ -84,7 +87,7 @@ impl XConnection {
             return None;
         }
         if let Ok(res) = ::std::ffi::CStr::from_ptr(resource_manager_str).to_str() {
-            let name: &str = "Xft.dpi:\t";
+            let name : &str = "Xft.dpi:\t";
             for pair in res.split("\n") {
                 if pair.starts_with(&name) {
                     let res = &pair[name.len()..];
@@ -98,9 +101,12 @@ impl XConnection {
         &self,
         resources: *mut ffi::XRRScreenResources,
         repr: &MonitorRepr,
-    ) -> Option<(String, f64, Vec<VideoMode>)> {
-        let output_info =
-            (self.xrandr.XRRGetOutputInfo)(self.display, resources, repr.get_output());
+    ) -> Option<(String, f64)> {
+        let output_info = (self.xrandr.XRRGetOutputInfo)(
+            self.display,
+            resources,
+            repr.get_output(),
+        );
         if output_info.is_null() {
             // When calling `XRRGetOutputInfo` on a virtual monitor (versus a physical display)
             // it's possible for it to return null.
@@ -108,33 +114,6 @@ impl XConnection {
             let _ = self.check_errors(); // discard `BadRROutput` error
             return None;
         }
-
-        let screen = (self.xlib.XDefaultScreen)(self.display);
-        let bit_depth = (self.xlib.XDefaultDepth)(self.display, screen);
-
-        let output_modes =
-            slice::from_raw_parts((*output_info).modes, (*output_info).nmode as usize);
-        let resource_modes = slice::from_raw_parts((*resources).modes, (*resources).nmode as usize);
-
-        let modes = resource_modes
-            .iter()
-            // XRROutputInfo contains an array of mode ids that correspond to
-            // modes in the array in XRRScreenResources
-            .filter(|x| output_modes.iter().any(|id| x.id == *id))
-            .map(|x| {
-                let refresh_rate = if x.dotClock > 0 && x.hTotal > 0 && x.vTotal > 0 {
-                    x.dotClock as u64 * 1000 / (x.hTotal as u64 * x.vTotal as u64)
-                } else {
-                    0
-                };
-
-                VideoMode {
-                    size: (x.width, x.height),
-                    refresh_rate: (refresh_rate as f32 / 1000.0).round() as u16,
-                    bit_depth: bit_depth as u16,
-                }
-            });
-
         let name_slice = slice::from_raw_parts(
             (*output_info).name as *mut u8,
             (*output_info).nameLen as usize,
@@ -144,15 +123,12 @@ impl XConnection {
             dpi / 96.
         } else {
             calc_dpi_factor(
-                repr.size(),
-                (
-                    (*output_info).mm_width as u64,
-                    (*output_info).mm_height as u64,
-                ),
+                repr.get_dimensions(),
+                ((*output_info).mm_width as u64, (*output_info).mm_height as u64),
             )
         };
 
         (self.xrandr.XRRFreeOutputInfo)(output_info);
-        Some((name, hidpi_factor, modes.collect()))
+        Some((name, hidpi_factor))
     }
 }

src/platform/linux/x11/util/window_property.rs

@@ -1,3 +1,5 @@
+use std;
+
 use super::*;
 
 pub type Cardinal = c_long;
@@ -84,8 +86,10 @@ impl XConnection {
 
                 if !buf.is_null() {
                     offset += PROPERTY_BUFFER_SIZE;
-                    let new_data =
-                        std::slice::from_raw_parts(buf as *mut T, quantity_returned as usize);
+                    let new_data = std::slice::from_raw_parts(
+                        buf as *mut T,
+                        quantity_returned as usize,
+                    );
                     /*println!(
                         "XGetWindowProperty prop:{:?} fmt:{:02} len:{:02} off:{:02} out:{:02}, buf:{:?}",
                         property,

src/platform/linux/x11/util/wm.rs

@@ -28,8 +28,11 @@ impl XConnection {
 
     fn get_supported_hints(&self, root: ffi::Window) -> Vec<ffi::Atom> {
         let supported_atom = unsafe { self.get_atom_unchecked(b"_NET_SUPPORTED\0") };
-        self.get_property(root, supported_atom, ffi::XA_ATOM)
-            .unwrap_or_else(|_| Vec::with_capacity(0))
+        self.get_property(
+            root,
+            supported_atom,
+            ffi::XA_ATOM,
+        ).unwrap_or_else(|_| Vec::with_capacity(0))
     }
 
     fn get_wm_name(&self, root: ffi::Window) -> Option<String> {
@@ -58,9 +61,15 @@ impl XConnection {
         // Querying this property on the root window will give us the ID of a child window created by
         // the WM.
         let root_window_wm_check = {
-            let result = self.get_property(root, check_atom, ffi::XA_WINDOW);
+            let result = self.get_property(
+                root,
+                check_atom,
+                ffi::XA_WINDOW,
+            );
 
-            let wm_check = result.ok().and_then(|wm_check| wm_check.get(0).cloned());
+            let wm_check = result
+                .ok()
+                .and_then(|wm_check| wm_check.get(0).cloned());
 
             if let Some(wm_check) = wm_check {
                 wm_check
@@ -72,9 +81,15 @@ impl XConnection {
         // Querying the same property on the child window we were given, we should get this child
         // window's ID again.
         let child_window_wm_check = {
-            let result = self.get_property(root_window_wm_check, check_atom, ffi::XA_WINDOW);
+            let result = self.get_property(
+                root_window_wm_check,
+                check_atom,
+                ffi::XA_WINDOW,
+            );
 
-            let wm_check = result.ok().and_then(|wm_check| wm_check.get(0).cloned());
+            let wm_check = result
+                .ok()
+                .and_then(|wm_check| wm_check.get(0).cloned());
 
             if let Some(wm_check) = wm_check {
                 wm_check
@@ -92,7 +107,11 @@ impl XConnection {
         let wm_name = {
             let utf8_string_atom = unsafe { self.get_atom_unchecked(b"UTF8_STRING\0") };
 
-            let result = self.get_property(root_window_wm_check, wm_name_atom, utf8_string_atom);
+            let result = self.get_property(
+                root_window_wm_check,
+                wm_name_atom,
+                utf8_string_atom,
+            );
 
             // IceWM requires this. IceWM was also the only WM tested that returns a null-terminated
             // string. For more fun trivia, IceWM is also unique in including version and uname
@@ -107,12 +126,15 @@ impl XConnection {
             };
 
             if no_utf8 {
-                self.get_property(root_window_wm_check, wm_name_atom, ffi::XA_STRING)
+                self.get_property(
+                    root_window_wm_check,
+                    wm_name_atom,
+                    ffi::XA_STRING,
+                )
             } else {
                 result
             }
-        }
-        .ok();
+        }.ok();
 
         wm_name.and_then(|wm_name| String::from_utf8(wm_name).ok())
     }

src/platform/linux/x11/xdisplay.rs

@@ -1,4 +1,7 @@
-use std::{error::Error, fmt, os::raw::c_int, ptr};
+use std::ptr;
+use std::fmt;
+use std::error::Error;
+use std::os::raw::c_int;
 
 use libc;
 use parking_lot::Mutex;
@@ -15,7 +18,6 @@ pub struct XConnection {
     pub xcursor: ffi::Xcursor,
     pub xinput2: ffi::XInput2,
     pub xlib_xcb: ffi::Xlib_xcb,
-    pub xrender: ffi::Xrender,
     pub display: *mut ffi::Display,
     pub x11_fd: c_int,
     pub latest_error: Mutex<Option<XError>>,
@@ -24,8 +26,7 @@ pub struct XConnection {
 unsafe impl Send for XConnection {}
 unsafe impl Sync for XConnection {}
 
-pub type XErrorHandler =
-    Option<unsafe extern "C" fn(*mut ffi::Display, *mut ffi::XErrorEvent) -> libc::c_int>;
+pub type XErrorHandler = Option<unsafe extern fn(*mut ffi::Display, *mut ffi::XErrorEvent) -> libc::c_int>;
 
 impl XConnection {
     pub fn new(error_handler: XErrorHandler) -> Result<XConnection, XNotSupported> {
@@ -36,7 +37,6 @@ impl XConnection {
         let xrandr_1_5 = ffi::Xrandr::open().ok();
         let xinput2 = ffi::XInput2::open()?;
         let xlib_xcb = ffi::Xlib_xcb::open()?;
-        let xrender = ffi::Xrender::open()?;
 
         unsafe { (xlib.XInitThreads)() };
         unsafe { (xlib.XSetErrorHandler)(error_handler) };
@@ -51,7 +51,9 @@ impl XConnection {
         };
 
         // Get X11 socket file descriptor
-        let fd = unsafe { (xlib.XConnectionNumber)(display) };
+        let fd = unsafe {
+            (xlib.XConnectionNumber)(display)
+        };
 
         Ok(XConnection {
             xlib,
@@ -60,7 +62,6 @@ impl XConnection {
             xcursor,
             xinput2,
             xlib_xcb,
-            xrender,
             display,
             x11_fd: fd,
             latest_error: Mutex::new(None),
@@ -86,7 +87,7 @@ impl XConnection {
 }
 
 impl fmt::Debug for XConnection {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.display.fmt(f)
     }
 }
@@ -115,12 +116,9 @@ impl Error for XError {
 }
 
 impl fmt::Display for XError {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            formatter,
-            "X error: {} (code: {}, request code: {}, minor code: {})",
-            self.description, self.error_code, self.request_code, self.minor_code
-        )
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        write!(formatter, "X error: {} (code: {}, request code: {}, minor code: {})",
+               self.description, self.error_code, self.request_code, self.minor_code)
     }
 }
 
@@ -130,7 +128,7 @@ pub enum XNotSupported {
     /// Failed to load one or several shared libraries.
     LibraryOpenError(ffi::OpenError),
     /// Connecting to the X server with `XOpenDisplay` failed.
-    XOpenDisplayFailed, // TODO: add better message
+    XOpenDisplayFailed,     // TODO: add better message
 }
 
 impl From<ffi::OpenError> for XNotSupported {
@@ -150,16 +148,16 @@ impl Error for XNotSupported {
     }
 
     #[inline]
-    fn cause(&self) -> Option<&dyn Error> {
+    fn cause(&self) -> Option<&Error> {
         match *self {
             XNotSupported::LibraryOpenError(ref err) => Some(err),
-            _ => None,
+            _ => None
         }
     }
 }
 
 impl fmt::Display for XNotSupported {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         formatter.write_str(self.description())
     }
 }

src/platform/macos/events_loop.rs

@@ -0,0 +1,812 @@
+use {ControlFlow, EventsLoopClosed};
+use cocoa::{self, appkit, foundation};
+use cocoa::appkit::{NSApplication, NSEvent, NSEventMask, NSEventModifierFlags, NSEventPhase, NSView, NSWindow};
+use events::{self, ElementState, Event, TouchPhase, WindowEvent, DeviceEvent, ModifiersState, KeyboardInput};
+use std::collections::VecDeque;
+use std::sync::{Arc, Mutex, Weak};
+use super::window::Window2;
+use std;
+use std::os::raw::*;
+use super::DeviceId;
+
+pub struct EventsLoop {
+    modifiers: Modifiers,
+    pub shared: Arc<Shared>,
+}
+
+// State shared between the `EventsLoop` and its registered windows.
+pub struct Shared {
+    pub windows: Mutex<Vec<Weak<Window2>>>,
+    pub pending_events: Mutex<VecDeque<Event>>,
+    // The user event callback given via either of the `poll_events` or `run_forever` methods.
+    //
+    // We store the user's callback here so that it may be accessed by each of the window delegate
+    // callbacks (e.g. resize, close, etc) for the duration of a call to either of the
+    // `poll_events` or `run_forever` methods.
+    //
+    // This is *only* `Some` for the duration of a call to either of these methods and will be
+    // `None` otherwise.
+    user_callback: UserCallback,
+}
+
+#[derive(Clone)]
+pub struct Proxy {}
+
+struct Modifiers {
+    shift_pressed: bool,
+    ctrl_pressed: bool,
+    win_pressed: bool,
+    alt_pressed: bool,
+}
+
+// Wrapping the user callback in a type allows us to:
+//
+// - ensure the callback pointer is never accidentally cloned
+// - ensure that only the `EventsLoop` can `store` and `drop` the callback pointer
+// - Share access to the user callback with the NSWindow callbacks.
+pub struct UserCallback {
+    mutex: Mutex<Option<*mut FnMut(Event)>>,
+}
+
+
+impl Shared {
+
+    pub fn new() -> Self {
+        Shared {
+            windows: Mutex::new(Vec::new()),
+            pending_events: Mutex::new(VecDeque::new()),
+            user_callback: UserCallback { mutex: Mutex::new(None) },
+        }
+    }
+
+    fn call_user_callback_with_pending_events(&self) {
+        loop {
+            let event = match self.pending_events.lock().unwrap().pop_front() {
+                Some(event) => event,
+                None => return,
+            };
+            unsafe {
+                self.user_callback.call_with_event(event);
+            }
+        }
+    }
+
+    // Calls the user callback if one exists.
+    //
+    // Otherwise, stores the event in the `pending_events` queue.
+    //
+    // This is necessary for the case when `WindowDelegate` callbacks are triggered during a call
+    // to the user's callback.
+    pub fn call_user_callback_with_event_or_store_in_pending(&self, event: Event) {
+        if self.user_callback.mutex.lock().unwrap().is_some() {
+            unsafe {
+                self.user_callback.call_with_event(event);
+            }
+        } else {
+            self.pending_events.lock().unwrap().push_back(event);
+        }
+    }
+
+    // Removes the window with the given `Id` from the `windows` list.
+    //
+    // This is called in response to `windowWillClose`.
+    pub fn find_and_remove_window(&self, id: super::window::Id) {
+        if let Ok(mut windows) = self.windows.lock() {
+            windows.retain(|w| match w.upgrade() {
+                Some(w) => w.id() != id,
+                None => false,
+            });
+        }
+    }
+
+}
+
+
+impl Modifiers {
+    pub fn new() -> Self {
+        Modifiers {
+            shift_pressed: false,
+            ctrl_pressed: false,
+            win_pressed: false,
+            alt_pressed: false,
+        }
+    }
+}
+
+
+impl UserCallback {
+
+    // Here we store user's `callback` behind the mutex so that they may be safely shared between
+    // each of the window delegates.
+    //
+    // In order to make sure that the pointer is always valid, we must manually guarantee that it
+    // is dropped before the callback itself is dropped. Thus, this should *only* be called at the
+    // beginning of a call to `poll_events` and `run_forever`, both of which *must* drop the
+    // callback at the end of their scope using the `drop` method.
+    fn store<F>(&self, callback: &mut F)
+        where F: FnMut(Event)
+    {
+        let trait_object = callback as &mut FnMut(Event);
+        let trait_object_ptr = trait_object as *const FnMut(Event) as *mut FnMut(Event);
+        *self.mutex.lock().unwrap() = Some(trait_object_ptr);
+    }
+
+    // Emits the given event via the user-given callback.
+    //
+    // This is unsafe as it requires dereferencing the pointer to the user-given callback. We
+    // guarantee this is safe by ensuring the `UserCallback` never lives longer than the user-given
+    // callback.
+    //
+    // Note that the callback may not always be `Some`. This is because some `NSWindowDelegate`
+    // callbacks can be triggered by means other than `NSApp().sendEvent`. For example, if a window
+    // is destroyed or created during a call to the user's callback, the `WindowDelegate` methods
+    // may be called with `windowShouldClose` or `windowDidResignKey`.
+    unsafe fn call_with_event(&self, event: Event) {
+        let callback = match self.mutex.lock().unwrap().take() {
+            Some(callback) => callback,
+            None => return,
+        };
+        (*callback)(event);
+        *self.mutex.lock().unwrap() = Some(callback);
+    }
+
+    // Used to drop the user callback pointer at the end of the `poll_events` and `run_forever`
+    // methods. This is done to enforce our guarantee that the top callback will never live longer
+    // than the call to either `poll_events` or `run_forever` to which it was given.
+    fn drop(&self) {
+        self.mutex.lock().unwrap().take();
+    }
+
+}
+
+
+impl EventsLoop {
+
+    pub fn new() -> Self {
+        // Mark this thread as the main thread of the Cocoa event system.
+        //
+        // This must be done before any worker threads get a chance to call it
+        // (e.g., via `EventsLoopProxy::wakeup()`), causing a wrong thread to be
+        // marked as the main thread.
+        unsafe { appkit::NSApp(); }
+
+        EventsLoop {
+            shared: Arc::new(Shared::new()),
+            modifiers: Modifiers::new(),
+        }
+    }
+
+    pub fn poll_events<F>(&mut self, mut callback: F)
+        where F: FnMut(Event),
+    {
+        unsafe {
+            if !msg_send![class!(NSThread), isMainThread] {
+                panic!("Events can only be polled from the main thread on macOS");
+            }
+        }
+
+        self.shared.user_callback.store(&mut callback);
+
+        // Loop as long as we have pending events to return.
+        loop {
+            unsafe {
+                // First, yield all pending events.
+                self.shared.call_user_callback_with_pending_events();
+
+                let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
+
+                // Poll for the next event, returning `nil` if there are none.
+                let ns_event = appkit::NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
+                    NSEventMask::NSAnyEventMask.bits() | NSEventMask::NSEventMaskPressure.bits(),
+                    foundation::NSDate::distantPast(cocoa::base::nil),
+                    foundation::NSDefaultRunLoopMode,
+                    cocoa::base::YES);
+
+                let event = self.ns_event_to_event(ns_event);
+
+                let _: () = msg_send![pool, release];
+
+                match event {
+                    // Call the user's callback.
+                    Some(event) => self.shared.user_callback.call_with_event(event),
+                    None => break,
+                }
+            }
+        }
+
+        self.shared.user_callback.drop();
+    }
+
+    pub fn run_forever<F>(&mut self, mut callback: F)
+        where F: FnMut(Event) -> ControlFlow
+    {
+        unsafe {
+            if !msg_send![class!(NSThread), isMainThread] {
+                panic!("Events can only be polled from the main thread on macOS");
+            }
+        }
+
+        // Track whether or not control flow has changed.
+        let control_flow = std::cell::Cell::new(ControlFlow::Continue);
+
+        let mut callback = |event| {
+            if let ControlFlow::Break = callback(event) {
+                control_flow.set(ControlFlow::Break);
+            }
+        };
+
+        self.shared.user_callback.store(&mut callback);
+
+        loop {
+            unsafe {
+                // First, yield all pending events.
+                self.shared.call_user_callback_with_pending_events();
+                if let ControlFlow::Break = control_flow.get() {
+                    break;
+                }
+
+                let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
+
+                // Wait for the next event. Note that this function blocks during resize.
+                let ns_event = appkit::NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
+                    NSEventMask::NSAnyEventMask.bits() | NSEventMask::NSEventMaskPressure.bits(),
+                    foundation::NSDate::distantFuture(cocoa::base::nil),
+                    foundation::NSDefaultRunLoopMode,
+                    cocoa::base::YES);
+
+                let maybe_event = self.ns_event_to_event(ns_event);
+
+                // Release the pool before calling the top callback in case the user calls either
+                // `run_forever` or `poll_events` within the callback.
+                let _: () = msg_send![pool, release];
+
+                if let Some(event) = maybe_event {
+                    self.shared.user_callback.call_with_event(event);
+                    if let ControlFlow::Break = control_flow.get() {
+                        break;
+                    }
+                }
+            }
+        }
+
+        self.shared.user_callback.drop();
+    }
+
+    // Convert some given `NSEvent` into a winit `Event`.
+    unsafe fn ns_event_to_event(&mut self, ns_event: cocoa::base::id) -> Option<Event> {
+        if ns_event == cocoa::base::nil {
+            return None;
+        }
+
+        // FIXME: Despite not being documented anywhere, an `NSEvent` is produced when a user opens
+        // Spotlight while the NSApplication is in focus. This `NSEvent` produces a `NSEventType`
+        // with value `21`. This causes a SEGFAULT as soon as we try to match on the `NSEventType`
+        // enum as there is no variant associated with the value. Thus, we return early if this
+        // sneaky event occurs. If someone does find some documentation on this, please fix this by
+        // adding an appropriate variant to the `NSEventType` enum in the cocoa-rs crate.
+        if ns_event.eventType() as u64 == 21 {
+            return None;
+        }
+
+        let event_type = ns_event.eventType();
+        let ns_window = ns_event.window();
+        let window_id = super::window::get_window_id(ns_window);
+
+        // FIXME: Document this. Why do we do this? Seems like it passes on events to window/app.
+        // If we don't do this, window does not become main for some reason.
+        appkit::NSApp().sendEvent_(ns_event);
+
+        let windows = self.shared.windows.lock().unwrap();
+        let maybe_window = windows.iter()
+            .filter_map(Weak::upgrade)
+            .find(|window| window_id == window.id());
+
+        let into_event = |window_event| Event::WindowEvent {
+            window_id: ::WindowId(window_id),
+            event: window_event,
+        };
+
+        // Returns `Some` window if one of our windows is the key window.
+        let maybe_key_window = || windows.iter()
+            .filter_map(Weak::upgrade)
+            .find(|window| {
+                let is_key_window: cocoa::base::BOOL = msg_send![*window.window, isKeyWindow];
+                is_key_window == cocoa::base::YES
+            });
+
+        match event_type {
+            // https://github.com/glfw/glfw/blob/50eccd298a2bbc272b4977bd162d3e4b55f15394/src/cocoa_window.m#L881
+            appkit::NSKeyUp  => {
+                if let Some(key_window) = maybe_key_window() {
+                    if event_mods(ns_event).logo {
+                        let _: () = msg_send![*key_window.window, sendEvent:ns_event];
+                    }
+                }
+                None
+            },
+            // similar to above, but for `<Cmd-.>`, the keyDown is suppressed instead of the
+            // KeyUp, and the above trick does not appear to work.
+            appkit::NSKeyDown => {
+                let modifiers = event_mods(ns_event);
+                let keycode = NSEvent::keyCode(ns_event);
+                if modifiers.logo && keycode == 47 {
+                    modifier_event(ns_event, NSEventModifierFlags::NSCommandKeyMask, false)
+                        .map(into_event)
+                } else {
+                    None
+                }
+            },
+            appkit::NSFlagsChanged => {
+                let mut events = std::collections::VecDeque::new();
+
+                if let Some(window_event) = modifier_event(
+                    ns_event,
+                    NSEventModifierFlags::NSShiftKeyMask,
+                    self.modifiers.shift_pressed,
+                ) {
+                    self.modifiers.shift_pressed = !self.modifiers.shift_pressed;
+                    events.push_back(into_event(window_event));
+                }
+
+                if let Some(window_event) = modifier_event(
+                    ns_event,
+                    NSEventModifierFlags::NSControlKeyMask,
+                    self.modifiers.ctrl_pressed,
+                ) {
+                    self.modifiers.ctrl_pressed = !self.modifiers.ctrl_pressed;
+                    events.push_back(into_event(window_event));
+                }
+
+                if let Some(window_event) = modifier_event(
+                    ns_event,
+                    NSEventModifierFlags::NSCommandKeyMask,
+                    self.modifiers.win_pressed,
+                ) {
+                    self.modifiers.win_pressed = !self.modifiers.win_pressed;
+                    events.push_back(into_event(window_event));
+                }
+
+                if let Some(window_event) = modifier_event(
+                    ns_event,
+                    NSEventModifierFlags::NSAlternateKeyMask,
+                    self.modifiers.alt_pressed,
+                ) {
+                    self.modifiers.alt_pressed = !self.modifiers.alt_pressed;
+                    events.push_back(into_event(window_event));
+                }
+
+                let event = events.pop_front();
+                self.shared.pending_events
+                    .lock()
+                    .unwrap()
+                    .extend(events.into_iter());
+                event
+            },
+
+            appkit::NSMouseEntered => {
+                let window = match maybe_window.or_else(maybe_key_window) {
+                    Some(window) => window,
+                    None => return None,
+                };
+
+                let window_point = ns_event.locationInWindow();
+                let view_point = if ns_window == cocoa::base::nil {
+                    let ns_size = foundation::NSSize::new(0.0, 0.0);
+                    let ns_rect = foundation::NSRect::new(window_point, ns_size);
+                    let window_rect = window.window.convertRectFromScreen_(ns_rect);
+                    window.view.convertPoint_fromView_(window_rect.origin, cocoa::base::nil)
+                } else {
+                    window.view.convertPoint_fromView_(window_point, cocoa::base::nil)
+                };
+
+                let view_rect = NSView::frame(*window.view);
+                let x = view_point.x as f64;
+                let y = (view_rect.size.height - view_point.y) as f64;
+                let window_event = WindowEvent::CursorMoved {
+                    device_id: DEVICE_ID,
+                    position: (x, y).into(),
+                    modifiers: event_mods(ns_event),
+                };
+                let event = Event::WindowEvent { window_id: ::WindowId(window.id()), event: window_event };
+                self.shared.pending_events.lock().unwrap().push_back(event);
+                Some(into_event(WindowEvent::CursorEntered { device_id: DEVICE_ID }))
+            },
+            appkit::NSMouseExited => { Some(into_event(WindowEvent::CursorLeft { device_id: DEVICE_ID })) },
+
+            appkit::NSMouseMoved |
+            appkit::NSLeftMouseDragged |
+            appkit::NSOtherMouseDragged |
+            appkit::NSRightMouseDragged => {
+                // If the mouse movement was on one of our windows, use it.
+                // Otherwise, if one of our windows is the key window (receiving input), use it.
+                // Otherwise, return `None`.
+                match maybe_window.or_else(maybe_key_window) {
+                    Some(_window) => (),
+                    None => return None,
+                }
+
+                let mut events = std::collections::VecDeque::with_capacity(3);
+
+                let delta_x = ns_event.deltaX() as f64;
+                if delta_x != 0.0 {
+                    let motion_event = DeviceEvent::Motion { axis: 0, value: delta_x };
+                    let event = Event::DeviceEvent { device_id: DEVICE_ID, event: motion_event };
+                    events.push_back(event);
+                }
+
+                let delta_y = ns_event.deltaY() as f64;
+                if delta_y != 0.0 {
+                    let motion_event = DeviceEvent::Motion { axis: 1, value: delta_y };
+                    let event = Event::DeviceEvent { device_id: DEVICE_ID, event: motion_event };
+                    events.push_back(event);
+                }
+
+                if delta_x != 0.0 || delta_y != 0.0 {
+                    let motion_event = DeviceEvent::MouseMotion { delta: (delta_x, delta_y) };
+                    let event = Event::DeviceEvent { device_id: DEVICE_ID, event: motion_event };
+                    events.push_back(event);
+                }
+
+                let event = events.pop_front();
+                self.shared.pending_events.lock().unwrap().extend(events.into_iter());
+                event
+            },
+
+            appkit::NSScrollWheel => {
+                // If none of the windows received the scroll, return `None`.
+                if maybe_window.is_none() {
+                    return None;
+                }
+
+                use events::MouseScrollDelta::{LineDelta, PixelDelta};
+                let delta = if ns_event.hasPreciseScrollingDeltas() == cocoa::base::YES {
+                    PixelDelta((
+                        ns_event.scrollingDeltaX() as f64,
+                        ns_event.scrollingDeltaY() as f64,
+                    ).into())
+                } else {
+                    // TODO: This is probably wrong
+                    LineDelta(
+                        ns_event.scrollingDeltaX() as f32,
+                        ns_event.scrollingDeltaY() as f32,
+                    )
+                };
+                let phase = match ns_event.phase() {
+                    NSEventPhase::NSEventPhaseMayBegin | NSEventPhase::NSEventPhaseBegan => TouchPhase::Started,
+                    NSEventPhase::NSEventPhaseEnded => TouchPhase::Ended,
+                    _ => TouchPhase::Moved,
+                };
+                self.shared.pending_events.lock().unwrap().push_back(Event::DeviceEvent {
+                    device_id: DEVICE_ID,
+                    event: DeviceEvent::MouseWheel {
+                        delta: if ns_event.hasPreciseScrollingDeltas() == cocoa::base::YES {
+                            PixelDelta((
+                                ns_event.scrollingDeltaX() as f64,
+                                ns_event.scrollingDeltaY() as f64,
+                            ).into())
+                        } else {
+                            LineDelta(
+                                ns_event.scrollingDeltaX() as f32,
+                                ns_event.scrollingDeltaY() as f32,
+                            )
+                        },
+                    }
+                });
+                let window_event = WindowEvent::MouseWheel { device_id: DEVICE_ID, delta: delta, phase: phase, modifiers: event_mods(ns_event) };
+                Some(into_event(window_event))
+            },
+
+            appkit::NSEventTypePressure => {
+                let pressure = ns_event.pressure();
+                let stage = ns_event.stage();
+                let window_event = WindowEvent::TouchpadPressure { device_id: DEVICE_ID, pressure: pressure, stage: stage };
+                Some(into_event(window_event))
+            },
+
+            appkit::NSApplicationDefined => match ns_event.subtype() {
+                appkit::NSEventSubtype::NSApplicationActivatedEventType => {
+                    Some(Event::Awakened)
+                },
+                _ => None,
+            },
+
+            _  => None,
+        }
+    }
+
+    pub fn create_proxy(&self) -> Proxy {
+        Proxy {}
+    }
+
+}
+
+impl Proxy {
+    pub fn wakeup(&self) -> Result<(), EventsLoopClosed> {
+        // Awaken the event loop by triggering `NSApplicationActivatedEventType`.
+        unsafe {
+            let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
+            let event =
+                NSEvent::otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_(
+                    cocoa::base::nil,
+                    appkit::NSApplicationDefined,
+                    foundation::NSPoint::new(0.0, 0.0),
+                    appkit::NSEventModifierFlags::empty(),
+                    0.0,
+                    0,
+                    cocoa::base::nil,
+                    appkit::NSEventSubtype::NSApplicationActivatedEventType,
+                    0,
+                    0);
+            appkit::NSApp().postEvent_atStart_(event, cocoa::base::NO);
+            foundation::NSAutoreleasePool::drain(pool);
+        }
+        Ok(())
+    }
+}
+
+pub fn char_to_keycode(c: char) -> Option<events::VirtualKeyCode> {
+    // We only translate keys that are affected by keyboard layout.
+    //
+    // Note that since keys are translated in a somewhat "dumb" way (reading character)
+    // there is a concern that some combination, i.e. Cmd+char, causes the wrong
+    // letter to be received, and so we receive the wrong key.
+    //
+    // Implementation reference: https://github.com/WebKit/webkit/blob/82bae82cf0f329dbe21059ef0986c4e92fea4ba6/Source/WebCore/platform/cocoa/KeyEventCocoa.mm#L626
+    Some(match c {
+        'a' | 'A' => events::VirtualKeyCode::A,
+        'b' | 'B' => events::VirtualKeyCode::B,
+        'c' | 'C' => events::VirtualKeyCode::C,
+        'd' | 'D' => events::VirtualKeyCode::D,
+        'e' | 'E' => events::VirtualKeyCode::E,
+        'f' | 'F' => events::VirtualKeyCode::F,
+        'g' | 'G' => events::VirtualKeyCode::G,
+        'h' | 'H' => events::VirtualKeyCode::H,
+        'i' | 'I' => events::VirtualKeyCode::I,
+        'j' | 'J' => events::VirtualKeyCode::J,
+        'k' | 'K' => events::VirtualKeyCode::K,
+        'l' | 'L' => events::VirtualKeyCode::L,
+        'm' | 'M' => events::VirtualKeyCode::M,
+        'n' | 'N' => events::VirtualKeyCode::N,
+        'o' | 'O' => events::VirtualKeyCode::O,
+        'p' | 'P' => events::VirtualKeyCode::P,
+        'q' | 'Q' => events::VirtualKeyCode::Q,
+        'r' | 'R' => events::VirtualKeyCode::R,
+        's' | 'S' => events::VirtualKeyCode::S,
+        't' | 'T' => events::VirtualKeyCode::T,
+        'u' | 'U' => events::VirtualKeyCode::U,
+        'v' | 'V' => events::VirtualKeyCode::V,
+        'w' | 'W' => events::VirtualKeyCode::W,
+        'x' | 'X' => events::VirtualKeyCode::X,
+        'y' | 'Y' => events::VirtualKeyCode::Y,
+        'z' | 'Z' => events::VirtualKeyCode::Z,
+        '1' | '!' => events::VirtualKeyCode::Key1,
+        '2' | '@' => events::VirtualKeyCode::Key2,
+        '3' | '#' => events::VirtualKeyCode::Key3,
+        '4' | '$' => events::VirtualKeyCode::Key4,
+        '5' | '%' => events::VirtualKeyCode::Key5,
+        '6' | '^' => events::VirtualKeyCode::Key6,
+        '7' | '&' => events::VirtualKeyCode::Key7,
+        '8' | '*' => events::VirtualKeyCode::Key8,
+        '9' | '(' => events::VirtualKeyCode::Key9,
+        '0' | ')' => events::VirtualKeyCode::Key0,
+        '=' | '+' => events::VirtualKeyCode::Equals,
+        '-' | '_' => events::VirtualKeyCode::Minus,
+        ']' | '}' => events::VirtualKeyCode::RBracket,
+        '[' | '{' => events::VirtualKeyCode::LBracket,
+        '\''| '"' => events::VirtualKeyCode::Apostrophe,
+        ';' | ':' => events::VirtualKeyCode::Semicolon,
+        '\\'| '|' => events::VirtualKeyCode::Backslash,
+        ',' | '<' => events::VirtualKeyCode::Comma,
+        '/' | '?' => events::VirtualKeyCode::Slash,
+        '.' | '>' => events::VirtualKeyCode::Period,
+        '`' | '~' => events::VirtualKeyCode::Grave,
+        _ => return None,
+    })
+}
+
+pub fn scancode_to_keycode(code: c_ushort) -> Option<events::VirtualKeyCode> {
+    Some(match code {
+        0x00 => events::VirtualKeyCode::A,
+        0x01 => events::VirtualKeyCode::S,
+        0x02 => events::VirtualKeyCode::D,
+        0x03 => events::VirtualKeyCode::F,
+        0x04 => events::VirtualKeyCode::H,
+        0x05 => events::VirtualKeyCode::G,
+        0x06 => events::VirtualKeyCode::Z,
+        0x07 => events::VirtualKeyCode::X,
+        0x08 => events::VirtualKeyCode::C,
+        0x09 => events::VirtualKeyCode::V,
+        //0x0a => World 1,
+        0x0b => events::VirtualKeyCode::B,
+        0x0c => events::VirtualKeyCode::Q,
+        0x0d => events::VirtualKeyCode::W,
+        0x0e => events::VirtualKeyCode::E,
+        0x0f => events::VirtualKeyCode::R,
+        0x10 => events::VirtualKeyCode::Y,
+        0x11 => events::VirtualKeyCode::T,
+        0x12 => events::VirtualKeyCode::Key1,
+        0x13 => events::VirtualKeyCode::Key2,
+        0x14 => events::VirtualKeyCode::Key3,
+        0x15 => events::VirtualKeyCode::Key4,
+        0x16 => events::VirtualKeyCode::Key6,
+        0x17 => events::VirtualKeyCode::Key5,
+        0x18 => events::VirtualKeyCode::Equals,
+        0x19 => events::VirtualKeyCode::Key9,
+        0x1a => events::VirtualKeyCode::Key7,
+        0x1b => events::VirtualKeyCode::Minus,
+        0x1c => events::VirtualKeyCode::Key8,
+        0x1d => events::VirtualKeyCode::Key0,
+        0x1e => events::VirtualKeyCode::RBracket,
+        0x1f => events::VirtualKeyCode::O,
+        0x20 => events::VirtualKeyCode::U,
+        0x21 => events::VirtualKeyCode::LBracket,
+        0x22 => events::VirtualKeyCode::I,
+        0x23 => events::VirtualKeyCode::P,
+        0x24 => events::VirtualKeyCode::Return,
+        0x25 => events::VirtualKeyCode::L,
+        0x26 => events::VirtualKeyCode::J,
+        0x27 => events::VirtualKeyCode::Apostrophe,
+        0x28 => events::VirtualKeyCode::K,
+        0x29 => events::VirtualKeyCode::Semicolon,
+        0x2a => events::VirtualKeyCode::Backslash,
+        0x2b => events::VirtualKeyCode::Comma,
+        0x2c => events::VirtualKeyCode::Slash,
+        0x2d => events::VirtualKeyCode::N,
+        0x2e => events::VirtualKeyCode::M,
+        0x2f => events::VirtualKeyCode::Period,
+        0x30 => events::VirtualKeyCode::Tab,
+        0x31 => events::VirtualKeyCode::Space,
+        0x32 => events::VirtualKeyCode::Grave,
+        0x33 => events::VirtualKeyCode::Back,
+        //0x34 => unkown,
+        0x35 => events::VirtualKeyCode::Escape,
+        0x36 => events::VirtualKeyCode::RWin,
+        0x37 => events::VirtualKeyCode::LWin,
+        0x38 => events::VirtualKeyCode::LShift,
+        //0x39 => Caps lock,
+        0x3a => events::VirtualKeyCode::LAlt,
+        0x3b => events::VirtualKeyCode::LControl,
+        0x3c => events::VirtualKeyCode::RShift,
+        0x3d => events::VirtualKeyCode::RAlt,
+        0x3e => events::VirtualKeyCode::RControl,
+        //0x3f => Fn key,
+        0x40 => events::VirtualKeyCode::F17,
+        0x41 => events::VirtualKeyCode::Decimal,
+        //0x42 -> unkown,
+        0x43 => events::VirtualKeyCode::Multiply,
+        //0x44 => unkown,
+        0x45 => events::VirtualKeyCode::Add,
+        //0x46 => unkown,
+        0x47 => events::VirtualKeyCode::Numlock,
+        //0x48 => KeypadClear,
+        0x49 => events::VirtualKeyCode::VolumeUp,
+        0x4a => events::VirtualKeyCode::VolumeDown,
+        0x4b => events::VirtualKeyCode::Divide,
+        0x4c => events::VirtualKeyCode::NumpadEnter,
+        0x4e => events::VirtualKeyCode::Subtract,
+        //0x4d => unkown,
+        0x4e => events::VirtualKeyCode::Subtract,
+        0x4f => events::VirtualKeyCode::F18,
+        0x50 => events::VirtualKeyCode::F19,
+        0x51 => events::VirtualKeyCode::NumpadEquals,
+        0x52 => events::VirtualKeyCode::Numpad0,
+        0x53 => events::VirtualKeyCode::Numpad1,
+        0x54 => events::VirtualKeyCode::Numpad2,
+        0x55 => events::VirtualKeyCode::Numpad3,
+        0x56 => events::VirtualKeyCode::Numpad4,
+        0x57 => events::VirtualKeyCode::Numpad5,
+        0x58 => events::VirtualKeyCode::Numpad6,
+        0x59 => events::VirtualKeyCode::Numpad7,
+        0x5a => events::VirtualKeyCode::F20,
+        0x5b => events::VirtualKeyCode::Numpad8,
+        0x5c => events::VirtualKeyCode::Numpad9,
+        0x5d => events::VirtualKeyCode::Yen,
+        //0x5e => JIS Ro,
+        //0x5f => unkown,
+        0x60 => events::VirtualKeyCode::F5,
+        0x61 => events::VirtualKeyCode::F6,
+        0x62 => events::VirtualKeyCode::F7,
+        0x63 => events::VirtualKeyCode::F3,
+        0x64 => events::VirtualKeyCode::F8,
+        0x65 => events::VirtualKeyCode::F9,
+        //0x66 => JIS Eisuu (macOS),
+        0x67 => events::VirtualKeyCode::F11,
+        //0x68 => JIS Kana (macOS),
+        0x69 => events::VirtualKeyCode::F13,
+        0x6a => events::VirtualKeyCode::F16,
+        0x6b => events::VirtualKeyCode::F14,
+        //0x6c => unkown,
+        0x6d => events::VirtualKeyCode::F10,
+        //0x6e => unkown,
+        0x6f => events::VirtualKeyCode::F12,
+        //0x70 => unkown,
+        0x71 => events::VirtualKeyCode::F15,
+        0x72 => events::VirtualKeyCode::Insert,
+        0x73 => events::VirtualKeyCode::Home,
+        0x74 => events::VirtualKeyCode::PageUp,
+        0x75 => events::VirtualKeyCode::Delete,
+        0x76 => events::VirtualKeyCode::F4,
+        0x77 => events::VirtualKeyCode::End,
+        0x78 => events::VirtualKeyCode::F2,
+        0x79 => events::VirtualKeyCode::PageDown,
+        0x7a => events::VirtualKeyCode::F1,
+        0x7b => events::VirtualKeyCode::Left,
+        0x7c => events::VirtualKeyCode::Right,
+        0x7d => events::VirtualKeyCode::Down,
+        0x7e => events::VirtualKeyCode::Up,
+        //0x7f =>  unkown,
+
+        0xa => events::VirtualKeyCode::Caret,
+        _ => return None,
+    })
+}
+
+pub fn check_function_keys(
+    s: &String
+) -> Option<events::VirtualKeyCode> {
+    if let Some(ch) = s.encode_utf16().next() {
+        return Some(match ch {
+            0xf718 => events::VirtualKeyCode::F21,
+            0xf719 => events::VirtualKeyCode::F22,
+            0xf71a => events::VirtualKeyCode::F23,
+            0xf71b => events::VirtualKeyCode::F24,
+            _ => return None,
+        })
+    }
+
+    None
+}
+
+pub fn event_mods(event: cocoa::base::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),
+    }
+}
+
+pub fn get_scancode(event: cocoa::base::id) -> c_ushort {
+    // In AppKit, `keyCode` refers to the position (scancode) of a key rather than its character,
+    // and there is no easy way to navtively retrieve the layout-dependent character.
+    // In winit, we use keycode to refer to the key's character, and so this function aligns
+    // AppKit's terminology with ours.
+    unsafe {
+        msg_send![event, keyCode]
+    }
+}
+
+unsafe fn modifier_event(
+    ns_event: cocoa::base::id,
+    keymask: NSEventModifierFlags,
+    was_key_pressed: bool,
+) -> Option<WindowEvent> {
+    if !was_key_pressed && NSEvent::modifierFlags(ns_event).contains(keymask)
+    || was_key_pressed && !NSEvent::modifierFlags(ns_event).contains(keymask) {
+        let state = if was_key_pressed {
+            ElementState::Released
+        } else {
+            ElementState::Pressed
+        };
+
+        let scancode = get_scancode(ns_event);
+        let virtual_keycode = scancode_to_keycode(scancode);
+        Some(WindowEvent::KeyboardInput {
+            device_id: DEVICE_ID,
+            input: KeyboardInput {
+                state,
+                scancode: scancode as u32,
+                virtual_keycode,
+                modifiers: event_mods(ns_event),
+            },
+        })
+    } else {
+        None
+    }
+}
+
+// Constant device ID, to be removed when this backend is updated to report real device IDs.
+pub const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);

src/platform/macos/ffi.rs

@@ -2,10 +2,8 @@
 
 #![allow(dead_code, non_snake_case, non_upper_case_globals)]
 
-use cocoa::{
-    base::id,
-    foundation::{NSInteger, NSUInteger},
-};
+use cocoa::base::id;
+use cocoa::foundation::{NSInteger, NSUInteger};
 use objc;
 
 pub const NSNotFound: NSInteger = NSInteger::max_value();
@@ -55,11 +53,11 @@ impl NSMutableAttributedString for id {
     }
 
     unsafe fn initWithString(self, string: id) -> id {
-        msg_send![self, initWithString: string]
+        msg_send![self, initWithString:string]
     }
 
     unsafe fn initWithAttributedString(self, string: id) -> id {
-        msg_send![self, initWithAttributedString: string]
+        msg_send![self, initWithAttributedString:string]
     }
 
     unsafe fn string(self) -> id {
@@ -97,7 +95,6 @@ pub const kCGDesktopIconWindowLevelKey: NSInteger = 18;
 pub const kCGCursorWindowLevelKey: NSInteger = 19;
 pub const kCGNumberOfWindowLevelKeys: NSInteger = 20;
 
-#[derive(Debug, Clone, Copy)]
 pub enum NSWindowLevel {
     NSNormalWindowLevel = kCGBaseWindowLevelKey as _,
     NSFloatingWindowLevel = kCGFloatingWindowLevelKey as _,

src/platform/macos/mod.rs

@@ -0,0 +1,51 @@
+#![cfg(target_os = "macos")]
+
+pub use self::events_loop::{EventsLoop, Proxy as EventsLoopProxy};
+pub use self::monitor::MonitorId;
+pub use self::window::{Id as WindowId, PlatformSpecificWindowBuilderAttributes, Window2};
+use std::sync::Arc;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+use {CreationError};
+
+pub struct Window {
+    pub window: Arc<Window2>,
+}
+
+impl ::std::ops::Deref for Window {
+    type Target = Window2;
+    #[inline]
+    fn deref(&self) -> &Window2 {
+        &*self.window
+    }
+}
+
+impl Window {
+
+    pub fn new(events_loop: &EventsLoop,
+               attributes: ::WindowAttributes,
+               pl_attribs: PlatformSpecificWindowBuilderAttributes) -> Result<Self, CreationError>
+    {
+        let weak_shared = Arc::downgrade(&events_loop.shared);
+        let window = Arc::new(try!(Window2::new(weak_shared, attributes, pl_attribs)));
+        let weak_window = Arc::downgrade(&window);
+        events_loop.shared.windows.lock().unwrap().push(weak_window);
+        Ok(Window { window: window })
+    }
+
+}
+
+mod events_loop;
+mod ffi;
+mod monitor;
+mod util;
+mod view;
+mod window;

src/platform/macos/monitor.rs

@@ -0,0 +1,147 @@
+use std::collections::VecDeque;
+use std::fmt;
+
+use cocoa::appkit::NSScreen;
+use cocoa::base::{id, nil};
+use cocoa::foundation::{NSString, NSUInteger};
+use core_graphics::display::{CGDirectDisplayID, CGDisplay, CGDisplayBounds};
+
+use {PhysicalPosition, PhysicalSize};
+use super::EventsLoop;
+use super::window::{IdRef, Window2};
+
+#[derive(Clone, PartialEq)]
+pub struct MonitorId(CGDirectDisplayID);
+
+fn get_available_monitors() -> VecDeque<MonitorId> {
+    if let Ok(displays) = CGDisplay::active_displays() {
+        let mut monitors = VecDeque::with_capacity(displays.len());
+        for d in displays {
+            monitors.push_back(MonitorId(d));
+        }
+        monitors
+    } else {
+        VecDeque::with_capacity(0)
+    }
+}
+
+pub fn get_primary_monitor() -> MonitorId {
+    let id = MonitorId(CGDisplay::main().id);
+    id
+}
+
+impl EventsLoop {
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        get_available_monitors()
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        get_primary_monitor()
+    }
+
+    pub fn make_monitor_from_display(id: CGDirectDisplayID) -> MonitorId {
+        let id = MonitorId(id);
+        id
+    }
+}
+
+impl Window2 {
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        get_available_monitors()
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        get_primary_monitor()
+    }
+}
+
+impl fmt::Debug for MonitorId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorId {
+            name: Option<String>,
+            native_identifier: u32,
+            dimensions: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: f64,
+        }
+
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            native_identifier: self.get_native_identifier(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
+
+impl MonitorId {
+    pub fn get_name(&self) -> Option<String> {
+        let MonitorId(display_id) = *self;
+        let screen_num = CGDisplay::new(display_id).model_number();
+        Some(format!("Monitor #{}", screen_num))
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> u32 {
+        self.0
+    }
+
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        let MonitorId(display_id) = *self;
+        let display = CGDisplay::new(display_id);
+        let height = display.pixels_high();
+        let width = display.pixels_wide();
+        PhysicalSize::from_logical(
+            (width as f64, height as f64),
+            self.get_hidpi_factor(),
+        )
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> PhysicalPosition {
+        let bounds = unsafe { CGDisplayBounds(self.get_native_identifier()) };
+        PhysicalPosition::from_logical(
+            (bounds.origin.x as f64, bounds.origin.y as f64),
+            self.get_hidpi_factor(),
+        )
+    }
+
+    pub fn get_hidpi_factor(&self) -> f64 {
+        let screen = match self.get_nsscreen() {
+            Some(screen) => screen,
+            None => return 1.0, // default to 1.0 when we can't find the screen
+        };
+        unsafe { NSScreen::backingScaleFactor(screen) as f64 }
+    }
+
+    pub(crate) fn get_nsscreen(&self) -> Option<id> {
+        unsafe {
+            let native_id = self.get_native_identifier();
+            let screens = NSScreen::screens(nil);
+            let count: NSUInteger = msg_send![screens, count];
+            let key = IdRef::new(NSString::alloc(nil).init_str("NSScreenNumber"));
+            let mut matching_screen: Option<id> = None;
+            for i in 0..count {
+                let screen = msg_send![screens, objectAtIndex: i as NSUInteger];
+                let device_description = NSScreen::deviceDescription(screen);
+                let value: id = msg_send![device_description, objectForKey:*key];
+                if value != nil {
+                    let screen_number: NSUInteger = msg_send![value, unsignedIntegerValue];
+                    if screen_number as u32 == native_id {
+                        matching_screen = Some(screen);
+                        break;
+                    }
+                }
+            }
+            matching_screen
+        }
+    }
+}

src/platform/macos/util/cursor.rs

@@ -0,0 +1,149 @@
+use cocoa::{
+    appkit::NSImage, base::{id, nil, YES},
+    foundation::{NSDictionary, NSPoint, NSString},
+};
+use objc::runtime::Sel;
+
+use super::IntoOption;
+use MouseCursor;
+
+pub enum Cursor {
+    Native(&'static str),
+    Undocumented(&'static str),
+    WebKit(&'static str),
+}
+
+impl From<MouseCursor> for Cursor {
+    fn from(cursor: MouseCursor) -> Self {
+        match cursor {
+            MouseCursor::Arrow | MouseCursor::Default => Cursor::Native("arrowCursor"),
+            MouseCursor::Hand => Cursor::Native("pointingHandCursor"),
+            MouseCursor::Grabbing | MouseCursor::Grab => Cursor::Native("closedHandCursor"),
+            MouseCursor::Text => Cursor::Native("IBeamCursor"),
+            MouseCursor::VerticalText => Cursor::Native("IBeamCursorForVerticalLayout"),
+            MouseCursor::Copy => Cursor::Native("dragCopyCursor"),
+            MouseCursor::Alias => Cursor::Native("dragLinkCursor"),
+            MouseCursor::NotAllowed | MouseCursor::NoDrop => Cursor::Native("operationNotAllowedCursor"),
+            MouseCursor::ContextMenu => Cursor::Native("contextualMenuCursor"),
+            MouseCursor::Crosshair => Cursor::Native("crosshairCursor"),
+            MouseCursor::EResize => Cursor::Native("resizeRightCursor"),
+            MouseCursor::NResize => Cursor::Native("resizeUpCursor"),
+            MouseCursor::WResize => Cursor::Native("resizeLeftCursor"),
+            MouseCursor::SResize => Cursor::Native("resizeDownCursor"),
+            MouseCursor::EwResize | MouseCursor::ColResize => Cursor::Native("resizeLeftRightCursor"),
+            MouseCursor::NsResize | MouseCursor::RowResize => Cursor::Native("resizeUpDownCursor"),
+
+            // Undocumented cursors: https://stackoverflow.com/a/46635398/5435443
+            MouseCursor::Help => Cursor::Undocumented("_helpCursor"),
+            MouseCursor::ZoomIn => Cursor::Undocumented("_zoomInCursor"),
+            MouseCursor::ZoomOut => Cursor::Undocumented("_zoomOutCursor"),
+            MouseCursor::NeResize => Cursor::Undocumented("_windowResizeNorthEastCursor"),
+            MouseCursor::NwResize => Cursor::Undocumented("_windowResizeNorthWestCursor"),
+            MouseCursor::SeResize => Cursor::Undocumented("_windowResizeSouthEastCursor"),
+            MouseCursor::SwResize => Cursor::Undocumented("_windowResizeSouthWestCursor"),
+            MouseCursor::NeswResize => Cursor::Undocumented("_windowResizeNorthEastSouthWestCursor"),
+            MouseCursor::NwseResize => Cursor::Undocumented("_windowResizeNorthWestSouthEastCursor"),
+
+            // While these are available, the former just loads a white arrow,
+            // and the latter loads an ugly deflated beachball!
+            // MouseCursor::Move => Cursor::Undocumented("_moveCursor"),
+            // MouseCursor::Wait => Cursor::Undocumented("_waitCursor"),
+
+            // An even more undocumented cursor...
+            // https://bugs.eclipse.org/bugs/show_bug.cgi?id=522349
+            // This is the wrong semantics for `Wait`, but it's the same as
+            // what's used in Safari and Chrome.
+            MouseCursor::Wait | MouseCursor::Progress => Cursor::Undocumented("busyButClickableCursor"),
+
+            // For the rest, we can just snatch the cursors from WebKit...
+            // They fit the style of the native cursors, and will seem
+            // completely standard to macOS users.
+            // https://stackoverflow.com/a/21786835/5435443
+            MouseCursor::Move | MouseCursor::AllScroll => Cursor::WebKit("move"),
+            MouseCursor::Cell => Cursor::WebKit("cell"),
+        }
+    }
+}
+
+impl Default for Cursor {
+    fn default() -> Self {
+        Cursor::Native("arrowCursor")
+    }
+}
+
+impl Cursor {
+    pub unsafe fn load(&self) -> id {
+        match self {
+            Cursor::Native(cursor_name) => {
+                let sel = Sel::register(cursor_name);
+                msg_send![class!(NSCursor), performSelector:sel]
+            },
+            Cursor::Undocumented(cursor_name) => {
+                let class = class!(NSCursor);
+                let sel = Sel::register(cursor_name);
+                let sel = if msg_send![class, respondsToSelector:sel] {
+                    sel
+                } else {
+                    warn!("Cursor `{}` appears to be invalid", cursor_name);
+                    sel!(arrowCursor)
+                };
+                msg_send![class, performSelector:sel]
+            },
+            Cursor::WebKit(cursor_name) => load_webkit_cursor(cursor_name)
+                .unwrap_or_else(|message| {
+                    warn!("{}", message);
+                    Self::default().load()
+                }),
+        }
+    }
+}
+
+// Note that loading `busybutclickable` with this code won't animate the frames;
+// instead you'll just get them all in a column.
+unsafe fn load_webkit_cursor(cursor_name_str: &str) -> Result<id, String> {
+    static CURSOR_ROOT: &'static str = "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/Resources/cursors";
+    let cursor_root = NSString::alloc(nil).init_str(CURSOR_ROOT);
+    let cursor_name = NSString::alloc(nil).init_str(cursor_name_str);
+    let cursor_pdf = NSString::alloc(nil).init_str("cursor.pdf");
+    let cursor_plist = NSString::alloc(nil).init_str("info.plist");
+    let key_x = NSString::alloc(nil).init_str("hotx");
+    let key_y = NSString::alloc(nil).init_str("hoty");
+
+    let cursor_path: id = msg_send![cursor_root,
+        stringByAppendingPathComponent:cursor_name
+    ];
+    let pdf_path: id = msg_send![cursor_path,
+        stringByAppendingPathComponent:cursor_pdf
+    ];
+    let info_path: id = msg_send![cursor_path,
+        stringByAppendingPathComponent:cursor_plist
+    ];
+
+    let image = NSImage::alloc(nil)
+        .initByReferencingFile_(pdf_path)
+        // This will probably never be `None`, since images are loaded lazily...
+        .into_option()
+        // because of that, we need to check for validity.
+        .filter(|image| image.isValid() == YES)
+        .ok_or_else(||
+            format!("Failed to read image for `{}` cursor", cursor_name_str)
+        )?;
+    let info = NSDictionary::dictionaryWithContentsOfFile_(nil, info_path)
+        .into_option()
+        .ok_or_else(||
+            format!("Failed to read info for `{}` cursor", cursor_name_str)
+        )?;
+    let x = info.valueForKey_(key_x);
+    let y = info.valueForKey_(key_y);
+    let point = NSPoint::new(
+        msg_send![x, doubleValue],
+        msg_send![y, doubleValue],
+    );
+    let cursor: id = msg_send![class!(NSCursor), alloc];
+    let cursor: id = msg_send![cursor, initWithImage:image hotSpot:point];
+    cursor
+        .into_option()
+        .ok_or_else(||
+            format!("Failed to initialize `{}` cursor", cursor_name_str)
+        )
+}

src/platform/macos/util/mod.rs

@@ -0,0 +1,63 @@
+mod cursor;
+mod into_option;
+
+pub use self::{cursor::Cursor, into_option::IntoOption};
+
+use cocoa::appkit::NSWindowStyleMask;
+use cocoa::base::{id, nil};
+use cocoa::foundation::{NSRect, NSUInteger};
+use core_graphics::display::CGDisplay;
+use objc::runtime::{Class, Object};
+
+use platform::platform::ffi;
+use platform::platform::window::IdRef;
+
+pub const EMPTY_RANGE: ffi::NSRange = ffi::NSRange {
+    location: ffi::NSNotFound as NSUInteger,
+    length: 0,
+};
+
+// For consistency with other platforms, this will...
+// 1. translate the bottom-left window corner into the top-left window corner
+// 2. translate the coordinate from a bottom-left origin coordinate system to a top-left one
+pub fn bottom_left_to_top_left(rect: NSRect) -> f64 {
+    CGDisplay::main().pixels_high() as f64 - (rect.origin.y + rect.size.height)
+}
+
+pub unsafe fn set_style_mask(window: id, view: id, mask: NSWindowStyleMask) {
+    use cocoa::appkit::NSWindow;
+    window.setStyleMask_(mask);
+    // If we don't do this, key handling will break. Therefore, never call `setStyleMask` directly!
+    window.makeFirstResponder_(view);
+}
+
+pub unsafe fn toggle_style_mask(window: id, view: id, mask: NSWindowStyleMask, on: bool) {
+    use cocoa::appkit::NSWindow;
+
+    let current_style_mask = window.styleMask();
+    if on {
+        window.setStyleMask_(current_style_mask | mask);
+    } else {
+        window.setStyleMask_(current_style_mask & (!mask));
+    }
+
+    // If we don't do this, key handling will break. Therefore, never call `setStyleMask` directly!
+    window.makeFirstResponder_(view);
+}
+
+pub unsafe fn superclass<'a>(this: &'a Object) -> &'a Class {
+    let superclass: id = msg_send![this, superclass];
+    &*(superclass as *const _)
+}
+
+pub unsafe fn create_input_context(view: id) -> IdRef {
+    let input_context: id = msg_send![class!(NSTextInputContext), alloc];
+    let input_context: id = msg_send![input_context, initWithClient:view];
+    IdRef::new(input_context)
+}
+
+#[allow(dead_code)]
+pub unsafe fn open_emoji_picker() {
+    let app: id = msg_send![class!(NSApplication), sharedApplication];
+    let _: () = msg_send![app, orderFrontCharacterPalette:nil];
+}

src/platform/macos/view.rs

@@ -0,0 +1,663 @@
+// This is a pretty close port of the implementation in GLFW:
+// https://github.com/glfw/glfw/blob/7ef34eb06de54dd9186d3d21a401b2ef819b59e7/src/cocoa_window.m
+
+use std::{slice, str};
+use std::boxed::Box;
+use std::collections::VecDeque;
+use std::os::raw::*;
+use std::sync::{Arc, Mutex, Weak};
+
+use cocoa::base::{id, nil};
+use cocoa::appkit::{NSEvent, NSView, NSWindow};
+use cocoa::foundation::{NSPoint, NSRect, NSSize, NSString, NSUInteger};
+use objc::declare::ClassDecl;
+use objc::runtime::{Class, Object, Protocol, Sel, BOOL, YES};
+
+use {ElementState, Event, KeyboardInput, MouseButton, WindowEvent, WindowId};
+use platform::platform::events_loop::{DEVICE_ID, event_mods, Shared, scancode_to_keycode, char_to_keycode, check_function_keys, get_scancode};
+use platform::platform::util;
+use platform::platform::ffi::*;
+use platform::platform::window::{get_window_id, IdRef};
+use events;
+
+struct ViewState {
+    window: id,
+    shared: Weak<Shared>,
+    cursor: Arc<Mutex<util::Cursor>>,
+    ime_spot: Option<(f64, f64)>,
+    raw_characters: Option<String>,
+    is_key_down: bool,
+}
+
+pub fn new_view(window: id, shared: Weak<Shared>) -> (IdRef, Weak<Mutex<util::Cursor>>) {
+    let cursor = Default::default();
+    let cursor_access = Arc::downgrade(&cursor);
+    let state = ViewState {
+        window,
+        shared,
+        cursor,
+        ime_spot: None,
+        raw_characters: None,
+        is_key_down: false,
+    };
+    unsafe {
+        // This is free'd in `dealloc`
+        let state_ptr = Box::into_raw(Box::new(state)) as *mut c_void;
+        let view: id = msg_send![VIEW_CLASS.0, alloc];
+        (IdRef::new(msg_send![view, initWithWinit:state_ptr]), cursor_access)
+    }
+}
+
+pub fn set_ime_spot(view: id, input_context: id, x: f64, y: f64) {
+    unsafe {
+        let state_ptr: *mut c_void = *(*view).get_mut_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+        let content_rect = NSWindow::contentRectForFrameRect_(
+            state.window,
+            NSWindow::frame(state.window),
+        );
+        let base_x = content_rect.origin.x as f64;
+        let base_y = (content_rect.origin.y + content_rect.size.height) as f64;
+        state.ime_spot = Some((base_x + x, base_y - y));
+        let _: () = msg_send![input_context, invalidateCharacterCoordinates];
+    }
+}
+
+struct ViewClass(*const Class);
+unsafe impl Send for ViewClass {}
+unsafe impl Sync for ViewClass {}
+
+lazy_static! {
+    static ref VIEW_CLASS: ViewClass = unsafe {
+        let superclass = class!(NSView);
+        let mut decl = ClassDecl::new("WinitView", superclass).unwrap();
+        decl.add_method(sel!(dealloc), dealloc as extern fn(&Object, Sel));
+        decl.add_method(
+            sel!(initWithWinit:),
+            init_with_winit as extern fn(&Object, Sel, *mut c_void) -> id,
+        );
+        decl.add_method(
+            sel!(drawRect:),
+            draw_rect as extern fn(&Object, Sel, NSRect),
+        );
+        decl.add_method(
+            sel!(resetCursorRects),
+            reset_cursor_rects as extern fn(&Object, Sel),
+        );
+        decl.add_method(sel!(hasMarkedText), has_marked_text as extern fn(&Object, Sel) -> BOOL);
+        decl.add_method(
+            sel!(markedRange),
+            marked_range as extern fn(&Object, Sel) -> NSRange,
+        );
+        decl.add_method(sel!(selectedRange), selected_range as extern fn(&Object, Sel) -> NSRange);
+        decl.add_method(
+            sel!(setMarkedText:selectedRange:replacementRange:),
+            set_marked_text as extern fn(&mut Object, Sel, id, NSRange, NSRange),
+        );
+        decl.add_method(sel!(unmarkText), unmark_text as extern fn(&Object, Sel));
+        decl.add_method(
+            sel!(validAttributesForMarkedText),
+            valid_attributes_for_marked_text as extern fn(&Object, Sel) -> id,
+        );
+        decl.add_method(
+            sel!(attributedSubstringForProposedRange:actualRange:),
+            attributed_substring_for_proposed_range
+                as extern fn(&Object, Sel, NSRange, *mut c_void) -> id,
+        );
+        decl.add_method(
+            sel!(insertText:replacementRange:),
+            insert_text as extern fn(&Object, Sel, id, NSRange),
+        );
+        decl.add_method(
+            sel!(characterIndexForPoint:),
+            character_index_for_point as extern fn(&Object, Sel, NSPoint) -> NSUInteger,
+        );
+        decl.add_method(
+            sel!(firstRectForCharacterRange:actualRange:),
+            first_rect_for_character_range
+                as extern fn(&Object, Sel, NSRange, *mut c_void) -> NSRect,
+        );
+        decl.add_method(
+            sel!(doCommandBySelector:),
+            do_command_by_selector as extern fn(&Object, Sel, Sel),
+        );
+        decl.add_method(sel!(keyDown:), key_down as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(keyUp:), key_up as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(insertTab:), insert_tab as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(insertBackTab:), insert_back_tab as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(mouseDown:), mouse_down as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(mouseUp:), mouse_up as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(rightMouseDown:), right_mouse_down as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(rightMouseUp:), right_mouse_up as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(otherMouseDown:), other_mouse_down as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(otherMouseUp:), other_mouse_up as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(mouseMoved:), mouse_moved as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(mouseDragged:), mouse_dragged as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(rightMouseDragged:), right_mouse_dragged as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(otherMouseDragged:), other_mouse_dragged as extern fn(&Object, Sel, id));
+        decl.add_method(sel!(_wantsKeyDownForEvent:), wants_key_down_for_event as extern fn(&Object, Sel, id) -> BOOL);
+        decl.add_ivar::<*mut c_void>("winitState");
+        decl.add_ivar::<id>("markedText");
+        let protocol = Protocol::get("NSTextInputClient").unwrap();
+        decl.add_protocol(&protocol);
+        ViewClass(decl.register())
+    };
+}
+
+extern fn dealloc(this: &Object, _sel: Sel) {
+    unsafe {
+        let state: *mut c_void = *this.get_ivar("winitState");
+        let marked_text: id = *this.get_ivar("markedText");
+        let _: () = msg_send![marked_text, release];
+        Box::from_raw(state as *mut ViewState);
+    }
+}
+
+extern fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> id {
+    unsafe {
+        let this: id = msg_send![this, init];
+        if this != nil {
+            (*this).set_ivar("winitState", state);
+            let marked_text = <id as NSMutableAttributedString>::init(
+                NSMutableAttributedString::alloc(nil),
+            );
+            (*this).set_ivar("markedText", marked_text);
+        }
+        this
+    }
+}
+
+extern fn draw_rect(this: &Object, _sel: Sel, rect: NSRect) {
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        if let Some(shared) = state.shared.upgrade() {
+            let window_event = Event::WindowEvent {
+                window_id: WindowId(get_window_id(state.window)),
+                event: WindowEvent::Refresh,
+            };
+            shared.pending_events
+                .lock()
+                .unwrap()
+                .push_back(window_event);
+        }
+
+        let superclass = util::superclass(this);
+        let () = msg_send![super(this, superclass), drawRect:rect];
+    }
+}
+
+extern fn reset_cursor_rects(this: &Object, _sel: Sel) {
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        let bounds: NSRect = msg_send![this, bounds];
+        let cursor = state.cursor.lock().unwrap().load();
+        let _: () = msg_send![this,
+            addCursorRect:bounds
+            cursor:cursor
+        ];
+    }
+}
+
+extern fn has_marked_text(this: &Object, _sel: Sel) -> BOOL {
+    //println!("hasMarkedText");
+    unsafe {
+        let marked_text: id = *this.get_ivar("markedText");
+        (marked_text.length() > 0) as i8
+    }
+}
+
+extern fn marked_range(this: &Object, _sel: Sel) -> NSRange {
+    //println!("markedRange");
+    unsafe {
+        let marked_text: id = *this.get_ivar("markedText");
+        let length = marked_text.length();
+        if length > 0 {
+            NSRange::new(0, length - 1)
+        } else {
+            util::EMPTY_RANGE
+        }
+    }
+}
+
+extern fn selected_range(_this: &Object, _sel: Sel) -> NSRange {
+    //println!("selectedRange");
+    util::EMPTY_RANGE
+}
+
+extern fn set_marked_text(
+    this: &mut Object,
+    _sel: Sel,
+    string: id,
+    _selected_range: NSRange,
+    _replacement_range: NSRange,
+) {
+    //println!("setMarkedText");
+    unsafe {
+        let marked_text_ref: &mut id = this.get_mut_ivar("markedText");
+        let _: () = msg_send![(*marked_text_ref), release];
+        let marked_text = NSMutableAttributedString::alloc(nil);
+        let has_attr = msg_send![string, isKindOfClass:class!(NSAttributedString)];
+        if has_attr {
+            marked_text.initWithAttributedString(string);
+        } else {
+            marked_text.initWithString(string);
+        };
+        *marked_text_ref = marked_text;
+    }
+}
+
+extern fn unmark_text(this: &Object, _sel: Sel) {
+    //println!("unmarkText");
+    unsafe {
+        let marked_text: id = *this.get_ivar("markedText");
+        let mutable_string = marked_text.mutableString();
+        let _: () = msg_send![mutable_string, setString:""];
+        let input_context: id = msg_send![this, inputContext];
+        let _: () = msg_send![input_context, discardMarkedText];
+    }
+}
+
+extern fn valid_attributes_for_marked_text(_this: &Object, _sel: Sel) -> id {
+    //println!("validAttributesForMarkedText");
+    unsafe { msg_send![class!(NSArray), array] }
+}
+
+extern fn attributed_substring_for_proposed_range(
+    _this: &Object,
+    _sel: Sel,
+    _range: NSRange,
+    _actual_range: *mut c_void, // *mut NSRange
+) -> id {
+    //println!("attributedSubstringForProposedRange");
+    nil
+}
+
+extern fn character_index_for_point(_this: &Object, _sel: Sel, _point: NSPoint) -> NSUInteger {
+    //println!("characterIndexForPoint");
+    0
+}
+
+extern fn first_rect_for_character_range(
+    this: &Object,
+    _sel: Sel,
+    _range: NSRange,
+    _actual_range: *mut c_void, // *mut NSRange
+) -> NSRect {
+    //println!("firstRectForCharacterRange");
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+        let (x, y) = state.ime_spot.unwrap_or_else(|| {
+            let content_rect = NSWindow::contentRectForFrameRect_(
+                state.window,
+                NSWindow::frame(state.window),
+            );
+            let x = content_rect.origin.x;
+            let y = util::bottom_left_to_top_left(content_rect);
+            (x, y)
+        });
+
+        NSRect::new(
+            NSPoint::new(x as _, y as _),
+            NSSize::new(0.0, 0.0),
+        )
+    }
+}
+
+extern fn insert_text(this: &Object, _sel: Sel, string: id, _replacement_range: NSRange) {
+    //println!("insertText");
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        let has_attr = msg_send![string, isKindOfClass:class!(NSAttributedString)];
+        let characters = if has_attr {
+            // This is a *mut NSAttributedString
+            msg_send![string, string]
+        } else {
+            // This is already a *mut NSString
+            string
+        };
+
+        let slice = slice::from_raw_parts(
+            characters.UTF8String() as *const c_uchar,
+            characters.len(),
+        );
+        let string = str::from_utf8_unchecked(slice);
+        state.is_key_down = true;
+
+        // We don't need this now, but it's here if that changes.
+        //let event: id = msg_send![class!(NSApp), currentEvent];
+
+        let mut events = VecDeque::with_capacity(characters.len());
+        for character in string.chars() {
+            events.push_back(Event::WindowEvent {
+                window_id: WindowId(get_window_id(state.window)),
+                event: WindowEvent::ReceivedCharacter(character),
+            });
+        }
+
+        if let Some(shared) = state.shared.upgrade() {
+            shared.pending_events
+                .lock()
+                .unwrap()
+                .append(&mut events);
+        }
+    }
+}
+
+extern fn do_command_by_selector(this: &Object, _sel: Sel, command: Sel) {
+    //println!("doCommandBySelector");
+    // Basically, we're sent this message whenever a keyboard event that doesn't generate a "human readable" character
+    // happens, i.e. newlines, tabs, and Ctrl+C.
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        let shared = if let Some(shared) = state.shared.upgrade() {
+            shared
+        } else {
+            return;
+        };
+
+        let mut events = VecDeque::with_capacity(1);
+        if command == sel!(insertNewline:) {
+            // The `else` condition would emit the same character, but I'm keeping this here both...
+            // 1) as a reminder for how `doCommandBySelector` works
+            // 2) to make our use of carriage return explicit
+            events.push_back(Event::WindowEvent {
+                window_id: WindowId(get_window_id(state.window)),
+                event: WindowEvent::ReceivedCharacter('\r'),
+            });
+        } else {
+            let raw_characters = state.raw_characters.take();
+            if let Some(raw_characters) = raw_characters {
+                for character in raw_characters.chars() {
+                    events.push_back(Event::WindowEvent {
+                        window_id: WindowId(get_window_id(state.window)),
+                        event: WindowEvent::ReceivedCharacter(character),
+                    });
+                }
+            }
+        };
+
+        shared.pending_events
+            .lock()
+            .unwrap()
+            .append(&mut events);
+    }
+}
+
+fn get_characters(event: id, ignore_modifiers: bool) -> String {
+    unsafe {
+        let characters: id = if ignore_modifiers {
+            msg_send![event, charactersIgnoringModifiers]
+        } else {
+            msg_send![event, characters]
+        };
+
+        assert_ne!(characters, nil);
+        let slice = slice::from_raw_parts(
+            characters.UTF8String() as *const c_uchar,
+            characters.len(),
+        );
+
+        let string = str::from_utf8_unchecked(slice);
+
+        string.to_owned()
+    }
+}
+
+// Retrieves a layout-independent keycode given an event.
+fn retrieve_keycode(event: id) -> Option<events::VirtualKeyCode> {
+    #[inline]
+    fn get_code(ev: id, raw: bool) -> Option<events::VirtualKeyCode> {
+        let characters = get_characters(ev, raw);
+        characters.chars().next().map_or(None, |c| char_to_keycode(c))
+    }
+
+    // Cmd switches Roman letters for Dvorak-QWERTY layout, so we try modified characters first.
+    // If we don't get a match, then we fall back to unmodified characters.
+    let code = get_code(event, false)
+        .or_else(|| {
+            get_code(event, true)
+        });
+
+    // We've checked all layout related keys, so fall through to scancode.
+    // Reaching this code means that the key is layout-independent (e.g. Backspace, Return).
+    //
+    // We're additionally checking here for F21-F24 keys, since their keycode
+    // can vary, but we know that they are encoded
+    // in characters property.
+    code.or_else(|| {
+        let scancode = get_scancode(event);
+        scancode_to_keycode(scancode)
+            .or_else(|| {
+                check_function_keys(&get_characters(event, true))
+            })
+    })
+}
+
+extern fn key_down(this: &Object, _sel: Sel, event: id) {
+    //println!("keyDown");
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+        let window_id = WindowId(get_window_id(state.window));
+        let characters = get_characters(event, false);
+
+        state.raw_characters = Some(characters.clone());
+
+        let scancode = get_scancode(event) as u32;
+        let virtual_keycode = retrieve_keycode(event);
+        let is_repeat = msg_send![event, isARepeat];
+
+        let window_event = Event::WindowEvent {
+            window_id,
+            event: WindowEvent::KeyboardInput {
+                device_id: DEVICE_ID,
+                input: KeyboardInput {
+                    state: ElementState::Pressed,
+                    scancode,
+                    virtual_keycode,
+                    modifiers: event_mods(event),
+                },
+            },
+        };
+
+        if let Some(shared) = state.shared.upgrade() {
+            shared.pending_events
+                .lock()
+                .unwrap()
+                .push_back(window_event);
+            // Emit `ReceivedCharacter` for key repeats
+            if is_repeat && state.is_key_down{
+                for character in characters.chars() {
+                    let window_event = Event::WindowEvent {
+                        window_id,
+                        event: WindowEvent::ReceivedCharacter(character),
+                    };
+                    shared.pending_events
+                        .lock()
+                        .unwrap()
+                        .push_back(window_event);
+                }
+            } else {
+                // Some keys (and only *some*, with no known reason) don't trigger `insertText`, while others do...
+                // So, we don't give repeats the opportunity to trigger that, since otherwise our hack will cause some
+                // keys to generate twice as many characters.
+                let array: id = msg_send![class!(NSArray), arrayWithObject:event];
+                let (): _ = msg_send![this, interpretKeyEvents:array];
+            }
+        }
+    }
+}
+
+extern fn key_up(this: &Object, _sel: Sel, event: id) {
+    //println!("keyUp");
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        state.is_key_down = false;
+
+        let scancode = get_scancode(event) as u32;
+        let virtual_keycode = retrieve_keycode(event);
+
+        let window_event = Event::WindowEvent {
+            window_id: WindowId(get_window_id(state.window)),
+            event: WindowEvent::KeyboardInput {
+                device_id: DEVICE_ID,
+                input: KeyboardInput {
+                    state: ElementState::Released,
+                    scancode,
+                    virtual_keycode,
+                    modifiers: event_mods(event),
+                },
+            },
+        };
+
+        if let Some(shared) = state.shared.upgrade() {
+            shared.pending_events
+                .lock()
+                .unwrap()
+                .push_back(window_event);
+        }
+    }
+}
+
+extern fn insert_tab(this: &Object, _sel: Sel, _sender: id) {
+    unsafe {
+        let window: id = msg_send![this, window];
+        let first_responder: id = msg_send![window, firstResponder];
+        let this_ptr = this as *const _ as *mut _;
+        if first_responder == this_ptr {
+            let (): _ = msg_send![window, selectNextKeyView:this];
+        }
+    }
+}
+
+extern fn insert_back_tab(this: &Object, _sel: Sel, _sender: id) {
+    unsafe {
+        let window: id = msg_send![this, window];
+        let first_responder: id = msg_send![window, firstResponder];
+        let this_ptr = this as *const _ as *mut _;
+        if first_responder == this_ptr {
+            let (): _ = msg_send![window, selectPreviousKeyView:this];
+        }
+    }
+}
+
+fn mouse_click(this: &Object, event: id, button: MouseButton, button_state: ElementState) {
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        let window_event = Event::WindowEvent {
+            window_id: WindowId(get_window_id(state.window)),
+            event: WindowEvent::MouseInput {
+                device_id: DEVICE_ID,
+                state: button_state,
+                button,
+                modifiers: event_mods(event),
+            },
+        };
+
+        if let Some(shared) = state.shared.upgrade() {
+            shared.pending_events
+                .lock()
+                .unwrap()
+                .push_back(window_event);
+        }
+    }
+}
+
+extern fn mouse_down(this: &Object, _sel: Sel, event: id) {
+    mouse_click(this, event, MouseButton::Left, ElementState::Pressed);
+}
+
+extern fn mouse_up(this: &Object, _sel: Sel, event: id) {
+    mouse_click(this, event, MouseButton::Left, ElementState::Released);
+}
+
+extern fn right_mouse_down(this: &Object, _sel: Sel, event: id) {
+    mouse_click(this, event, MouseButton::Right, ElementState::Pressed);
+}
+
+extern fn right_mouse_up(this: &Object, _sel: Sel, event: id) {
+    mouse_click(this, event, MouseButton::Right, ElementState::Released);
+}
+
+extern fn other_mouse_down(this: &Object, _sel: Sel, event: id) {
+    mouse_click(this, event, MouseButton::Middle, ElementState::Pressed);
+}
+
+extern fn other_mouse_up(this: &Object, _sel: Sel, event: id) {
+    mouse_click(this, event, MouseButton::Middle, ElementState::Released);
+}
+
+fn mouse_motion(this: &Object, event: id) {
+    unsafe {
+        let state_ptr: *mut c_void = *this.get_ivar("winitState");
+        let state = &mut *(state_ptr as *mut ViewState);
+
+        // We have to do this to have access to the `NSView` trait...
+        let view: id = this as *const _ as *mut _;
+
+        let window_point = event.locationInWindow();
+        let view_point = view.convertPoint_fromView_(window_point, nil);
+        let view_rect = NSView::frame(view);
+
+        if view_point.x.is_sign_negative()
+        || view_point.y.is_sign_negative()
+        || view_point.x > view_rect.size.width
+        || view_point.y > view_rect.size.height {
+            // Point is outside of the client area (view)
+            return;
+        }
+
+        let x = view_point.x as f64;
+        let y = view_rect.size.height as f64 - view_point.y as f64;
+
+        let window_event = Event::WindowEvent {
+            window_id: WindowId(get_window_id(state.window)),
+            event: WindowEvent::CursorMoved {
+                device_id: DEVICE_ID,
+                position: (x, y).into(),
+                modifiers: event_mods(event),
+            },
+        };
+
+        if let Some(shared) = state.shared.upgrade() {
+            shared.pending_events
+                .lock()
+                .unwrap()
+                .push_back(window_event);
+        }
+    }
+}
+
+extern fn mouse_moved(this: &Object, _sel: Sel, event: id) {
+    mouse_motion(this, event);
+}
+
+extern fn mouse_dragged(this: &Object, _sel: Sel, event: id) {
+    mouse_motion(this, event);
+}
+
+extern fn right_mouse_dragged(this: &Object, _sel: Sel, event: id) {
+    mouse_motion(this, event);
+}
+
+extern fn other_mouse_dragged(this: &Object, _sel: Sel, event: id) {
+    mouse_motion(this, event);
+}
+
+// https://github.com/chromium/chromium/blob/a86a8a6bcfa438fa3ac2eba6f02b3ad1f8e0756f/ui/views/cocoa/bridged_content_view.mm#L816
+extern fn wants_key_down_for_event(_this: &Object, _se: Sel, _event: id) -> BOOL {
+    YES
+}

src/platform/mod.rs

@@ -1,23 +1,26 @@
-//! Contains traits with platform-specific methods in them.
-//!
-//! Contains the follow OS-specific modules:
-//!
-//!  - `android`
-//!  - `ios`
-//!  - `macos`
-//!  - `unix`
-//!  - `windows`
-//!
-//! And the following platform-specific module:
-//!
-//! - `desktop` (available on `windows`, `unix`, and `macos`)
-//!
-//! However only the module corresponding to the platform you're compiling to will be available.
+pub use self::platform::*;
 
-pub mod android;
-pub mod ios;
-pub mod macos;
-pub mod unix;
-pub mod windows;
+#[cfg(target_os = "windows")]
+#[path="windows/mod.rs"]
+mod platform;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+#[path="linux/mod.rs"]
+mod platform;
+#[cfg(target_os = "macos")]
+#[path="macos/mod.rs"]
+mod platform;
+#[cfg(target_os = "android")]
+#[path="android/mod.rs"]
+mod platform;
+#[cfg(target_os = "ios")]
+#[path="ios/mod.rs"]
+mod platform;
+#[cfg(target_os = "emscripten")]
+#[path="emscripten/mod.rs"]
+mod platform;
 
-pub mod desktop;
+#[cfg(all(not(target_os = "ios"), not(target_os = "windows"), not(target_os = "linux"),
+  not(target_os = "macos"), not(target_os = "android"), not(target_os = "dragonfly"),
+  not(target_os = "freebsd"), not(target_os = "netbsd"), not(target_os = "openbsd"),
+  not(target_os = "emscripten")))]
+compile_error!("The platform you're compiling for is not supported by winit");

src/platform/windows/dpi.rs

@@ -1,43 +1,45 @@
 #![allow(non_snake_case, unused_unsafe)]
 
-use std::{
-    mem,
-    os::raw::c_void,
-    sync::{Once, ONCE_INIT},
-};
+use std::mem;
+use std::os::raw::c_void;
+use std::sync::{Once, ONCE_INIT};
 
-use winapi::{
-    shared::{
-        minwindef::{BOOL, FALSE, UINT},
-        windef::{DPI_AWARENESS_CONTEXT, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, HMONITOR, HWND},
-        winerror::S_OK,
-    },
-    um::{
-        libloaderapi::{GetProcAddress, LoadLibraryA},
-        shellscalingapi::{
-            MDT_EFFECTIVE_DPI, MONITOR_DPI_TYPE, PROCESS_DPI_AWARENESS,
-            PROCESS_PER_MONITOR_DPI_AWARE,
-        },
-        wingdi::{GetDeviceCaps, LOGPIXELSX},
-        winnt::{HRESULT, LPCSTR},
-        winuser::{self, MONITOR_DEFAULTTONEAREST},
-    },
+use winapi::shared::minwindef::{BOOL, UINT, FALSE};
+use winapi::shared::windef::{
+    DPI_AWARENESS_CONTEXT,
+    DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE,
+    HMONITOR,
+    HWND,
 };
+use winapi::shared::winerror::S_OK;
+use winapi::um::libloaderapi::{GetProcAddress, LoadLibraryA};
+use winapi::um::shellscalingapi::{
+    MDT_EFFECTIVE_DPI,
+    MONITOR_DPI_TYPE,
+    PROCESS_DPI_AWARENESS,
+    PROCESS_PER_MONITOR_DPI_AWARE,
+};
+use winapi::um::wingdi::{GetDeviceCaps, LOGPIXELSX};
+use winapi::um::winnt::{HRESULT, LPCSTR};
+use winapi::um::winuser::{self, MONITOR_DEFAULTTONEAREST};
 
 const DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: DPI_AWARENESS_CONTEXT = -4isize as _;
 
-type SetProcessDPIAware = unsafe extern "system" fn() -> BOOL;
-type SetProcessDpiAwareness = unsafe extern "system" fn(value: PROCESS_DPI_AWARENESS) -> HRESULT;
-type SetProcessDpiAwarenessContext =
-    unsafe extern "system" fn(value: DPI_AWARENESS_CONTEXT) -> BOOL;
-type GetDpiForWindow = unsafe extern "system" fn(hwnd: HWND) -> UINT;
-type GetDpiForMonitor = unsafe extern "system" fn(
+type SetProcessDPIAware = unsafe extern "system" fn () -> BOOL;
+type SetProcessDpiAwareness = unsafe extern "system" fn (
+    value: PROCESS_DPI_AWARENESS,
+) -> HRESULT;
+type SetProcessDpiAwarenessContext = unsafe extern "system" fn (
+    value: DPI_AWARENESS_CONTEXT,
+) -> BOOL;
+type GetDpiForWindow = unsafe extern "system" fn (hwnd: HWND) -> UINT;
+type GetDpiForMonitor = unsafe extern "system" fn (
     hmonitor: HMONITOR,
     dpi_type: MONITOR_DPI_TYPE,
     dpi_x: *mut UINT,
     dpi_y: *mut UINT,
 ) -> HRESULT;
-type EnableNonClientDpiScaling = unsafe extern "system" fn(hwnd: HWND) -> BOOL;
+type EnableNonClientDpiScaling = unsafe extern "system" fn (hwnd: HWND) -> BOOL;
 
 // Helper function to dynamically load function pointer.
 // `library` and `function` must be zero-terminated.
@@ -63,48 +65,53 @@ macro_rules! get_function {
     ($lib:expr, $func:ident) => {
         get_function_impl(concat!($lib, '\0'), concat!(stringify!($func), '\0'))
             .map(|f| unsafe { mem::transmute::<*const _, $func>(f) })
-    };
+    }
 }
 
 lazy_static! {
-    static ref GET_DPI_FOR_WINDOW: Option<GetDpiForWindow> =
-        get_function!("user32.dll", GetDpiForWindow);
-    static ref GET_DPI_FOR_MONITOR: Option<GetDpiForMonitor> =
-        get_function!("shcore.dll", GetDpiForMonitor);
-    static ref ENABLE_NON_CLIENT_DPI_SCALING: Option<EnableNonClientDpiScaling> =
-        get_function!("user32.dll", EnableNonClientDpiScaling);
+    static ref GET_DPI_FOR_WINDOW: Option<GetDpiForWindow> = get_function!(
+        "user32.dll",
+        GetDpiForWindow
+    );
+    static ref GET_DPI_FOR_MONITOR: Option<GetDpiForMonitor> = get_function!(
+        "shcore.dll",
+        GetDpiForMonitor
+    );
+    static ref ENABLE_NON_CLIENT_DPI_SCALING: Option<EnableNonClientDpiScaling> = get_function!(
+        "user32.dll",
+        EnableNonClientDpiScaling
+    );
 }
 
 pub fn become_dpi_aware(enable: bool) {
-    if !enable {
-        return;
-    }
+    if !enable { return; }
     static ENABLE_DPI_AWARENESS: Once = ONCE_INIT;
-    ENABLE_DPI_AWARENESS.call_once(|| {
-        unsafe {
-            if let Some(SetProcessDpiAwarenessContext) =
-                get_function!("user32.dll", SetProcessDpiAwarenessContext)
-            {
-                // We are on Windows 10 Anniversary Update (1607) or later.
-                if SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)
-                    == FALSE
-                {
-                    // V2 only works with Windows 10 Creators Update (1703). Try using the older
-                    // V1 if we can't set V2.
-                    SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE);
-                }
-            } else if let Some(SetProcessDpiAwareness) =
-                get_function!("shcore.dll", SetProcessDpiAwareness)
-            {
-                // We are on Windows 8.1 or later.
-                SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
-            } else if let Some(SetProcessDPIAware) = get_function!("user32.dll", SetProcessDPIAware)
-            {
-                // We are on Vista or later.
-                SetProcessDPIAware();
+    ENABLE_DPI_AWARENESS.call_once(|| { unsafe {
+        if let Some(SetProcessDpiAwarenessContext) = get_function!(
+            "user32.dll",
+            SetProcessDpiAwarenessContext
+        ) {
+            // We are on Windows 10 Anniversary Update (1607) or later.
+            if SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)
+            == FALSE {
+                // V2 only works with Windows 10 Creators Update (1703). Try using the older
+                // V1 if we can't set V2.
+                SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE);
             }
+        } else if let Some(SetProcessDpiAwareness) = get_function!(
+            "shcore.dll",
+            SetProcessDpiAwareness
+        ) {
+            // We are on Windows 8.1 or later.
+            SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
+        } else if let Some(SetProcessDPIAware) = get_function!(
+            "user32.dll",
+            SetProcessDPIAware
+        ) {
+            // We are on Vista or later.
+            SetProcessDPIAware();
         }
-    });
+    } });
 }
 
 pub fn enable_non_client_dpi_scaling(hwnd: HWND) {
@@ -125,7 +132,7 @@ pub fn get_monitor_dpi(hmonitor: HMONITOR) -> Option<u32> {
                 // MSDN says that "the values of *dpiX and *dpiY are identical. You only need to
                 // record one of the values to determine the DPI and respond appropriately".
                 // https://msdn.microsoft.com/en-us/library/windows/desktop/dn280510(v=vs.85).aspx
-                return Some(dpi_x as u32);
+                return Some(dpi_x as u32)
             }
         }
     }
@@ -137,7 +144,7 @@ pub fn dpi_to_scale_factor(dpi: u32) -> f64 {
     dpi as f64 / BASE_DPI as f64
 }
 
-pub unsafe fn hwnd_dpi(hwnd: HWND) -> u32 {
+pub unsafe fn get_hwnd_dpi(hwnd: HWND) -> u32 {
     let hdc = winuser::GetDC(hwnd);
     if hdc.is_null() {
         panic!("[winit] `GetDC` returned null!");
@@ -177,6 +184,6 @@ pub unsafe fn hwnd_dpi(hwnd: HWND) -> u32 {
     }
 }
 
-pub fn hwnd_scale_factor(hwnd: HWND) -> f64 {
-    dpi_to_scale_factor(unsafe { hwnd_dpi(hwnd) })
+pub fn get_hwnd_scale_factor(hwnd: HWND) -> f64 {
+    dpi_to_scale_factor(unsafe { get_hwnd_dpi(hwnd) })
 }

src/platform/windows/drop_handler.rs

@@ -1,40 +1,31 @@
-use std::{
-    ffi::OsString,
-    mem,
-    os::windows::ffi::OsStringExt,
-    path::PathBuf,
-    ptr,
-    sync::atomic::{AtomicUsize, Ordering},
-};
+use std::ffi::OsString;
+use std::os::windows::ffi::OsStringExt;
+use std::path::PathBuf;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::{mem, ptr};
 
-use winapi::{
-    ctypes::c_void,
-    shared::{
-        guiddef::REFIID,
-        minwindef::{DWORD, MAX_PATH, UINT, ULONG},
-        windef::{HWND, POINTL},
-        winerror::S_OK,
-    },
-    um::{
-        objidl::IDataObject,
-        oleidl::{IDropTarget, IDropTargetVtbl, DROPEFFECT_COPY, DROPEFFECT_NONE},
-        shellapi, unknwnbase,
-        winnt::HRESULT,
-    },
-};
+use winapi::ctypes::c_void;
+use winapi::shared::guiddef::REFIID;
+use winapi::shared::minwindef::{DWORD, MAX_PATH, UINT, ULONG};
+use winapi::shared::windef::{HWND, POINTL};
+use winapi::shared::winerror::S_OK;
+use winapi::um::objidl::IDataObject;
+use winapi::um::oleidl::{DROPEFFECT_COPY, DROPEFFECT_NONE, IDropTarget, IDropTargetVtbl};
+use winapi::um::winnt::HRESULT;
+use winapi::um::{shellapi, unknwnbase};
 
-use crate::platform_impl::platform::WindowId;
+use platform::platform::events_loop::send_event;
+use platform::platform::WindowId;
 
-use crate::{event::Event, window::WindowId as SuperWindowId};
+use {Event, WindowId as SuperWindowId};
 
 #[repr(C)]
 pub struct FileDropHandlerData {
     pub interface: IDropTarget,
     refcount: AtomicUsize,
     window: HWND,
-    send_event: Box<dyn Fn(Event<()>)>,
     cursor_effect: DWORD,
-    hovered_is_valid: bool, /* If the currently hovered item is not valid there must not be any `HoveredFileCancelled` emitted */
+    hovered_is_valid: bool, // If the currently hovered item is not valid there must not be any `HoveredFileCancelled` emitted
 }
 
 pub struct FileDropHandler {
@@ -43,14 +34,13 @@ pub struct FileDropHandler {
 
 #[allow(non_snake_case)]
 impl FileDropHandler {
-    pub fn new(window: HWND, send_event: Box<dyn Fn(Event<()>)>) -> FileDropHandler {
+    pub fn new(window: HWND) -> FileDropHandler {
         let data = Box::new(FileDropHandlerData {
             interface: IDropTarget {
                 lpVtbl: &DROP_TARGET_VTBL as *const IDropTargetVtbl,
             },
             refcount: AtomicUsize::new(1),
             window,
-            send_event,
             cursor_effect: DROPEFFECT_NONE,
             hovered_is_valid: false,
         });
@@ -93,10 +83,10 @@ impl FileDropHandler {
         _pt: *const POINTL,
         pdwEffect: *mut DWORD,
     ) -> HRESULT {
-        use crate::event::WindowEvent::HoveredFile;
+        use events::WindowEvent::HoveredFile;
         let drop_handler = Self::from_interface(this);
         let hdrop = Self::iterate_filenames(pDataObj, |filename| {
-            drop_handler.send_event(Event::WindowEvent {
+            send_event(Event::WindowEvent {
                 window_id: SuperWindowId(WindowId(drop_handler.window)),
                 event: HoveredFile(filename),
             });
@@ -125,10 +115,10 @@ impl FileDropHandler {
     }
 
     pub unsafe extern "system" fn DragLeave(this: *mut IDropTarget) -> HRESULT {
-        use crate::event::WindowEvent::HoveredFileCancelled;
+        use events::WindowEvent::HoveredFileCancelled;
         let drop_handler = Self::from_interface(this);
         if drop_handler.hovered_is_valid {
-            drop_handler.send_event(Event::WindowEvent {
+            send_event(Event::WindowEvent {
                 window_id: SuperWindowId(WindowId(drop_handler.window)),
                 event: HoveredFileCancelled,
             });
@@ -144,10 +134,10 @@ impl FileDropHandler {
         _pt: *const POINTL,
         _pdwEffect: *mut DWORD,
     ) -> HRESULT {
-        use crate::event::WindowEvent::DroppedFile;
+        use events::WindowEvent::DroppedFile;
         let drop_handler = Self::from_interface(this);
         let hdrop = Self::iterate_filenames(pDataObj, |filename| {
-            drop_handler.send_event(Event::WindowEvent {
+            send_event(Event::WindowEvent {
                 window_id: SuperWindowId(WindowId(drop_handler.window)),
                 event: DroppedFile(filename),
             });
@@ -163,25 +153,16 @@ impl FileDropHandler {
         &mut *(this as *mut _)
     }
 
-    unsafe fn iterate_filenames<F>(
-        data_obj: *const IDataObject,
-        callback: F,
-    ) -> Option<shellapi::HDROP>
+    unsafe fn iterate_filenames<F>(data_obj: *const IDataObject, callback: F) -> Option<shellapi::HDROP>
     where
         F: Fn(PathBuf),
     {
-        use winapi::{
-            ctypes::wchar_t,
-            shared::{
-                winerror::{DV_E_FORMATETC, SUCCEEDED},
-                wtypes::{CLIPFORMAT, DVASPECT_CONTENT},
-            },
-            um::{
-                objidl::{FORMATETC, TYMED_HGLOBAL},
-                shellapi::DragQueryFileW,
-                winuser::CF_HDROP,
-            },
-        };
+        use winapi::ctypes::wchar_t;
+        use winapi::shared::winerror::{SUCCEEDED, DV_E_FORMATETC};
+        use winapi::shared::wtypes::{CLIPFORMAT, DVASPECT_CONTENT};
+        use winapi::um::objidl::{FORMATETC, TYMED_HGLOBAL};
+        use winapi::um::shellapi::DragQueryFileW;
+        use winapi::um::winuser::CF_HDROP;
 
         let mut drop_format = FORMATETC {
             cfFormat: CF_HDROP as CLIPFORMAT,
@@ -224,12 +205,6 @@ impl FileDropHandler {
     }
 }
 
-impl FileDropHandlerData {
-    fn send_event(&self, event: Event<()>) {
-        (self.send_event)(event);
-    }
-}
-
 impl Drop for FileDropHandler {
     fn drop(&mut self) {
         unsafe {

src/platform/windows/event.rs

@@ -1,19 +1,19 @@
-use std::{
-    char,
-    os::raw::c_int,
-    ptr,
-    sync::atomic::{AtomicBool, AtomicPtr, Ordering},
-};
+use std::{char, ptr};
+use std::os::raw::c_int;
+use std::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
 
-use crate::event::{ModifiersState, ScanCode, VirtualKeyCode};
+use events::VirtualKeyCode;
+use events::ModifiersState;
 
-use winapi::{
-    shared::minwindef::{HKL, HKL__, LPARAM, UINT, WPARAM},
-    um::winuser,
-};
+use winapi::shared::minwindef::{WPARAM, LPARAM, UINT, HKL, HKL__};
+use winapi::um::winuser;
+
+use ScanCode;
 
 fn key_pressed(vkey: c_int) -> bool {
-    unsafe { (winuser::GetKeyState(vkey) & (1 << 15)) == (1 << 15) }
+    unsafe {
+        (winuser::GetKeyState(vkey) & (1 << 15)) == (1 << 15)
+    }
 }
 
 pub fn get_key_mods() -> ModifiersState {
@@ -29,19 +29,9 @@ pub fn get_key_mods() -> ModifiersState {
 
 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(
-        v_key,
-        0,
-        keyboard_state.as_ptr(),
-        unicode_bytes.as_mut_ptr(),
-        unicode_bytes.len() as _,
-        0,
-        hkl,
-    );
+    let len = winuser::ToUnicodeEx(v_key, 0, keyboard_state.as_ptr(), unicode_bytes.as_mut_ptr(), unicode_bytes.len() as _, 0, hkl);
     if len >= 1 {
-        char::decode_utf16(unicode_bytes.into_iter().cloned())
-            .next()
-            .and_then(|c| c.ok())
+        char::decode_utf16(unicode_bytes.into_iter().cloned()).next().and_then(|c| c.ok())
     } else {
         None
     }
@@ -252,7 +242,7 @@ pub fn vkey_to_winit_vkey(vkey: c_int) -> Option<VirtualKeyCode> {
         winuser::VK_OEM_5 => map_text_keys(vkey),
         winuser::VK_OEM_6 => map_text_keys(vkey),
         winuser::VK_OEM_7 => map_text_keys(vkey),
-        /* winuser::VK_OEM_8 => Some(VirtualKeyCode::Oem_8), */
+        /*winuser::VK_OEM_8 => Some(VirtualKeyCode::Oem_8), */
         winuser::VK_OEM_102 => Some(VirtualKeyCode::OEM102),
         /*winuser::VK_PROCESSKEY => Some(VirtualKeyCode::Processkey),
         winuser::VK_PACKET => Some(VirtualKeyCode::Packet),
@@ -265,61 +255,49 @@ pub fn vkey_to_winit_vkey(vkey: c_int) -> Option<VirtualKeyCode> {
         winuser::VK_NONAME => Some(VirtualKeyCode::Noname),
         winuser::VK_PA1 => Some(VirtualKeyCode::Pa1),
         winuser::VK_OEM_CLEAR => Some(VirtualKeyCode::Oem_clear),*/
-        _ => None,
+        _ => None
     }
 }
 
-pub fn handle_extended_keys(
-    vkey: c_int,
-    mut scancode: UINT,
-    extended: bool,
-) -> Option<(c_int, UINT)> {
+pub fn handle_extended_keys(vkey: c_int, mut scancode: UINT, extended: bool) -> Option<(c_int, UINT)> {
     // Welcome to hell https://blog.molecular-matters.com/2011/09/05/properly-handling-keyboard-input/
     let vkey = match vkey {
-        winuser::VK_SHIFT => unsafe {
-            winuser::MapVirtualKeyA(scancode, winuser::MAPVK_VSC_TO_VK_EX) as _
+        winuser::VK_SHIFT => unsafe { winuser::MapVirtualKeyA(
+            scancode,
+            winuser::MAPVK_VSC_TO_VK_EX,
+        ) as _ },
+        winuser::VK_CONTROL => if extended {
+            winuser::VK_RCONTROL
+        } else {
+            winuser::VK_LCONTROL
         },
-        winuser::VK_CONTROL => {
-            if extended {
-                winuser::VK_RCONTROL
-            } else {
-                winuser::VK_LCONTROL
-            }
+        winuser::VK_MENU => if extended {
+            winuser::VK_RMENU
+        } else {
+            winuser::VK_LMENU
         },
-        winuser::VK_MENU => {
-            if extended {
-                winuser::VK_RMENU
-            } else {
-                winuser::VK_LMENU
-            }
-        },
-        _ => {
-            match scancode {
-                // This is only triggered when using raw input. Without this check, we get two events whenever VK_PAUSE is
-                // pressed, the first one having scancode 0x1D but vkey VK_PAUSE...
-                0x1D if vkey == winuser::VK_PAUSE => return None,
-                // ...and the second having scancode 0x45 but an unmatched vkey!
-                0x45 => winuser::VK_PAUSE,
-                // VK_PAUSE and VK_SCROLL have the same scancode when using modifiers, alongside incorrect vkey values.
-                0x46 => {
-                    if extended {
-                        scancode = 0x45;
-                        winuser::VK_PAUSE
-                    } else {
-                        winuser::VK_SCROLL
-                    }
-                },
-                _ => vkey,
-            }
+        _ => match scancode {
+            // This is only triggered when using raw input. Without this check, we get two events whenever VK_PAUSE is
+            // pressed, the first one having scancode 0x1D but vkey VK_PAUSE...
+            0x1D if vkey == winuser::VK_PAUSE => return None,
+            // ...and the second having scancode 0x45 but an unmatched vkey!
+            0x45 => winuser::VK_PAUSE,
+            // VK_PAUSE and VK_SCROLL have the same scancode when using modifiers, alongside incorrect vkey values.
+            0x46 => {
+                if extended {
+                    scancode = 0x45;
+                    winuser::VK_PAUSE
+                } else {
+                    winuser::VK_SCROLL
+                }
+            },
+            _ => vkey,
         },
     };
     Some((vkey, scancode))
 }
 
-pub fn process_key_params(
-    wparam: WPARAM,
-    lparam: LPARAM,
-) -> Option<(ScanCode, Option<VirtualKeyCode>)> {
+pub fn process_key_params(wparam: WPARAM, lparam: LPARAM) -> Option<(ScanCode, Option<VirtualKeyCode>)> {
     let scancode = ((lparam >> 16) & 0xff) as UINT;
     let extended = (lparam & 0x01000000) != 0;
     handle_extended_keys(wparam as _, scancode, extended)
@@ -329,9 +307,7 @@ pub fn process_key_params(
 // This is needed as windows doesn't properly distinguish
 // some virtual key codes for different keyboard layouts
 fn map_text_keys(win_virtual_key: i32) -> Option<VirtualKeyCode> {
-    let char_key =
-        unsafe { winuser::MapVirtualKeyA(win_virtual_key as u32, winuser::MAPVK_VK_TO_CHAR) }
-            & 0x7FFF;
+    let char_key = unsafe { winuser::MapVirtualKeyA(win_virtual_key as u32, winuser::MAPVK_VK_TO_CHAR) } & 0x7FFF;
     match char::from_u32(char_key) {
         Some(';') => Some(VirtualKeyCode::Semicolon),
         Some('/') => Some(VirtualKeyCode::Slash),
@@ -340,6 +316,6 @@ fn map_text_keys(win_virtual_key: i32) -> Option<VirtualKeyCode> {
         Some(']') => Some(VirtualKeyCode::RBracket),
         Some('\'') => Some(VirtualKeyCode::Apostrophe),
         Some('\\') => Some(VirtualKeyCode::Backslash),
-        _ => None,
+        _ => None
     }
 }

src/platform/windows/icon.rs

@@ -1,15 +1,14 @@
-use std::{io, mem, os::windows::ffi::OsStrExt, path::Path, ptr};
+use std::{self, mem, ptr};
+use std::os::windows::ffi::OsStrExt;
+use std::path::Path;
 
-use winapi::{
-    ctypes::{c_int, wchar_t},
-    shared::{
-        minwindef::{BYTE, LPARAM, WPARAM},
-        windef::{HICON, HWND},
-    },
-    um::winuser,
-};
+use winapi::ctypes::{c_int, wchar_t};
+use winapi::shared::minwindef::{BYTE, LPARAM, WPARAM};
+use winapi::shared::windef::{HICON, HWND};
+use winapi::um::winuser;
 
-use crate::icon::{Icon, Pixel, PIXEL_SIZE};
+use {Pixel, PIXEL_SIZE, Icon};
+use platform::platform::util;
 
 impl Pixel {
     fn to_bgra(&mut self) {
@@ -32,7 +31,7 @@ unsafe impl Send for WinIcon {}
 
 impl WinIcon {
     #[allow(dead_code)]
-    pub fn from_path<P: AsRef<Path>>(path: P) -> Result<Self, io::Error> {
+    pub fn from_path<P: AsRef<Path>>(path: P) -> Result<Self, util::WinError> {
         let wide_path: Vec<u16> = path.as_ref().as_os_str().encode_wide().collect();
         let handle = unsafe {
             winuser::LoadImageW(
@@ -47,15 +46,15 @@ impl WinIcon {
         if !handle.is_null() {
             Ok(WinIcon { handle })
         } else {
-            Err(io::Error::last_os_error())
+            Err(util::WinError::from_last_error())
         }
     }
 
-    pub fn from_icon(icon: Icon) -> Result<Self, io::Error> {
+    pub fn from_icon(icon: Icon) -> Result<Self, util::WinError> {
         Self::from_rgba(icon.rgba, icon.width, icon.height)
     }
 
-    pub fn from_rgba(mut rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, io::Error> {
+    pub fn from_rgba(mut rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, util::WinError> {
         assert_eq!(rgba.len() % PIXEL_SIZE, 0);
         let pixel_count = rgba.len() / PIXEL_SIZE;
         assert_eq!(pixel_count, (width * height) as usize);
@@ -81,7 +80,7 @@ impl WinIcon {
         if !handle.is_null() {
             Ok(WinIcon { handle })
         } else {
-            Err(io::Error::last_os_error())
+            Err(util::WinError::from_last_error())
         }
     }
 
@@ -105,6 +104,11 @@ impl Drop for WinIcon {
 
 pub fn unset_for_window(hwnd: HWND, icon_type: IconType) {
     unsafe {
-        winuser::SendMessageW(hwnd, winuser::WM_SETICON, icon_type as WPARAM, 0 as LPARAM);
+        winuser::SendMessageW(
+            hwnd,
+            winuser::WM_SETICON,
+            icon_type as WPARAM,
+            0 as LPARAM,
+        );
     }
 }

src/platform/windows/mod.rs

@@ -1,19 +1,16 @@
 #![cfg(target_os = "windows")]
 
-use winapi::{self, shared::windef::HWND};
+use winapi;
+use winapi::shared::windef::HWND;
 
-pub use self::{
-    event_loop::{EventLoop, EventLoopProxy, EventLoopWindowTarget},
-    monitor::MonitorHandle,
-    window::Window,
-};
-
-use crate::{event::DeviceId as RootDeviceId, window::Icon};
+pub use self::events_loop::{EventsLoop, EventsLoopProxy};
+pub use self::monitor::MonitorId;
+pub use self::window::Window;
 
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes {
     pub parent: Option<HWND>,
-    pub taskbar_icon: Option<Icon>,
+    pub taskbar_icon: Option<::Icon>,
     pub no_redirection_bitmap: bool,
 }
 
@@ -36,7 +33,7 @@ impl DeviceId {
 }
 
 impl DeviceId {
-    pub fn persistent_identifier(&self) -> Option<String> {
+    pub fn get_persistent_identifier(&self) -> Option<String> {
         if self.0 != 0 {
             raw_input::get_raw_input_device_name(self.0 as _)
         } else {
@@ -46,14 +43,12 @@ impl DeviceId {
 }
 
 // Constant device ID, to be removed when this backend is updated to report real device IDs.
-const DEVICE_ID: RootDeviceId = RootDeviceId(DeviceId(0));
+const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId(0));
 
-fn wrap_device_id(id: u32) -> RootDeviceId {
-    RootDeviceId(DeviceId(id))
+fn wrap_device_id(id: u32) -> ::DeviceId {
+    ::DeviceId(DeviceId(id))
 }
 
-pub type OsError = std::io::Error;
-
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct WindowId(HWND);
 unsafe impl Send for WindowId {}
@@ -70,7 +65,7 @@ impl WindowId {
 mod dpi;
 mod drop_handler;
 mod event;
-mod event_loop;
+mod events_loop;
 mod icon;
 mod monitor;
 mod raw_input;