Release 0.20.0 Alpha 1 (#913)

* Format everything and add rustfmt to travis

* Remove extern crate winit from examples and add force_multiline_blocks

* Format the code properly

* Fix inconsistent period in PULL_REQUEST_TEMPLATE.md

* Only run rustfmt on nightly

* Travis fixings

.circleci/config.yml

@@ -1,56 +0,0 @@
-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,3 +20,5 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+/CHANGELOG.md merge=union

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,6 @@
 - [ ] 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

.travis.yml

@@ -1,7 +1,5 @@
 language: rust
 
-cache: cargo
-
 matrix:
   include:
     # Linux 32bit
@@ -19,12 +17,6 @@ matrix:
       addons:
         apt:
           packages: *i686_packages
-    - env: TARGET=i686-unknown-linux-gnu
-      os: linux
-      rust: 1.24.1
-      addons:
-        apt:
-          packages: *i686_packages
 
     # Linux 64bit
     - env: TARGET=x86_64-unknown-linux-gnu
@@ -33,9 +25,6 @@ matrix:
     - env: TARGET=x86_64-unknown-linux-gnu
       os: linux
       rust: stable
-    - env: TARGET=x86_64-unknown-linux-gnu
-      os: linux
-      rust: 1.24.1
 
     # macOS
     - env: TARGET=x86_64-apple-darwin
@@ -44,9 +33,6 @@ matrix:
     - env: TARGET=x86_64-apple-darwin
       os: osx
       rust: stable
-    - env: TARGET=x86_64-apple-darwin
-      os: osx
-      rust: 1.24.1
 
     # iOS
     - env: TARGET=x86_64-apple-ios
@@ -55,18 +41,20 @@ matrix:
     - env: TARGET=x86_64-apple-ios
       os: osx
       rust: stable
-    - env: TARGET=x86_64-apple-ios
-      os: osx
-      rust: 1.24.1
 
 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
   # 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
 
 after_success:
   - |

CHANGELOG.md

@@ -1,5 +1,133 @@
 # Unreleased
 
+# 0.20.0 Alpha 1
+
+- 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.
+
+# Version 0.19.1 (2019-04-08)
+
+- On Wayland, added a `get_wayland_display` function to `EventsLoopExt`.
+- On Windows, fix `CursorMoved(0, 0)` getting dispatched on window focus.
+- On macOS, fix command key event left and right reverse.
+- On FreeBSD, NetBSD, and OpenBSD, fix build of X11 backend.
+- On Windows, fix icon not showing up in corner of window.
+- On X11, change DPI scaling factor behavior. First, winit tries to read it from "Xft.dpi" XResource, and uses DPI calculation from xrandr dimensions as fallback behavior.
+
+# Version 0.19.0 (2019-03-06)
+
+- On X11, we will use the faster `XRRGetScreenResourcesCurrent` function instead of `XRRGetScreenResources` when available.
+- On macOS, fix keycodes being incorrect when using a non-US keyboard layout.
+- 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.
+- 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.
+- On Windows, hiding the cursor no longer hides the cursor for all Winit windows - just the one `hide_cursor` was called on.
+- On Windows, cursor grabs used to get perpetually canceled when the grabbing window lost focus. Now, cursor grabs automatically get re-initialized when the window regains focus and the mouse moves over the client area.
+- On Windows, only vertical mouse wheel events were handled. Now, horizontal mouse wheel events are also handled.
+- On Windows, ignore the AltGr key when populating the `ModifersState` type.
+- On Linux, the numpad's add, subtract and divide keys are now mapped to the `Add`, `Subtract` and `Divide` virtual key codes
+- On macOS, the numpad's subtract key has been added to the `Subtract` mapping
+- On Wayland, the numpad's home, end, page up and page down keys are now mapped to the `Home`, `End`, `PageUp` and `PageDown` virtual key codes
+
+# Version 0.18.1 (2018-12-30)
+
+- On macOS, fix `Yen` (JIS) so applications receive the event.
+- On X11 with a tiling WM, fixed high CPU usage when moving windows across monitors.
+- On X11, fixed panic caused by dropping the window before running the event loop.
+- on macOS, added `WindowExt::set_simple_fullscreen` which does not require a separate space
+- Introduce `WindowBuilderExt::with_app_id` to allow setting the application ID on Wayland.
+- On Windows, catch panics in event loop child thread and forward them to the parent thread. This prevents an invocation of undefined behavior due to unwinding into foreign code.
+- On Windows, fix issue where resizing or moving window combined with grabbing the cursor would freeze program.
+- On Windows, fix issue where resizing or moving window would eat `Awakened` events.
+- On Windows, exiting fullscreen after entering fullscreen with disabled decorations no longer shrinks window.
+- On X11, fixed a segfault when using virtual monitors with XRandR.
+- Derive `Ord` and `PartialOrd` for `VirtualKeyCode` enum.
+- On Windows, fix issue where hovering or dropping a non file item would create a panic.
+- On Wayland, fix resizing and DPI calculation when a `wl_output` is removed without sending a `leave` event to the `wl_surface`, such as disconnecting a monitor from a laptop.
+- On Wayland, DPI calculation is handled by smithay-client-toolkit.
+- On X11, `WindowBuilder::with_min_dimensions` and `WindowBuilder::with_max_dimensions` now correctly account for DPI.
+- Added support for generating dummy `DeviceId`s and `WindowId`s to better support unit testing.
+- On macOS, fixed unsoundness in drag-and-drop that could result in drops being rejected.
+- On macOS, implemented `WindowEvent::Refresh`.
+- On macOS, all `MouseCursor` variants are now implemented and the cursor will no longer reset after unfocusing.
+- Removed minimum supported Rust version guarantee.
+
+# Version 0.18.0 (2018-11-07)
+
+- **Breaking:** `image` crate upgraded to 0.20. This is exposed as part of the `icon_loading` API.
+- On Wayland, pointer events will now provide the current modifiers state.
+- On Wayland, titles will now be displayed in the window header decoration.
+- On Wayland, key repetition is now ended when keyboard loses focus.
+- On Wayland, windows will now use more stylish and modern client side decorations.
+- On Wayland, windows will use server-side decorations when available.
+- **Breaking:** Added support for F16-F24 keys (variants were added to the `VirtualKeyCode` enum).
+- Fixed graphical glitches when resizing on Wayland.
+- On Windows, fix freezes when performing certain actions after a window resize has been triggered. Reintroduces some visual artifacts when resizing.
+- Updated window manager hints under X11 to v1.5 of [Extended Window Manager Hints](https://specifications.freedesktop.org/wm-spec/wm-spec-1.5.html#idm140200472629520).
+- Added `WindowBuilderExt::with_gtk_theme_variant` to X11-specific `WindowBuilder` functions.
+- Fixed UTF8 handling bug in X11 `set_title` function.
+- On Windows, `Window::set_cursor` now applies immediately instead of requiring specific events to occur first.
+- On Windows, the `HoveredFile` and `HoveredFileCancelled` events are now implemented.
+- On Windows, fix `Window::set_maximized`.
+- On Windows 10, fix transparency (#260).
+- On macOS, fix modifiers during key repeat.
+- Implemented the `Debug` trait for `Window`, `EventsLoop`, `EventsLoopProxy` and `WindowBuilder`.
+- On X11, now a `Resized` event will always be generated after a DPI change to ensure the window's logical size is consistent with the new DPI.
+- Added further clarifications to the DPI docs.
+- On Linux, if neither X11 nor Wayland manage to initialize, the corresponding panic now consists of a single line only.
+- Add optional `serde` feature with implementations of `Serialize`/`Deserialize` for DPI types and various event types.
+- Add `PartialEq`, `Eq`, and `Hash` implementations on public types that could have them but were missing them.
+- On X11, drag-and-drop receiving an unsupported drop type can no longer cause the WM to freeze.
+- Fix issue whereby the OpenGL context would not appear at startup on macOS Mojave (#1069).
+- **Breaking:** Removed `From<NSApplicationActivationPolicy>` impl from `ActivationPolicy` on macOS.
+- On macOS, the application can request the user's attention with `WindowExt::request_user_attention`.
+
 # Version 0.17.2 (2018-08-19)
 
 - On macOS, fix `<C-Tab>` so applications receive the event.

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Winit Contributing Guidelines
+
+## Scope
+[See `FEATURES.md`](./FEATURES.md). When requesting or implementing a new Winit feature, you should
+consider whether or not it's directly related to window creation or input handling. If it isn't, it
+may be worth creating a separate crate that extends Winit's API to add that functionality.
+
+
+## Reporting an issue
+
+When reporting an issue, in order to help the maintainers understand what the problem is, please make
+your description of the issue as detailed as possible:
+
+- if it is a bug, please provide clear explanation of what happens, what should happen, and how to
+  reproduce the issue, ideally by providing a minimal program exhibiting the problem
+- if it is a feature request, please provide a clear argumentation about why you believe this feature
+  should be supported by winit
+
+## Making a pull request
+
+When making a code contribution to winit, before opening your pull request, please make sure that:
+
+- you tested your modifications on all the platforms impacted, or if not possible detail which platforms
+  were not tested, and what should be tested, so that a maintainer or another contributor can test them
+- you updated any relevant documentation in winit
+- you left comments in your code explaining any part that is not straightforward, so that the
+  maintainers and future contributors don't have to try to guess what your code is supposed to do
+- your PR adds an entry to the changelog file if the introduced change is relevant to winit users
+- if your PR affects the platform compatibility of one or more features or adds another feature, the
+  relevant sections in [`FEATURES.md`](https://github.com/rust-windowing/winit/blob/master/FEATURES.md#features)
+  should be updated.
+
+Once your PR is open, you can ask for review by a maintainer of your platform. Winit's merging policy
+is that a PR must be approved by at least two maintainers of winit before being merged, including
+at least a maintainer of the platform (a maintainer making a PR themselves counts as approving it).
+
+## 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.
+
+If you are interested in contributing or testing on a platform, please add yourself to that table!

Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "winit"
-version = "0.17.2"
-authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
+version = "0.20.0-alpha1"
+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"
@@ -11,16 +12,18 @@ documentation = "https://docs.rs/winit"
 categories = ["gui"]
 
 [package.metadata.docs.rs]
-features = ["icon_loading"]
-
-[features]
-icon_loading = ["image"]
+features = ["serde"]
 
 [dependencies]
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
-image = { version = "0.19", optional = true }
+serde = { version = "1", optional = true, features = ["serde_derive"] }
+derivative = "1.0.2"
+
+[dev-dependencies]
+image = "0.21"
+env_logger = "0.5"
 
 [target.'cfg(target_os = "android")'.dependencies.android_glue]
 version = "0.2"
@@ -29,33 +32,46 @@ version = "0.2"
 objc = "0.2.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc = "0.2.3"
-cocoa = "0.17"
+cocoa = "0.18.4"
 core-foundation = "0.6"
-core-graphics = "0.16"
+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]
+bitflags = "1"
 
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
-version = "0.3.5"
+version = "0.3.6"
 features = [
     "combaseapi",
+    "commctrl",
     "dwmapi",
+    "errhandlingapi",
     "hidusage",
     "libloaderapi",
     "objbase",
+    "ole2",
     "processthreadsapi",
     "shellapi",
     "shellscalingapi",
     "shobjidl_core",
     "unknwnbase",
+    "winbase",
     "windowsx",
+    "winerror",
     "wingdi",
     "winnt",
     "winuser",
 ]
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
-wayland-client = { version = "0.20.10", features = [ "dlopen", "egl", "cursor"] }
-smithay-client-toolkit = "0.3.0"
+wayland-client = { version = "0.23.0", features = [ "dlopen", "egl", "cursor", "eventloop"] }
+calloop = "0.4.2"
+smithay-client-toolkit = "0.6.1"
 x11-dl = "2.18.3"
-parking_lot = "0.6"
 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"

FEATURES.md

@@ -0,0 +1,211 @@
+# Winit Scope
+
+Winit aims to expose an interface that abstracts over window creation and input handling, and can
+be used to create both games and applications. It supports the main graphical platforms:
+- Desktop
+  - Windows
+  - macOS
+  - Unix
+    - via X11
+    - via Wayland
+- Mobile
+  - iOS
+  - Android
+- Web
+  - via Emscripten
+  - via WASM
+
+Most platforms expose capabilities that cannot be meaningfully transposed onto others. Winit does not
+aim to support every single feature of every platform, but rather to abstract over the common features
+available everywhere. In this context, APIs exposed in winit can be split into different "support tiers":
+
+- **Core:** Features that are essential to providing a well-formed abstraction over each platform's
+  windowing and input APIs.
+- **Platform:** Platform-specific features that can't be meaningfully exposed through a common API and
+  cannot be implemented outside of Winit without exposing a significant amount of Winit's internals
+  or interfering with Winit's abstractions.
+- **Usability:** Features that are not strictly essential to Winit's functionality, but provide meaningful
+  usability improvements and cannot be reasonably implemented in an external crate. These are
+  generally optional and exposed through Cargo features.
+
+Core features are taken care of by the core Winit maintainers. Platform features are not.
+When a platform feature is submitted, the submitter is considered the expert in the
+feature and may be asked to support the feature should it break in the future.
+
+Winit ***does not*** directly expose functionality for drawing inside windows or creating native
+menus, but ***does*** commit to providing APIs that higher-level crates can use to implement that
+functionality.
+
+## `1.0` and stability
+
+When all core features are implemented to the satisfaction of the Winit maintainers, Winit 1.0 will
+be released and the library will enter maintenance mode. For the most part, new core features will not
+be added past this point. New platform features may be accepted and exposed through point releases.
+
+### Tier upgrades
+Some platform features could in theory be exposed across multiple platforms, but have not gone
+through the implementation work necessary to function on all platforms. When one of these features
+gets implemented across all platforms, a PR can be opened to upgrade the feature to a core feature.
+If that gets accepted, the platform-specific functions gets deprecated and become permanently
+exposed through the core, cross-platform API.
+
+# Features
+
+## Extending this section
+
+If your PR makes notable changes to Winit's features, please update this section as follows:
+
+- If your PR adds a new feature, add a brief description to the relevant section. If the feature is a core
+  feature, add a row to the feature matrix and describe what platforms the feature has been implemented on.
+
+- If your PR begins a new API rework, add a row to the `Pending API Reworks` table. If the PR implements the
+  API rework on all relevant platforms, please move it to the `Completed API Reworks` table.
+
+- If your PR implements an already-existing feature on a new platform, either mark the feature as *completed*,
+  or mark it as *mostly completed* and link to an issue describing the problems with the implementation.
+
+## Core
+
+### Windowing
+- **Window initialization**: Winit allows the creation of a window
+- **Providing pointer to init OpenGL**: Winit provides the necessary pointers to initialize a working opengl context
+- **Providing pointer to init Vulkan**: Same as OpenGL but for Vulkan
+- **Window decorations**: The windows created by winit are properly decorated, and the decorations can
+  be deactivated
+- **Window decorations toggle**: Decorations can be turned on or off after window creation
+- **Window resizing**: The windows created by winit can be resized and generate the appropriate events
+  when they are. The application can precisely control its window size if desired.
+- **Window resize increments**: When the window gets resized, the application can choose to snap the window's
+  size to specific values.
+- **Window transparency**: Winit allows the creation of windows with a transparent background.
+- **Window maximization**: The windows created by winit can be maximized upon creation.
+- **Window maximization toggle**: The windows created by winit can be maximized and unmaximized after
+  creation.
+- **Fullscreen**: The windows created by winit can be put into fullscreen mode.
+- **Fullscreen toggle**: The windows created by winit can be switched to and from fullscreen after
+  creation.
+- **HiDPI support**: Winit assists developers in appropriately scaling HiDPI content.
+- **Popup / modal windows**: Windows can be created relative to the client area of other windows, and parent
+  windows can be disabled in favor of popup windows. This feature also guarantees that popup windows
+  get drawn above their owner.
+
+
+### 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.
+- **Mouse set location**: Forcibly changing the location of the pointer.
+- **Cursor grab**: Locking the cursor so it cannot exit the client area of a window.
+- **Cursor icon**: Changing the cursor icon, or hiding the cursor.
+- **Touch events**: Single-touch events.
+- **Multitouch**: Multi-touch events, including cancellation of a gesture.
+- **Keyboard events**: Properly processing keyboard events using the user-specified keymap and
+  translating keypresses into UTF-8 characters, handling dead keys and IMEs.
+- **Drag & Drop**: Dragging content into winit, detecting when content enters, drops, or if the drop is cancelled.
+- **Raw Device Events**: Capturing input from input devices without any OS filtering.
+- **Gamepad/Joystick events**: Capturing input from gampads and joysticks.
+- **Device movement events:**: Capturing input from the device gyroscope and accelerometer.
+
+## Platform
+### Windows
+* Setting the taskbar icon
+* Setting the parent window
+* `WS_EX_NOREDIRECTIONBITMAP` support
+
+### macOS
+* Window activation policy
+* Window movable by background
+* Transparent titlebar
+* Hidden titlebar
+* Hidden titlebar buttons
+* Full-size content view
+
+### Unix
+* Window urgency
+* X11 Window Class
+* X11 Override Redirect Flag
+* GTK Theme Variant
+* Base window size
+
+## Usability
+* `serde`: Enables serialization/deserialization of certain types with Serde. (Maintainer: @Osspial)
+
+## Compatibility Matrix
+
+Legend:
+
+- ✔️: Works as intended
+- ▢: Mostly works but some bugs are known
+- ❌: Missing feature or large bugs making it unusable
+- **N/A**: Not applicable for this platform
+- ❓: Unknown status
+
+### Windowing
+|Feature                          |Windows|MacOS   |Linux x11   |Linux Wayland  |Android|iOS    |Emscripten|
+|-------------------------------- | ----- | ----   | -------    | -----------   | ----- | ----- | -------- |
+|Window initialization            |✔️     |✔️     |▢[#5]      |✔️             |▢[#33]|▢[#33] |❓        |
+|Providing pointer to init OpenGL |✔️     |✔️     |✔️         |✔️             |✔️     |✔️    |❓        |
+|Providing pointer to init Vulkan |✔️     |✔️     |✔️         |✔️             |✔️     |❓     |**N/A**   |
+|Window decorations               |✔️     |✔️     |✔️         |▢[#306]        |**N/A**|**N/A**|**N/A**   |
+|Window decorations toggle        |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**   |
+|Window resizing                  |✔️     |▢[#219]|✔️         |▢[#306]        |**N/A**|**N/A**|❓        |
+|Window resize increments         |❌     |❌     |❌         |❌             |❌    |❌     |❌        |
+|Window transparency              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**   |
+|Window maximization              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**   |
+|Window maximization toggle       |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**   |
+|Fullscreen                       |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|❌        |
+|Fullscreen toggle                |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|❌        |
+|HiDPI support                    |✔️     |✔️     |✔️         |✔️             |▢[#721]|✔️    |✔️         |
+|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 |✔️    |✔️    |✔️       |✔️          |❌      |✔️     |❌         |
+
+### Input handling
+|Feature                 |Windows   |MacOS   |Linux x11|Linux Wayland|Android|iOS    |Emscripten|
+|----------------------- | -----    | ----   | ------- | ----------- | ----- | ----- | -------- |
+|Mouse events            |✔️       |▢[#63]  |✔️       |✔️          |**N/A**|**N/A**|✔️       |
+|Mouse set location      |✔️       |✔️      |✔️       |❓           |**N/A**|**N/A**|**N/A**  |
+|Cursor grab             |✔️       |▢[#165] |▢[#242]  |❌[#306]    |**N/A**|**N/A**|✔️       |
+|Cursor icon             |✔️       |✔️      |✔️       |❌[#306]    |**N/A**|**N/A**|❌       |
+|Touch events            |✔️       |❌      |✔️       |✔️          |✔️    |✔️     |✔️       |
+|Multitouch              |❓        |❌      |✔️       |✔️          |❓     |❌     |❌       |
+|Keyboard events         |✔️       |✔️      |✔️       |✔️          |❓     |❌     |✔️       |
+|Drag & Drop             |▢[#720]  |▢[#720] |▢[#720]  |❌[#306]    |**N/A**|**N/A**|❓        |
+|Raw Device Events       |▢[#750]  |▢[#750] |▢[#750]  |❌          |❌    |❌     |❌       |
+|Gamepad/Joystick events |❌[#804] |❌      |❌       |❌          |❌    |❌     |❌       |
+|Device movement events  |❓        |❓       |❓       |❓           |❌    |❌     |❌       |
+
+### Pending API Reworks
+Changes in the API that have been agreed upon but aren't implemented across all platforms.
+
+|Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Emscripten|
+|------------------------------      | ----- | ---- | ------- | ----------- | ----- | ----- | -------- |
+|New API for HiDPI ([#315] [#319])   |✔️    |✔️    |✔️       |✔️          |▢[#721]|✔️    |✔️       |
+|Event Loop 2.0 ([#459])             |✔️    |❌    |❌       |✔️          |❌     |❌    |❌       |
+|Keyboard Input ([#812])             |❌    |❌    |❌       |❌          |❌     |❌     |❌      |
+
+### Completed API Reworks
+|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

HALL_OF_CHAMPIONS.md

@@ -0,0 +1,14 @@
+# Hall of Champions
+
+The Winit maintainers would like to recognize the following former Winit
+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
+  years of existence.
+* [@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,19 +1,25 @@
 # winit - Cross-platform window creation and management in Rust
 
 [![](http://meritbadge.herokuapp.com/winit)](https://crates.io/crates/winit)
-
 [![Docs.rs](https://docs.rs/winit/badge.svg)](https://docs.rs/winit)
-
-[![Build Status](https://travis-ci.org/tomaka/winit.svg?branch=master)](https://travis-ci.org/tomaka/winit)
-[![Build status](https://ci.appveyor.com/api/projects/status/5h87hj0g4q2xe3j9/branch/master?svg=true)](https://ci.appveyor.com/project/tomaka/winit/branch/master)
+[![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.17"
+winit = "0.20.0-alpha1"
 ```
 
 ## [Documentation](https://docs.rs/winit)
 
+## Contact Us
+
+Join us in any of these:
+
+[![Freenode](https://img.shields.io/badge/freenode.net-%23glutin-red.svg)](http://webchat.freenode.net?channels=%23glutin&uio=MTY9dHJ1ZSYyPXRydWUmND10cnVlJjExPTE4NSYxMj10cnVlJjE1PXRydWU7a)
+[![Matrix](https://img.shields.io/badge/Matrix-%23Glutin%3Amatrix.org-blueviolet.svg)](https://matrix.to/#/#Glutin:matrix.org)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tomaka/glutin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## Usage
 
 Winit is a window creation and management library. It can create windows and lets you handle
@@ -25,24 +31,35 @@ show something on the window you need to use the platform-specific getters provi
 another library.
 
 ```rust
-extern crate winit;
+use winit::{
+    event::{Event, WindowEvent},
+    event_loop::{ControlFlow, EventLoop},
+    window::WindowBuilder,
+};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
-    let window = winit::Window::new(&events_loop).unwrap();
+    let event_loop = EventLoop::new();
+    let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    events_loop.run_forever(|event| {
+    event_loop.run(move |event, _, control_flow| {
         match event {
-            winit::Event::WindowEvent {
-              event: winit::WindowEvent::CloseRequested,
-              ..
-            } => winit::ControlFlow::Break,
-            _ => winit::ControlFlow::Continue,
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                window_id,
+            } if window_id == window.id() => *control_flow = ControlFlow::Exit,
+            _ => *control_flow = ControlFlow::Wait,
         }
     });
 }
 ```
 
+Winit is only officially supported on the latest stable version of the Rust compiler.
+
+### Cargo Features
+
+Winit provides the following features, which can be enabled in your `Cargo.toml` file:
+* `serde`: Enables serialization/deserialization of certain types with [Serde](https://crates.io/crates/serde).
+
 ### Platform-specific usage
 
 #### Emscripten and WebAssembly

appveyor.yml

@@ -4,8 +4,6 @@ environment:
     CHANNEL: nightly
   - TARGET: x86_64-pc-windows-msvc
     CHANNEL: stable
-  - TARGET: x86_64-pc-windows-msvc
-    CHANNEL: 1.24.1
   - TARGET: i686-pc-windows-msvc
     CHANNEL: nightly
   - TARGET: i686-pc-windows-gnu
@@ -22,3 +20,4 @@ build: false
 
 test_script:
   - cargo test --verbose
+  - cargo test --features serde --verbose

examples/cursor.rs

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

examples/fullscreen.rs

@@ -1,79 +1,144 @@
-extern crate winit;
-
 use std::io::{self, Write};
-use winit::{ControlFlow, Event, WindowEvent};
+use winit::{
+    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
+    event_loop::{ControlFlow, EventLoop},
+    monitor::MonitorHandle,
+    window::WindowBuilder,
+};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
+    let event_loop = EventLoop::new();
+
+    #[cfg(target_os = "macos")]
+    let mut macos_use_simple_fullscreen = false;
 
-    // enumerating monitors
     let monitor = {
-        for (num, monitor) in events_loop.get_available_monitors().enumerate() {
-            println!("Monitor #{}: {:?}", num, monitor.get_name());
+        // On macOS there are two fullscreen modes "native" and "simple"
+        #[cfg(target_os = "macos")]
+        {
+            print!("Please choose the fullscreen mode: (1) native, (2) simple: ");
+            io::stdout().flush().unwrap();
+
+            let mut num = String::new();
+            io::stdin().read_line(&mut num).unwrap();
+            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))
+            } else {
+                None
+            }
         }
 
-        print!("Please write the number of the monitor to use: ");
-        io::stdout().flush().unwrap();
-
-        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 = events_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
-
-        println!("Using {:?}", monitor.get_name());
-
-        monitor
+        #[cfg(not(target_os = "macos"))]
+        Some(prompt_for_monitor(&event_loop))
     };
 
-    let window = winit::WindowBuilder::new()
-        .with_title("Hello world!")
-        .with_fullscreen(Some(monitor))
-        .build(&events_loop)
-        .unwrap();
-
-    let mut is_fullscreen = true;
+    let mut is_fullscreen = monitor.is_some();
     let mut is_maximized = false;
     let mut decorations = true;
 
-    events_loop.run_forever(|event| {
+    let window = WindowBuilder::new()
+        .with_title("Hello world!")
+        .with_fullscreen(monitor)
+        .build(&event_loop)
+        .unwrap();
+
+    event_loop.run(move |event, _, control_flow| {
         println!("{:?}", event);
+        *control_flow = ControlFlow::Wait;
 
         match event {
-            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) => {
-                        is_fullscreen = !is_fullscreen;
-                        if !is_fullscreen {
-                            window.set_fullscreen(None);
-                        } else {
-                            window.set_fullscreen(Some(window.get_current_monitor()));
-                        }
-                    }
-                    (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);
-                    }
-                    _ => (),
-                },
-                _ => (),
-            },
-            _ => {}
-        }
+            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;
+                                    }
+                                }
 
-        ControlFlow::Continue
+                                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);
+                            },
+                            _ => (),
+                        }
+                    },
+                    _ => (),
+                }
+            },
+            _ => {},
+        }
     });
 }
+
+// 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());
+    }
+
+    print!("Please write the number of the monitor to use: ");
+    io::stdout().flush().unwrap();
+
+    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");
+
+    println!("Using {:?}", monitor.name());
+
+    monitor
+}

examples/handling_close.rs

@@ -1,74 +1,82 @@
-extern crate winit;
+use winit::{
+    event::{Event, KeyboardInput, WindowEvent},
+    event_loop::{ControlFlow, EventLoop},
+    window::WindowBuilder,
+};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
+    let event_loop = EventLoop::new();
 
-    let _window = winit::WindowBuilder::new()
+    let _window = WindowBuilder::new()
         .with_title("Your faithful window")
-        .build(&events_loop)
+        .build(&event_loop)
         .unwrap();
 
     let mut close_requested = false;
 
-    events_loop.run_forever(|event| {
-        use winit::WindowEvent::*;
-        use winit::ElementState::Released;
-        use winit::VirtualKeyCode::{N, Y};
+    event_loop.run(move |event, _, control_flow| {
+        use winit::event::{
+            ElementState::Released,
+            VirtualKeyCode::{N, Y},
+        };
+        *control_flow = ControlFlow::Wait;
 
         match event {
-            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.
+            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.
 
-                    // 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.
-                }
-                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!");
+                        // 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.
-                            return winit::ControlFlow::Break;
+                                    // 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;
+                                }
+                            },
+                            _ => (),
                         }
-                    }
-                    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,23 +1,27 @@
-extern crate winit;
-
-use winit::dpi::LogicalSize;
+use winit::{
+    dpi::LogicalSize,
+    event::{Event, WindowEvent},
+    event_loop::{ControlFlow, EventLoop},
+    window::WindowBuilder,
+};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
+    let event_loop = EventLoop::new();
 
-    let window = winit::WindowBuilder::new()
-        .build(&events_loop)
-        .unwrap();
+    let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    window.set_min_dimensions(Some(LogicalSize::new(400.0, 200.0)));
-    window.set_max_dimensions(Some(LogicalSize::new(800.0, 400.0)));
+    window.set_min_inner_size(Some(LogicalSize::new(400.0, 200.0)));
+    window.set_max_inner_size(Some(LogicalSize::new(800.0, 400.0)));
 
-    events_loop.run_forever(|event| {
+    event_loop.run(move |event, _, control_flow| {
         println!("{:?}", event);
 
         match event {
-            winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } => winit::ControlFlow::Break,
-            _ => winit::ControlFlow::Continue,
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                ..
+            } => *control_flow = ControlFlow::Exit,
+            _ => *control_flow = ControlFlow::Wait,
         }
     });
 }

examples/monitor_list.rs

@@ -1,7 +1,9 @@
-extern crate winit;
+use winit::{event_loop::EventLoop, window::WindowBuilder};
 
 fn main() {
-    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());
+    let event_loop = EventLoop::new();
+    let window = WindowBuilder::new().build(&event_loop).unwrap();
+
+    dbg!(window.available_monitors());
+    dbg!(window.primary_monitor());
 }

examples/multithreaded.rs

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

examples/proxy.rs

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

examples/request_redraw.rs

@@ -0,0 +1,32 @@
+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,38 +1,44 @@
-extern crate winit;
+use winit::{
+    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
+    event_loop::{ControlFlow, EventLoop},
+    window::WindowBuilder,
+};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
+    let event_loop = EventLoop::new();
 
     let mut resizable = false;
 
-    let window = winit::WindowBuilder::new()
+    let window = WindowBuilder::new()
         .with_title("Hit space to toggle resizability.")
-        .with_dimensions((400, 200).into())
+        .with_inner_size((400, 200).into())
         .with_resizable(resizable)
-        .build(&events_loop)
+        .build(&event_loop)
         .unwrap();
 
-    events_loop.run_forever(|event| {
+    event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
         match event {
-            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);
+            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::ControlFlow::Continue
     });
 }

examples/timer.rs

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

examples/video_modes.rs

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

examples/window_icon.rs

@@ -1,95 +1,65 @@
-// 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;
+use std::path::Path;
+use winit::{
+    event::Event,
+    event_loop::{ControlFlow, EventLoop},
+    window::{Icon, WindowBuilder},
+};
 
-use winit::Icon;
-
-#[cfg(feature = "icon_loading")]
 fn main() {
     // 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 mut events_loop = winit::EventsLoop::new();
+    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 window = winit::WindowBuilder::new()
+    let event_loop = EventLoop::new();
+
+    let window = 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(&events_loop)
+        .build(&event_loop)
         .unwrap();
 
-    events_loop.run_forever(|event| {
-        if let winit::Event::WindowEvent { event, .. } = event {
-            use winit::WindowEvent::*;
+    event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
+        if let Event::WindowEvent { event, .. } = event {
+            use winit::event::WindowEvent::*;
             match event {
-                CloseRequested => return winit::ControlFlow::Break,
+                CloseRequested => *control_flow = ControlFlow::Exit,
                 DroppedFile(path) => {
-                    use image::GenericImage;
-
-                    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()));
+                    window.set_window_icon(Some(load_icon(&path)));
                 },
                 _ => (),
             }
         }
-        winit::ControlFlow::Continue
     });
 }
 
-#[cfg(not(feature = "icon_loading"))]
-fn main() {
-    print!(
-r#"This example requires the `icon_loading` feature:
-    cargo run --example window_icon --features icon_loading
-"#);
+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")
 }

examples/window_run_return.rs

@@ -0,0 +1,45 @@
+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

@@ -0,0 +1,7 @@
+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,4 +1,3 @@
-
 //! 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
@@ -29,19 +28,19 @@
 //! them entering an existential panic. Once users enter that state, they will no longer be focused on your application.
 //!
 //! There are two ways to get the DPI factor:
-//! - You can track the `WindowEvent::HiDpiFactorChanged` event of your windows. This event is sent any
-//!   time the DPI factor changes, be it because the window moved to another monitor, or because the
-//!   user changed the configuration of their screen.
+//! - You can track the [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged) event of your
+//!   windows. This event is sent any time the DPI factor changes, either because the window moved to another monitor,
+//!   or because the user changed the configuration of their screen.
 //! - You can also retrieve the DPI factor of a monitor by calling
-//!   [`MonitorId::get_hidpi_factor`](../struct.MonitorId.html#method.get_hidpi_factor), or the
+//!   [`MonitorHandle::hidpi_factor`](../monitor/struct.MonitorHandle.html#method.hidpi_factor), or the
 //!   current DPI factor applied to a window by calling
-//!   [`Window::get_hidpi_factor`](../struct.Window.html#method.get_hidpi_factor), which is roughly equivalent
-//!   to `window.get_current_monitor().get_hidpi_factor()`.
+//!   [`Window::hidpi_factor`](../window/struct.Window.html#method.hidpi_factor), which is roughly equivalent
+//!   to `window.current_monitor().hidpi_factor()`.
 //!
 //! Depending on the platform, the window's actual DPI factor may only be known after
 //! the event loop has started and your window has been drawn once. To properly handle these cases,
-//! the most robust way is to monitor the `WindowEvent::HiDpiFactorChanged` event and dynamically
-//! adapt your drawing logic to follow the DPI factor.
+//! the most robust way is to monitor the [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged)
+//! event and dynamically adapt your drawing logic to follow the DPI factor.
 //!
 //! Here's an overview of what sort of DPI factors you can expect, and where they come from:
 //! - **Windows:** On Windows 8 and 10, per-monitor scaling is readily configured by users from the display settings.
@@ -53,18 +52,28 @@
 //! - **X11:** On X11, we calcuate the DPI factor based on the millimeter dimensions provided by XRandR. This can
 //! result in a wide range of possible values, including some interesting ones like 1.0833333333333333. This can be
 //! overridden using the `WINIT_HIDPI_FACTOR` environment variable, though that's not recommended.
-//! - **Wayland:** On Wayland, DPI factors are very much at the discretion of the user.
+//! - **Wayland:** On Wayland, DPI factors are set per-screen by the server, and are always integers (most often 1 or 2).
 //! - **iOS:** DPI factors are both constant and device-specific on iOS.
 //! - **Android:** This feature isn't yet implemented on Android, so the DPI factor will always be returned as 1.0.
 //!
 //! 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 produce a
-//! [`Resized`](../enum.WindowEvent.html#variant.Resized) event, even on platforms where no resize actually occurs,
+//! 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,
 //! such as macOS and Wayland. As a result, it's not necessary to separately handle
-//! [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged) if you're only listening for size.
+//! [`HiDpiFactorChanged`](../event/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.
+//!
+//! `winit` will send [`Resized`](../enum.WindowEvent.html#variant.Resized) events whenever a window's logical size
+//! changes, and [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged) events
+//! whenever the DPI factor changes. Receiving either of these events means that the physical size of your window has
+//! changed, and you should recompute it using the latest values you received for each. If the logical size and the
+//! DPI factor change simultaneously, `winit` will send both events together; thus, it's recommended to buffer
+//! these events and process them at the end of the queue.
+//!
+//! If you never received any [`HiDpiFactorChanged`](../enum.WindowEvent.html#variant.HiDpiFactorChanged) events,
+//! then your window's DPI factor is 1.
 
 /// Checks that the DPI factor is a normal positive `f64`.
 ///
@@ -82,6 +91,7 @@ pub fn validate_hidpi_factor(dpi_factor: f64) -> bool {
 /// which can cause noticable issues. To help with that, an `Into<(i32, i32)>` implementation is provided which
 /// does the rounding for you.
 #[derive(Debug, Copy, Clone, PartialEq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct LogicalPosition {
     pub x: f64,
     pub y: f64,
@@ -142,6 +152,7 @@ impl Into<(i32, i32)> for LogicalPosition {
 /// which can cause noticable issues. To help with that, an `Into<(i32, i32)>` implementation is provided which
 /// does the rounding for you.
 #[derive(Debug, Copy, Clone, PartialEq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct PhysicalPosition {
     pub x: f64,
     pub y: f64,
@@ -202,6 +213,7 @@ impl Into<(i32, i32)> for PhysicalPosition {
 /// which can cause noticable issues. To help with that, an `Into<(u32, u32)>` implementation is provided which
 /// does the rounding for you.
 #[derive(Debug, Copy, Clone, PartialEq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct LogicalSize {
     pub width: f64,
     pub height: f64,
@@ -262,6 +274,7 @@ impl Into<(u32, u32)> for LogicalSize {
 /// which can cause noticable issues. To help with that, an `Into<(u32, u32)>` implementation is provided which
 /// does the rounding for you.
 #[derive(Debug, Copy, Clone, PartialEq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct PhysicalSize {
     pub width: f64,
     pub height: f64,

src/error.rs

@@ -0,0 +1,82 @@
+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.rs

@@ -1,28 +1,91 @@
-use std::path::PathBuf;
+//! 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 {DeviceId, LogicalPosition, LogicalSize, WindowId};
+use crate::{
+    dpi::{LogicalPosition, LogicalSize},
+    platform_impl,
+    window::WindowId,
+};
 
 /// Describes a generic event.
-#[derive(Clone, Debug)]
-pub enum Event {
+#[derive(Clone, Debug, PartialEq)]
+pub enum Event<T> {
+    /// Emitted when the OS sends an event to a winit window.
     WindowEvent {
         window_id: WindowId,
         event: WindowEvent,
     },
+    /// Emitted when the OS sends an event to a device.
     DeviceEvent {
         device_id: DeviceId,
         event: DeviceEvent,
     },
-    Awakened,
+    /// 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,
 
-    /// The application has been suspended or resumed.
+    /// 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 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)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum WindowEvent {
     /// The size of the window has changed. Contains the client area's new dimensions.
     Resized(LogicalSize),
@@ -37,12 +100,21 @@ 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,
 
     /// The window received a unicode character.
@@ -54,7 +126,10 @@ 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 {
@@ -64,7 +139,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.
@@ -74,24 +149,41 @@ 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 window needs to be redrawn.
-    Refresh,
+    /// The OS or application has requested that the window be redrawn.
+    RedrawRequested,
 
     /// Touch event has been received
     Touch(Touch),
@@ -108,6 +200,25 @@ 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
@@ -116,7 +227,7 @@ pub enum WindowEvent {
 /// may not match.
 ///
 /// Note that these events are delivered regardless of input focus.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum DeviceEvent {
     Added,
     Removed,
@@ -139,15 +250,24 @@ 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.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct KeyboardInput {
     /// Identifies the physical key pressed
     ///
@@ -168,16 +288,17 @@ 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.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum TouchPhase {
     Started,
     Moved,
     Ended,
-    Cancelled
+    Cancelled,
 }
 
 /// Represents touch event
@@ -195,13 +316,13 @@ pub enum TouchPhase {
 /// as previously received End event is a new finger and has nothing to do with an old one.
 ///
 /// Touch may be cancelled if for example window lost focus.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Touch {
     pub device_id: DeviceId,
     pub phase: TouchPhase,
     pub location: LogicalPosition,
     /// unique identifier of a finger.
-    pub id: u64
+    pub id: u64,
 }
 
 /// Hardware-dependent keyboard scan code.
@@ -215,6 +336,7 @@ pub type ButtonId = u32;
 
 /// Describes the input state of a key.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum ElementState {
     Pressed,
     Released,
@@ -222,6 +344,7 @@ pub enum ElementState {
 
 /// Describes a button of a mouse controller.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum MouseButton {
     Left,
     Right,
@@ -231,25 +354,27 @@ pub enum MouseButton {
 
 /// Describes a difference in the mouse scroll wheel state.
 #[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.
-#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+#[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy)]
 #[repr(u32)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum VirtualKeyCode {
     /// The '1' key over the letters.
     Key1,
@@ -317,6 +442,15 @@ pub enum VirtualKeyCode {
     F13,
     F14,
     F15,
+    F16,
+    F17,
+    F18,
+    F19,
+    F20,
+    F21,
+    F22,
+    F23,
+    F24,
 
     /// Print Screen/SysRq.
     Snapshot,
@@ -394,7 +528,7 @@ pub enum VirtualKeyCode {
     Multiply,
     Mute,
     MyComputer,
-    NavigateForward, // also called "Prior"
+    NavigateForward,  // also called "Prior"
     NavigateBackward, // also called "Next"
     NextTrack,
     NoConvert,
@@ -440,6 +574,8 @@ pub enum VirtualKeyCode {
 ///
 /// Each field of this struct represents a modifier and is `true` if this modifier is active.
 #[derive(Default, Debug, Hash, PartialEq, Eq, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(default))]
 pub struct ModifiersState {
     /// The "shift" key
     pub shift: bool,
@@ -450,5 +586,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/event_loop.rs

@@ -0,0 +1,212 @@
+//! 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/icon.rs

@@ -1,12 +1,4 @@
-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;
+use std::{error::Error, fmt, mem};
 
 #[repr(C)]
 #[derive(Debug)]
@@ -24,9 +16,7 @@ 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 {
@@ -38,7 +28,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.",
@@ -63,17 +53,13 @@ impl Error for BadIcon {
         "A valid icon cannot be created from these arguments"
     }
 
-    fn cause(&self) -> Option<&Error> {
+    fn cause(&self) -> Option<&dyn 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,
@@ -87,7 +73,9 @@ 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 {
@@ -98,73 +86,11 @@ 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::{GenericImage, 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,483 +2,112 @@
 //!
 //! # Building a window
 //!
-//! Before you can build a window, you first need to build an `EventsLoop`. This is done with the
-//! `EventsLoop::new()` function. Example:
+//! Before you can build a [`Window`], you first need to build an [`EventLoop`]. This is done with the
+//! [`EventLoop::new()`] function.
 //!
 //! ```no_run
-//! use winit::EventsLoop;
-//! let events_loop = EventsLoop::new();
+//! use winit::event_loop::EventLoop;
+//! let event_loop = EventLoop::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(&events_loop)`.
-//!  - Calling `let builder = WindowBuilder::new()` then `builder.build(&events_loop)`.
+//!  - Calling [`Window::new(&event_loop)`][window_new].
+//!  - Calling [`let builder = WindowBuilder::new()`][window_builder_new] then [`builder.build(&event_loop)`][window_builder_build].
 //!
 //! 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`].
 //!
-//! # Events handling
+//! # Event 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 retrieved from the `EventsLoop` the window was created
+//! The events generated by a [`Window`] can be retreived from the [`EventLoop`] the [`Window`] was created
 //! with.
 //!
-//! 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.
+//! 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.
 //!
 //! ```no_run
-//! use winit::{Event, WindowEvent};
-//! use winit::dpi::LogicalSize;
-//! # use winit::EventsLoop;
-//! # let mut events_loop = EventsLoop::new();
+//! use winit::{
+//!     event::{Event, WindowEvent},
+//!     event_loop::ControlFlow,
+//! };
+//! # use winit::event_loop::EventLoop;
+//! # let event_loop = EventLoop::new();
 //!
-//! 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| {
+//! event_loop.run(move |event, _, control_flow| {
 //!     match event {
-//!         Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
+//!         Event::WindowEvent {
+//!             event: WindowEvent::CloseRequested,
+//!             ..
+//!         } => {
 //!             println!("The close button was pressed; stopping");
-//!             ControlFlow::Break
+//!             *control_flow = ControlFlow::Exit
 //!         },
-//!         _ => ControlFlow::Continue,
+//!         _ => *control_flow = ControlFlow::Wait,
 //!     }
 //! });
 //! ```
 //!
-//! 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.
+//! 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.
 //!
 //! # 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 `os` module for that), 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 [`platform`] module), which in turn allows you
+//! to create an OpenGL/Vulkan/DirectX/Metal/etc. context that will draw on the [`Window`].
 //!
+//! [`EventLoop`]: ./event_loop/struct.EventLoop.html
+//! [`EventLoop::new()`]: ./event_loop/struct.EventLoop.html#method.new
+//! [event_loop_run]: ./event_loop/struct.EventLoop.html#method.run
+//! [`ControlFlow`]: ./event_loop/enum.ControlFlow.html
+//! [`Exit`]: ./event_loop/enum.ControlFlow.html#variant.Exit
+//! [`Window`]: ./window/struct.Window.html
+//! [`WindowBuilder`]: ./window/struct.WindowBuilder.html
+//! [window_new]: ./window/struct.Window.html#method.new
+//! [window_builder_new]: ./window/struct.WindowBuilder.html#method.new
+//! [window_builder_build]: ./window/struct.WindowBuilder.html#method.build
+//! [window_id_fn]: ./window/struct.Window.html#method.id
+//! [`Event`]: ./event/enum.Event.html
+//! [`WindowEvent`]: ./event/enum.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 winapi;
+extern crate derivative;
+#[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;
-
-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;
-mod events;
+#[macro_use]
+pub mod error;
+pub mod event;
+pub mod event_loop;
 mod icon;
-mod platform;
-mod window;
+pub mod monitor;
+mod platform_impl;
+pub mod window;
 
-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,
-}
-
-/// 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);
-
-/// 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);
-
-/// 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
-}
-
-/// 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)]
-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 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,
-}
-
-/// 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)]
-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,
-        }
-    }
-}
+pub mod platform;

src/monitor.rs

@@ -0,0 +1,138 @@
+//! 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

@@ -1,38 +0,0 @@
-#![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

@@ -1,59 +0,0 @@
-#![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/mod.rs

@@ -1,17 +0,0 @@
-//! 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,285 +0,0 @@
-#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
-
-use std::os::raw;
-use std::ptr;
-use std::sync::Arc;
-
-use {
-    EventsLoop,
-    LogicalSize,
-    MonitorId,
-    Window,
-    WindowBuilder,
-};
-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 platform::x11;
-
-pub use platform::XNotSupported;
-pub use platform::x11::util::WindowType as XWindowType;
-
-/// 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;
-
-    /// Builds a new `EventsLoop` that is forced to use Wayland.
-    fn new_wayland() -> Self
-        where Self: Sized;
-
-    /// True if the `EventsLoop` uses Wayland.
-    fn is_wayland(&self) -> bool;
-
-    /// True if the `EventsLoop` uses X11.
-    fn is_x11(&self) -> bool;
-
-    #[doc(hidden)]
-    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
-}
-
-impl EventsLoopExt for EventsLoop {
-    #[inline]
-    fn new_x11() -> Result<Self, XNotSupported> {
-        LinuxEventsLoop::new_x11().map(|ev|
-            EventsLoop {
-                events_loop: ev,
-                _marker: ::std::marker::PhantomData,
-            }
-        )
-    }
-
-    #[inline]
-    fn new_wayland() -> Self {
-        EventsLoop {
-            events_loop: match LinuxEventsLoop::new_wayland() {
-                Ok(e) => e,
-                Err(_) => panic!()      // TODO: propagate
-            },
-            _marker: ::std::marker::PhantomData,
-        }
-    }
-
-    #[inline]
-    fn is_wayland(&self) -> bool {
-        self.events_loop.is_wayland()
-    }
-
-    #[inline]
-    fn is_x11(&self) -> bool {
-        !self.events_loop.is_wayland()
-    }
-
-    #[inline]
-    #[doc(hidden)]
-    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
-        self.events_loop.x_connection().cloned()
-    }
-}
-
-/// Additional methods on `Window` that are specific to Unix.
-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 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 get_xlib_display(&self) -> Option<*mut raw::c_void>;
-
-    fn get_xlib_screen_id(&self) -> Option<raw::c_int>;
-
-    #[doc(hidden)]
-    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
-
-    /// Set window urgency hint (`XUrgencyHint`). Only relevant on X.
-    fn set_urgent(&self, is_urgent: bool);
-
-    /// This function returns the underlying `xcb_connection_t` of an xlib `Display`.
-    ///
-    /// 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 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 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 get_wayland_display(&self) -> Option<*mut raw::c_void>;
-
-    /// Check if the window is ready for drawing
-    ///
-    /// It is a remnant of a previous implementation detail for the
-    /// wayland backend, and is no longer relevant.
-    ///
-    /// Always return true.
-    #[deprecated]
-    fn is_ready(&self) -> bool;
-}
-
-impl WindowExt for Window {
-    #[inline]
-    fn get_xlib_window(&self) -> Option<raw::c_ulong> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.get_xlib_window()),
-            _ => None
-        }
-    }
-
-    #[inline]
-    fn get_xlib_display(&self) -> Option<*mut raw::c_void> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.get_xlib_display()),
-            _ => None
-        }
-    }
-
-    #[inline]
-    fn get_xlib_screen_id(&self) -> Option<raw::c_int> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.get_xlib_screen_id()),
-            _ => None
-        }
-    }
-
-    #[inline]
-    #[doc(hidden)]
-    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.get_xlib_xconnection()),
-            _ => None
-        }
-    }
-
-    #[inline]
-    fn get_xcb_connection(&self) -> Option<*mut raw::c_void> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
-            _ => None
-        }
-    }
-
-    #[inline]
-    fn set_urgent(&self, is_urgent: bool) {
-        if let LinuxWindow::X(ref w) = self.window {
-            w.set_urgent(is_urgent);
-        }
-    }
-
-    #[inline]
-    fn get_wayland_surface(&self) -> Option<*mut raw::c_void> {
-        match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_surface().c_ptr() as *mut _),
-            _ => None
-        }
-    }
-
-    #[inline]
-    fn get_wayland_display(&self) -> Option<*mut raw::c_void> {
-        match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_display().c_ptr() as *mut _),
-            _ => None
-        }
-    }
-
-    #[inline]
-    fn is_ready(&self) -> bool {
-        true
-    }
-}
-
-/// Additional methods on `WindowBuilder` that are specific to Unix.
-pub trait WindowBuilderExt {
-    fn with_x11_visual<T>(self, visual_infos: *const T) -> WindowBuilder;
-    fn with_x11_screen(self, screen_id: i32) -> WindowBuilder;
-
-    /// Build window with `WM_CLASS` hint; defaults to the name of the binary. Only relevant on X11.
-    fn with_class(self, class: String, instance: String) -> WindowBuilder;
-    /// Build window with override-redirect flag; defaults to false. Only relevant on X11.
-    fn with_override_redirect(self, override_redirect: bool) -> WindowBuilder;
-    /// Build window with `_NET_WM_WINDOW_TYPE` hint; defaults to `Normal`. Only relevant on X11.
-    fn with_x11_window_type(self, x11_window_type: XWindowType) -> WindowBuilder;
-    /// Build window with resize increment hint. Only implemented on X11.
-    fn with_resize_increments(self, increments: LogicalSize) -> WindowBuilder;
-    /// Build window with base size hint. Only implemented on X11.
-    fn with_base_size(self, base_size: LogicalSize) -> 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
-    }
-
-    #[inline]
-    fn with_x11_screen(mut self, screen_id: i32) -> WindowBuilder {
-        self.platform_specific.screen_id = Some(screen_id);
-        self
-    }
-
-    #[inline]
-    fn with_class(mut self, instance: String, class: String) -> WindowBuilder {
-        self.platform_specific.class = Some((instance, class));
-        self
-    }
-
-    #[inline]
-    fn with_override_redirect(mut self, override_redirect: bool) -> WindowBuilder {
-        self.platform_specific.override_redirect = override_redirect;
-        self
-    }
-
-    #[inline]
-    fn with_x11_window_type(mut self, x11_window_type: XWindowType) -> WindowBuilder {
-        self.platform_specific.x11_window_type = x11_window_type;
-        self
-    }
-
-    #[inline]
-    fn with_resize_increments(mut self, increments: LogicalSize) -> WindowBuilder {
-        self.platform_specific.resize_increments = Some(increments.into());
-        self
-    }
-
-    #[inline]
-    fn with_base_size(mut self, base_size: LogicalSize) -> WindowBuilder {
-        self.platform_specific.base_size = Some(base_size.into());
-        self
-    }
-}
-
-/// 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 MonitorIdExt for MonitorId {
-    #[inline]
-    fn native_id(&self) -> u32 {
-        self.inner.get_native_identifier()
-    }
-}

src/platform/android.rs

@@ -0,0 +1,33 @@
+#![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

@@ -1,108 +0,0 @@
-#![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/desktop.rs

@@ -0,0 +1,45 @@
+#![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/ios.rs

@@ -0,0 +1,163 @@
+#![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

@@ -1,110 +0,0 @@
-#![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

@@ -1,690 +0,0 @@
-//! 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 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;
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct 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 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
-    }
-}
-
-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/mod.rs

@@ -1,531 +0,0 @@
-#![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 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,
-}
-
-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),
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum DeviceId {
-    X(x11::DeviceId),
-    Wayland(wayland::DeviceId),
-}
-
-#[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).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 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()),
-        }
-    }
-}
-
-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,
-        };
-
-        eprintln!("[winit 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!(
-r#"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

@@ -1,515 +0,0 @@
-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::commons::Implementation;
-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;
-
-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();
-                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 env = Environment::from_registry_with_cb(
-            display.get_registry().unwrap(),
-            &mut event_queue,
-            SeatManager {
-                sink: sink.clone(),
-                store: store.clone(),
-                seats: seats.clone(),
-                events_loop_proxy: EventsLoopProxy {
-                    display: Arc::downgrade(&display),
-                    pending_wakeup: Arc::downgrade(&pending_wakeup),
-                },
-            },
-        ).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)
-    }
-}
-
-/*
- * 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 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 Implementation<Proxy<wl_registry::WlRegistry>, GlobalEvent> for SeatManager {
-    fn receive(&mut self, evt: GlobalEvent, registry: Proxy<wl_registry::WlRegistry>) {
-        use self::wl_registry::RequestsTrait as RegistryRequests;
-        use self::wl_seat::RequestsTrait as SeatRequests;
-        match evt {
-            GlobalEvent::New {
-                id,
-                ref interface,
-                version,
-            } if interface == "wl_seat" =>
-            {
-                use std::cmp::min;
-                let seat = registry
-                    .bind::<wl_seat::WlSeat>(min(version, 5), id)
-                    .unwrap()
-                    .implement(SeatData {
-                        sink: self.sink.clone(),
-                        store: self.store.clone(),
-                        pointer: None,
-                        keyboard: None,
-                        touch: None,
-                        events_loop_proxy: self.events_loop_proxy.clone(),
-                    });
-                self.store.lock().unwrap().new_seat(&seat);
-                self.seats.lock().unwrap().push((id, seat));
-            }
-            GlobalEvent::Removed { id, ref interface } if interface == "wl_seat" => {
-                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,
-}
-
-impl Implementation<Proxy<wl_seat::WlSeat>, wl_seat::Event> for SeatData {
-    fn receive(&mut self, evt: wl_seat::Event, seat: Proxy<wl_seat::WlSeat>) {
-        use self::wl_seat::RequestsTrait as SeatRequests;
-        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.get_pointer().unwrap(),
-                        self.sink.clone(),
-                        self.store.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.get_keyboard().unwrap(),
-                        self.sink.clone(),
-                        self.events_loop_proxy.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.get_touch().unwrap(),
-                        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/mod.rs

@@ -1,25 +0,0 @@
-#![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

@@ -1,190 +0,0 @@
-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::{NewProxy, Proxy};
-use sctk::reexports::client::protocol::wl_pointer::{self, Event as PtrEvent, WlPointer};
-
-pub fn implement_pointer(
-    pointer: NewProxy<WlPointer>,
-    sink: Arc<Mutex<EventsLoopSink>>,
-    store: Arc<Mutex<WindowStore>>,
-) -> Proxy<WlPointer> {
-    let mut mouse_focus = None;
-    let mut axis_buffer = None;
-    let mut axis_discrete_buffer = None;
-    let mut axis_state = TouchPhase::Ended;
-
-    pointer.implement(move |evt, pointer: Proxy<_>| {
-        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(),
-                            // TODO: replace dummy value with actual modifier state
-                            modifiers: ModifiersState::default(),
-                        },
-                        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(),
-                            // TODO: replace dummy value with actual modifier state
-                            modifiers: ModifiersState::default(),
-                        },
-                        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,
-                            // TODO: replace dummy value with actual modifier state
-                            modifiers: ModifiersState::default(),
-                        },
-                        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,
-                                // TODO: replace dummy value with actual modifier state
-                                modifiers: ModifiersState::default(),
-                            },
-                            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,
-                                // TODO: replace dummy value with actual modifier state
-                                modifiers: ModifiersState::default(),
-                            },
-                            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,
-                                // TODO: replace dummy value with actual modifier state
-                                modifiers: ModifiersState::default(),
-                            },
-                            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,
-                }
-            }
-        }
-    })
-}

src/platform/linux/wayland/touch.rs

@@ -1,93 +0,0 @@
-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::{NewProxy, Proxy};
-use sctk::reexports::client::protocol::wl_touch::{Event as TouchEvent, WlTouch};
-
-struct TouchPoint {
-    wid: WindowId,
-    location: (f64, f64),
-    id: i32,
-}
-
-pub(crate) fn implement_touch(
-    touch: NewProxy<WlTouch>,
-    sink: Arc<Mutex<EventsLoopSink>>,
-    store: Arc<Mutex<WindowStore>>,
-) -> Proxy<WlTouch> {
-    let mut pending_ids = Vec::new();
-    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,
-                );
-            },
-        }
-    })
-}

src/platform/linux/wayland/window.rs

@@ -1,458 +0,0 @@
-use std::collections::VecDeque;
-use std::sync::{Arc, Mutex, Weak};
-
-use {CreationError, MouseCursor, WindowAttributes};
-use dpi::{LogicalPosition, LogicalSize};
-use platform::MonitorId as PlatformMonitorId;
-use window::MonitorId as RootMonitorId;
-
-use sctk::window::{BasicFrame, Event as WEvent, Window as SWindow};
-use sctk::reexports::client::{Display, Proxy};
-use sctk::reexports::client::protocol::{wl_seat, wl_surface, wl_output};
-use sctk::reexports::client::protocol::wl_compositor::RequestsTrait as CompositorRequests;
-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<BasicFrame>>>,
-    monitors: Arc<Mutex<MonitorList>>, // Monitors this window is currently on
-    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>>,
-}
-
-impl Window {
-    pub fn new(evlp: &EventsLoop, attributes: WindowAttributes) -> 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)));
-
-        // monitor tracking
-        let monitor_list = Arc::new(Mutex::new(MonitorList::new()));
-
-        let surface = evlp.env.compositor.create_surface().unwrap().implement({
-            let list = monitor_list.clone();
-            let omgr = evlp.env.outputs.clone();
-            let window_store = evlp.store.clone();
-            move |event, surface: Proxy<wl_surface::WlSurface>| match event {
-                wl_surface::Event::Enter { output } => {
-                    let dpi_change = list.lock().unwrap().add_output(MonitorId {
-                        proxy: output,
-                        mgr: omgr.clone(),
-                    });
-                    if let Some(dpi) = dpi_change {
-                        if surface.version() >= 3 {
-                            // without version 3 we can't be dpi aware
-                            window_store.lock().unwrap().dpi_change(&surface, dpi);
-                            surface.set_buffer_scale(dpi);
-                        }
-                    }
-                },
-                wl_surface::Event::Leave { output } => {
-                    let dpi_change = list.lock().unwrap().del_output(&output);
-                    if let Some(dpi) = dpi_change {
-                        if surface.version() >= 3 {
-                            // without version 3 we can't be dpi aware
-                            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::<BasicFrame>::init(
-            surface.clone(),
-            (width, height),
-            &evlp.env.compositor,
-            &evlp.env.subcompositor,
-            &evlp.env.shm,
-            &evlp.env.shell,
-            move |event, ()| match event {
-                WEvent::Configure { new_size, .. } => {
-                    let mut store = window_store.lock().unwrap();
-                    for window in &mut store.windows {
-                        if window.surface.equals(&my_surface) {
-                            window.newsize = new_size;
-                            window.need_refresh = true;
-                            *(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();
-
-        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(),
-            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,
-            monitors: monitor_list,
-            outputs: evlp.env.outputs.clone(),
-            size: size,
-            kill_switch: (kill_switch, evlp.cleanup_needed.clone()),
-            need_frame_refresh: need_frame_refresh,
-        })
-    }
-
-    #[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 {
-        self.monitors.lock().unwrap().compute_hidpi_factor()
-    }
-
-    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 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();
-        }
-    }
-
-    #[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 {
-        // we don't know how much each monitor sees us so...
-        // just return the most recent one ?
-        let guard = self.monitors.lock().unwrap();
-        guard.monitors.last().unwrap().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)
-    }
-}
-
-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)>>,
-    need_refresh: bool,
-    need_frame_refresh: Arc<Mutex<bool>>,
-    closed: bool,
-    kill_switch: Arc<Mutex<bool>>,
-    frame: Weak<Mutex<SWindow<BasicFrame>>>,
-    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<BasicFrame>>),
-    {
-        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;
-        }
-    }
-}
-
-/*
- * Monitor list with some covenience method to compute DPI
- */
-
-struct MonitorList {
-    monitors: Vec<MonitorId>
-}
-
-impl MonitorList {
-    fn new() -> MonitorList {
-        MonitorList {
-            monitors: Vec::new()
-        }
-    }
-
-    fn compute_hidpi_factor(&self) -> i32 {
-        let mut factor = 1;
-        for monitor_id in &self.monitors {
-            let monitor_dpi = monitor_id.get_hidpi_factor();
-            if monitor_dpi > factor { factor = monitor_dpi; }
-        }
-        factor
-    }
-
-    fn add_output(&mut self, monitor: MonitorId) -> Option<i32> {
-        let old_dpi = self.compute_hidpi_factor();
-        let monitor_dpi = monitor.get_hidpi_factor();
-        self.monitors.push(monitor);
-        if monitor_dpi > old_dpi {
-            Some(monitor_dpi)
-        } else {
-            None
-        }
-    }
-
-    fn del_output(&mut self, output: &Proxy<wl_output::WlOutput>) -> Option<i32> {
-        let old_dpi = self.compute_hidpi_factor();
-        self.monitors.retain(|m| !m.proxy.equals(output));
-        let new_dpi = self.compute_hidpi_factor();
-        if new_dpi != old_dpi {
-            Some(new_dpi)
-        } else {
-            None
-        }
-    }
-}

src/platform/linux/x11/ffi.rs

@@ -1,8 +0,0 @@
-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/util/randr.rs

@@ -1,100 +0,0 @@
-use std::{env, slice};
-use std::str::FromStr;
-
-use validate_hidpi_factor;
-use super::*;
-
-pub fn calc_dpi_factor(
-    (width_px, height_px): (u32, u32),
-    (width_mm, height_mm): (u64, u64),
-) -> f64 {
-    // Override DPI if `WINIT_HIDPI_FACTOR` variable is set
-    let dpi_override = env::var("WINIT_HIDPI_FACTOR")
-        .ok()
-        .and_then(|var| f64::from_str(&var).ok());
-    if let Some(dpi_override) = dpi_override {
-        if !validate_hidpi_factor(dpi_override) {
-            panic!(
-                "`WINIT_HIDPI_FACTOR` invalid; DPI factors must be normal floats greater than 0. Got `{}`",
-                dpi_override,
-            );
-        }
-        return dpi_override;
-    }
-
-    // See http://xpra.org/trac/ticket/728 for more information.
-    if width_mm == 0 || width_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();
-    // 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));
-    dpi_factor
-}
-
-pub enum MonitorRepr {
-    Monitor(*mut ffi::XRRMonitorInfo),
-    Crtc(*mut ffi::XRRCrtcInfo),
-}
-
-impl MonitorRepr {
-    pub unsafe fn get_output(&self) -> ffi::RROutput {
-        match *self {
-            // Same member names, but different locations within the struct...
-            MonitorRepr::Monitor(monitor) => *((*monitor).outputs.offset(0)),
-            MonitorRepr::Crtc(crtc) => *((*crtc).outputs.offset(0)),
-        }
-    }
-
-    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 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),
-        }
-    }
-}
-
-impl From<*mut ffi::XRRMonitorInfo> for MonitorRepr {
-    fn from(monitor: *mut ffi::XRRMonitorInfo) -> Self {
-        MonitorRepr::Monitor(monitor)
-    }
-}
-
-impl From<*mut ffi::XRRCrtcInfo> for MonitorRepr {
-    fn from(crtc: *mut ffi::XRRCrtcInfo) -> Self {
-        MonitorRepr::Crtc(crtc)
-    }
-}
-
-impl XConnection {
-    pub unsafe fn get_output_info(&self, resources: *mut ffi::XRRScreenResources, repr: &MonitorRepr) -> (String, f64) {
-        let output_info = (self.xrandr.XRRGetOutputInfo)(
-            self.display,
-            resources,
-            repr.get_output(),
-        );
-        let name_slice = slice::from_raw_parts(
-            (*output_info).name as *mut u8,
-            (*output_info).nameLen as usize,
-        );
-        let name = String::from_utf8_lossy(name_slice).into();
-        let hidpi_factor = calc_dpi_factor(
-            repr.get_dimensions(),
-            ((*output_info).mm_width as u64, (*output_info).mm_height as u64),
-        );
-        (self.xrandr.XRRFreeOutputInfo)(output_info);
-        (name, hidpi_factor)
-    }
-}

src/platform/macos.rs

@@ -1,32 +1,70 @@
 #![cfg(target_os = "macos")]
 
-use std::convert::From;
 use std::os::raw::c_void;
-use cocoa::appkit::NSApplicationActivationPolicy;
-use {LogicalSize, MonitorId, Window, WindowBuilder};
+
+use crate::{
+    dpi::LogicalSize,
+    monitor::MonitorHandle,
+    window::{Window, WindowBuilder},
+};
 
 /// Additional methods on `Window` that are specific to MacOS.
-pub trait WindowExt {
+pub trait WindowExtMacOS {
     /// Returns a pointer to the cocoa `NSWindow` that is used by this window.
     ///
     /// The pointer will become invalid when the `Window` is destroyed.
-    fn get_nswindow(&self) -> *mut c_void;
+    fn ns_window(&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 get_nsview(&self) -> *mut c_void;
+    fn ns_view(&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.
+    ///
+    /// The `is_critical` flag has the following effects:
+    /// - `false`: the dock icon will only bounce once.
+    /// - `true`: the dock icon will bounce until the application is focused.
+    fn request_user_attention(&self, is_critical: bool);
+
+    /// Returns whether or not the window is in simple fullscreen mode.
+    fn 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
+    /// won't work if the window was already in the native fullscreen).
+    ///
+    /// This is how fullscreen used to work on macOS in versions before Lion.
+    /// And allows the user to have a fullscreen window without using another
+    /// space or taking control over the entire monitor.
+    fn set_simple_fullscreen(&self, fullscreen: bool) -> bool;
 }
 
-impl WindowExt for Window {
+impl WindowExtMacOS for Window {
     #[inline]
-    fn get_nswindow(&self) -> *mut c_void {
-        self.window.get_nswindow()
+    fn ns_window(&self) -> *mut c_void {
+        self.window.ns_window()
     }
 
     #[inline]
-    fn get_nsview(&self) -> *mut c_void {
-        self.window.get_nsview()
+    fn ns_view(&self) -> *mut c_void {
+        self.window.ns_view()
+    }
+
+    #[inline]
+    fn request_user_attention(&self, is_critical: bool) {
+        self.window.request_user_attention(is_critical)
+    }
+
+    #[inline]
+    fn simple_fullscreen(&self) -> bool {
+        self.window.simple_fullscreen()
+    }
+
+    #[inline]
+    fn set_simple_fullscreen(&self, fullscreen: bool) -> bool {
+        self.window.set_simple_fullscreen(fullscreen)
     }
 }
 
@@ -47,19 +85,6 @@ impl Default for ActivationPolicy {
     }
 }
 
-impl From<ActivationPolicy> for NSApplicationActivationPolicy {
-    fn from(activation_policy: ActivationPolicy) -> Self {
-        match activation_policy {
-            ActivationPolicy::Regular =>
-                NSApplicationActivationPolicy::NSApplicationActivationPolicyRegular,
-            ActivationPolicy::Accessory =>
-                NSApplicationActivationPolicy::NSApplicationActivationPolicyAccessory,
-            ActivationPolicy::Prohibited =>
-                NSApplicationActivationPolicy::NSApplicationActivationPolicyProhibited,
-        }
-    }
-}
-
 /// Additional methods on `WindowBuilder` that are specific to MacOS.
 ///
 /// **Note:** Properties dealing with the titlebar will be overwritten by the `with_decorations` method
@@ -70,11 +95,12 @@ impl From<ActivationPolicy> for NSApplicationActivationPolicy {
 ///  - `with_titlebar_hidden`
 ///  - `with_titlebar_buttons_hidden`
 ///  - `with_fullsize_content_view`
-pub trait WindowBuilderExt {
+pub trait WindowBuilderExtMacOS {
     /// 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.
@@ -89,7 +115,7 @@ pub trait WindowBuilderExt {
     fn with_resize_increments(self, increments: LogicalSize) -> WindowBuilder;
 }
 
-impl WindowBuilderExt for WindowBuilder {
+impl WindowBuilderExtMacOS for WindowBuilder {
     #[inline]
     fn with_activation_policy(mut self, activation_policy: ActivationPolicy) -> WindowBuilder {
         self.platform_specific.activation_policy = activation_policy;
@@ -97,7 +123,10 @@ impl WindowBuilderExt 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
     }
@@ -139,21 +168,21 @@ impl WindowBuilderExt for WindowBuilder {
     }
 }
 
-/// Additional methods on `MonitorId` that are specific to MacOS.
-pub trait MonitorIdExt {
+/// Additional methods on `MonitorHandle` that are specific to MacOS.
+pub trait MonitorHandleExtMacOS {
     /// Returns the identifier of the monitor for Cocoa.
     fn native_id(&self) -> u32;
     /// Returns a pointer to the NSScreen representing this monitor.
-    fn get_nsscreen(&self) -> Option<*mut c_void>;
+    fn ns_screen(&self) -> Option<*mut c_void>;
 }
 
-impl MonitorIdExt for MonitorId {
+impl MonitorHandleExtMacOS for MonitorHandle {
     #[inline]
     fn native_id(&self) -> u32 {
-        self.inner.get_native_identifier()
+        self.inner.native_identifier()
     }
 
-    fn get_nsscreen(&self) -> Option<*mut c_void> {
-        self.inner.get_nsscreen().map(|s| s as *mut c_void)
+    fn ns_screen(&self) -> Option<*mut c_void> {
+        self.inner.ns_screen().map(|s| s as *mut c_void)
     }
 }

src/platform/macos/events_loop.rs

@@ -1,725 +0,0 @@
-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 to_virtual_key_code(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::LWin,
-        0x37 => events::VirtualKeyCode::RWin,
-        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 => F17 Key,
-        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,
-        //0x4d => unkown,
-        0x4e => events::VirtualKeyCode::Subtract,
-        //0x4f => F18 key,
-        //0x50 => F19 Key,
-        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 => F20 Key,
-        0x5b => events::VirtualKeyCode::Numpad8,
-        0x5c => events::VirtualKeyCode::Numpad9,
-        //0x5d => unkown,
-        //0x5e => unkown,
-        //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 => unkown,
-        0x67 => events::VirtualKeyCode::F11,
-        //0x68 => unkown,
-        0x69 => events::VirtualKeyCode::F13,
-        //0x6a => F16 Key,
-        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 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),
-    }
-}
-
-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 keycode = NSEvent::keyCode(ns_event);
-        let scancode = keycode as u32;
-        let virtual_keycode = to_virtual_key_code(keycode);
-        Some(WindowEvent::KeyboardInput {
-            device_id: DEVICE_ID,
-            input: KeyboardInput {
-                state,
-                scancode,
-                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/mod.rs

@@ -1,45 +0,0 @@
-#![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;
-
-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

@@ -1,147 +0,0 @@
-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.rs

@@ -1,38 +0,0 @@
-use cocoa::appkit::NSWindowStyleMask;
-use cocoa::base::{id, nil};
-use cocoa::foundation::{NSRect, NSUInteger};
-use core_graphics::display::CGDisplay;
-
-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 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

@@ -1,574 +0,0 @@
-// 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::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, to_virtual_key_code};
-use platform::platform::util;
-use platform::platform::ffi::*;
-use platform::platform::window::{get_window_id, IdRef};
-
-struct ViewState {
-    window: id,
-    shared: Weak<Shared>,
-    ime_spot: Option<(f64, f64)>,
-    raw_characters: Option<String>,
-    last_insert: Option<String>,
-}
-
-pub fn new_view(window: id, shared: Weak<Shared>) -> IdRef {
-    let state = ViewState {
-        window,
-        shared,
-        ime_spot: None,
-        raw_characters: None,
-        last_insert: None,
-    };
-    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])
-    }
-}
-
-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!(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 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.last_insert = Some(string.to_owned());
-
-        // 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);
-    }
-}
-
-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 keycode: c_ushort = msg_send![event, keyCode];
-        let virtual_keycode = to_virtual_key_code(keycode);
-        let scancode = keycode as u32;
-        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),
-                },
-            },
-        };
-
-        state.raw_characters = {
-            let characters: id = msg_send![event, characters];
-            let slice = slice::from_raw_parts(
-                characters.UTF8String() as *const c_uchar,
-                characters.len(),
-            );
-            let string = str::from_utf8_unchecked(slice);
-            Some(string.to_owned())
-        };
-
-        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.last_insert.is_some() {
-                let last_insert = state.last_insert.as_ref().unwrap();
-                for character in last_insert.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.last_insert = None;
-
-        let keycode: c_ushort = msg_send![event, keyCode];
-        let virtual_keycode = to_virtual_key_code(keycode);
-        let scancode = keycode as u32;
-        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,26 +1,23 @@
-pub use self::platform::*;
+//! 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.
 
-#[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 android;
+pub mod ios;
+pub mod macos;
+pub mod unix;
+pub mod windows;
 
-#[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");
+pub mod desktop;

src/platform/unix.rs

@@ -0,0 +1,401 @@
+#![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 smithay_client_toolkit::window::{ButtonState, Theme};
+
+use crate::{
+    dpi::LogicalSize,
+    event_loop::EventLoop,
+    monitor::MonitorHandle,
+    window::{Window, WindowBuilder},
+};
+
+use crate::platform_impl::{
+    x11::{ffi::XVisualInfo, XConnection},
+    EventLoop as LinuxEventLoop, Window as LinuxWindow,
+};
+
+// TODO: stupid hack so that glutin can do its work
+#[doc(hidden)]
+pub use crate::platform_impl::x11;
+
+pub use crate::platform_impl::{x11::util::WindowType as XWindowType, XNotSupported};
+
+/// Theme for wayland client side decorations
+///
+/// Colors must be in ARGB8888 format
+pub struct WaylandTheme {
+    /// Primary color when the window is focused
+    pub primary_active: [u8; 4],
+    /// Primary color when the window is unfocused
+    pub primary_inactive: [u8; 4],
+    /// Secondary color when the window is focused
+    pub secondary_active: [u8; 4],
+    /// Secondary color when the window is unfocused
+    pub secondary_inactive: [u8; 4],
+    /// Close button color when hovered over
+    pub close_button_hovered: [u8; 4],
+    /// Close button color
+    pub close_button: [u8; 4],
+    /// Close button color when hovered over
+    pub maximize_button_hovered: [u8; 4],
+    /// Maximize button color
+    pub maximize_button: [u8; 4],
+    /// Minimize button color when hovered over
+    pub minimize_button_hovered: [u8; 4],
+    /// Minimize button color
+    pub minimize_button: [u8; 4],
+}
+
+struct WaylandThemeObject(WaylandTheme);
+
+impl Theme for WaylandThemeObject {
+    fn get_primary_color(&self, active: bool) -> [u8; 4] {
+        if active {
+            self.0.primary_active
+        } else {
+            self.0.primary_inactive
+        }
+    }
+
+    // Used for division line
+    fn get_secondary_color(&self, active: bool) -> [u8; 4] {
+        if active {
+            self.0.secondary_active
+        } else {
+            self.0.secondary_inactive
+        }
+    }
+
+    fn get_close_button_color(&self, state: ButtonState) -> [u8; 4] {
+        match state {
+            ButtonState::Hovered => self.0.close_button_hovered,
+            _ => self.0.close_button,
+        }
+    }
+
+    fn get_maximize_button_color(&self, state: ButtonState) -> [u8; 4] {
+        match state {
+            ButtonState::Hovered => self.0.maximize_button_hovered,
+            _ => self.0.maximize_button,
+        }
+    }
+
+    fn get_minimize_button_color(&self, state: ButtonState) -> [u8; 4] {
+        match state {
+            ButtonState::Hovered => self.0.minimize_button_hovered,
+            _ => self.0.minimize_button,
+        }
+    }
+}
+
+/// Additional methods on `EventLoop` that are specific to Unix.
+pub trait EventLoopExtUnix {
+    /// Builds a new `EventLoops` that is forced to use X11.
+    fn new_x11() -> Result<Self, XNotSupported>
+    where
+        Self: Sized;
+
+    /// Builds a new `EventLoop` that is forced to use Wayland.
+    fn new_wayland() -> Self
+    where
+        Self: Sized;
+
+    /// True if the `EventLoop` uses Wayland.
+    fn is_wayland(&self) -> bool;
+
+    /// True if the `EventLoop` uses X11.
+    fn is_x11(&self) -> bool;
+
+    #[doc(hidden)]
+    fn xlib_xconnection(&self) -> Option<Arc<XConnection>>;
+
+    /// Returns a pointer to the `wl_display` object of wayland that is used by this `EventLoop`.
+    ///
+    /// Returns `None` if the `EventLoop` 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>;
+}
+
+impl<T> EventLoopExtUnix for EventLoop<T> {
+    #[inline]
+    fn new_x11() -> Result<Self, XNotSupported> {
+        LinuxEventLoop::new_x11().map(|ev| {
+            EventLoop {
+                event_loop: ev,
+                _marker: ::std::marker::PhantomData,
+            }
+        })
+    }
+
+    #[inline]
+    fn new_wayland() -> Self {
+        EventLoop {
+            event_loop: match LinuxEventLoop::new_wayland() {
+                Ok(e) => e,
+                Err(_) => panic!(), // TODO: propagate
+            },
+            _marker: ::std::marker::PhantomData,
+        }
+    }
+
+    #[inline]
+    fn is_wayland(&self) -> bool {
+        self.event_loop.is_wayland()
+    }
+
+    #[inline]
+    fn is_x11(&self) -> bool {
+        !self.event_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,
+        }
+    }
+
+    #[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,
+        }
+    }
+}
+
+/// Additional methods on `Window` that are specific to Unix.
+pub trait WindowExtUnix {
+    /// 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>;
+
+    /// 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 xlib_screen_id(&self) -> Option<raw::c_int>;
+
+    #[doc(hidden)]
+    fn xlib_xconnection(&self) -> Option<Arc<XConnection>>;
+
+    /// Set window urgency hint (`XUrgencyHint`). Only relevant on X.
+    fn set_urgent(&self, is_urgent: bool);
+
+    /// This function returns the underlying `xcb_connection_t` of an xlib `Display`.
+    ///
+    /// 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>;
+
+    /// 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>;
+
+    /// 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>;
+
+    /// Sets the color theme of the client side window decorations on wayland
+    fn set_wayland_theme(&self, theme: WaylandTheme);
+
+    /// Check if the window is ready for drawing
+    ///
+    /// It is a remnant of a previous implementation detail for the
+    /// wayland backend, and is no longer relevant.
+    ///
+    /// Always return true.
+    #[deprecated]
+    fn is_ready(&self) -> bool;
+}
+
+impl WindowExtUnix for Window {
+    #[inline]
+    fn xlib_window(&self) -> Option<raw::c_ulong> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.xlib_window()),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    fn xlib_display(&self) -> Option<*mut raw::c_void> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.xlib_display()),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    fn xlib_screen_id(&self) -> Option<raw::c_int> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.xlib_screen_id()),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    fn xlib_xconnection(&self) -> Option<Arc<XConnection>> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.xlib_xconnection()),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    fn xcb_connection(&self) -> Option<*mut raw::c_void> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.xcb_connection()),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    fn set_urgent(&self, is_urgent: bool) {
+        if let LinuxWindow::X(ref w) = self.window {
+            w.set_urgent(is_urgent);
+        }
+    }
+
+    #[inline]
+    fn 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,
+        }
+    }
+
+    #[inline]
+    fn 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,
+        }
+    }
+
+    #[inline]
+    fn set_wayland_theme(&self, theme: WaylandTheme) {
+        match self.window {
+            LinuxWindow::Wayland(ref w) => w.set_theme(WaylandThemeObject(theme)),
+            _ => {},
+        }
+    }
+
+    #[inline]
+    fn is_ready(&self) -> bool {
+        true
+    }
+}
+
+/// Additional methods on `WindowBuilder` that are specific to Unix.
+pub trait WindowBuilderExtUnix {
+    fn with_x11_visual<T>(self, visual_infos: *const T) -> WindowBuilder;
+    fn with_x11_screen(self, screen_id: i32) -> WindowBuilder;
+
+    /// Build window with `WM_CLASS` hint; defaults to the name of the binary. Only relevant on X11.
+    fn with_class(self, class: String, instance: String) -> WindowBuilder;
+    /// Build window with override-redirect flag; defaults to false. Only relevant on X11.
+    fn with_override_redirect(self, override_redirect: bool) -> WindowBuilder;
+    /// Build window with `_NET_WM_WINDOW_TYPE` hint; defaults to `Normal`. Only relevant on X11.
+    fn with_x11_window_type(self, x11_window_type: XWindowType) -> WindowBuilder;
+    /// Build window with `_GTK_THEME_VARIANT` hint set to the specified value. Currently only relevant on X11.
+    fn with_gtk_theme_variant(self, variant: String) -> WindowBuilder;
+    /// Build window with resize increment hint. Only implemented on X11.
+    fn with_resize_increments(self, increments: LogicalSize) -> WindowBuilder;
+    /// Build window with base size hint. Only implemented on X11.
+    fn with_base_size(self, base_size: LogicalSize) -> WindowBuilder;
+
+    /// Build window with a given application ID. It should match the `.desktop` file distributed with
+    /// your program. Only relevant on Wayland.
+    ///
+    /// For details about application ID conventions, see the
+    /// [Desktop Entry Spec](https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id)
+    fn with_app_id(self, app_id: String) -> WindowBuilder;
+}
+
+impl WindowBuilderExtUnix 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
+    }
+
+    #[inline]
+    fn with_x11_screen(mut self, screen_id: i32) -> WindowBuilder {
+        self.platform_specific.screen_id = Some(screen_id);
+        self
+    }
+
+    #[inline]
+    fn with_class(mut self, instance: String, class: String) -> WindowBuilder {
+        self.platform_specific.class = Some((instance, class));
+        self
+    }
+
+    #[inline]
+    fn with_override_redirect(mut self, override_redirect: bool) -> WindowBuilder {
+        self.platform_specific.override_redirect = override_redirect;
+        self
+    }
+
+    #[inline]
+    fn with_x11_window_type(mut self, x11_window_type: XWindowType) -> WindowBuilder {
+        self.platform_specific.x11_window_type = x11_window_type;
+        self
+    }
+
+    #[inline]
+    fn with_resize_increments(mut self, increments: LogicalSize) -> WindowBuilder {
+        self.platform_specific.resize_increments = Some(increments.into());
+        self
+    }
+
+    #[inline]
+    fn with_base_size(mut self, base_size: LogicalSize) -> WindowBuilder {
+        self.platform_specific.base_size = Some(base_size.into());
+        self
+    }
+
+    #[inline]
+    fn with_gtk_theme_variant(mut self, variant: String) -> WindowBuilder {
+        self.platform_specific.gtk_theme_variant = Some(variant);
+        self
+    }
+
+    #[inline]
+    fn with_app_id(mut self, app_id: String) -> WindowBuilder {
+        self.platform_specific.app_id = Some(app_id);
+        self
+    }
+}
+
+/// Additional methods on `MonitorHandle` that are specific to Linux.
+pub trait MonitorHandleExtUnix {
+    /// Returns the inner identifier of the monitor.
+    fn native_id(&self) -> u32;
+}
+
+impl MonitorHandleExtUnix for MonitorHandle {
+    #[inline]
+    fn native_id(&self) -> u32 {
+        self.inner.native_identifier()
+    }
+}

src/platform/windows.rs

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

src/platform/windows/monitor.rs

@@ -1,173 +0,0 @@
-use winapi::shared::minwindef::{BOOL, DWORD, LPARAM, TRUE};
-use winapi::shared::windef::{HDC, HMONITOR, HWND, LPRECT, POINT};
-use winapi::um::winnt::LONG;
-use winapi::um::winuser;
-
-use std::{mem, ptr};
-use std::collections::VecDeque;
-
-use super::{EventsLoop, util};
-use dpi::{PhysicalPosition, PhysicalSize};
-use platform::platform::dpi::{dpi_to_scale_factor, get_monitor_dpi};
-use platform::platform::window::Window;
-
-/// Win32 implementation of the main `MonitorId` object.
-#[derive(Debug, Clone)]
-pub struct MonitorId {
-    /// Monitor handle.
-    hmonitor: HMonitor,
-    /// The system name of the monitor.
-    monitor_name: String,
-    /// True if this is the primary monitor.
-    primary: bool,
-    /// The position of the monitor in pixels on the desktop.
-    ///
-    /// A window that is positioned at these coordinates will overlap the monitor.
-    position: (i32, i32),
-    /// The current resolution in pixels on the monitor.
-    dimensions: (u32, u32),
-    /// DPI scale factor.
-    hidpi_factor: f64,
-}
-
-// Send is not implemented for HMONITOR, we have to wrap it and implement it manually.
-// For more info see:
-// https://github.com/retep998/winapi-rs/issues/360
-// https://github.com/retep998/winapi-rs/issues/396
-#[derive(Debug, Clone)]
-struct HMonitor(HMONITOR);
-
-unsafe impl Send for HMonitor {}
-
-unsafe extern "system" fn monitor_enum_proc(
-    hmonitor: HMONITOR,
-    _hdc: HDC,
-    _place: LPRECT,
-    data: LPARAM,
-) -> BOOL {
-    let monitors = data as *mut VecDeque<MonitorId>;
-    (*monitors).push_back(MonitorId::from_hmonitor(hmonitor));
-    TRUE // continue enumeration
-}
-
-pub fn get_available_monitors() -> VecDeque<MonitorId> {
-    let mut monitors: VecDeque<MonitorId> = VecDeque::new();
-    unsafe {
-        winuser::EnumDisplayMonitors(
-            ptr::null_mut(),
-            ptr::null_mut(),
-            Some(monitor_enum_proc),
-            &mut monitors as *mut _ as LPARAM,
-        );
-    }
-    monitors
-}
-
-pub fn get_primary_monitor() -> MonitorId {
-    const ORIGIN: POINT = POINT { x: 0, y: 0 };
-    let hmonitor = unsafe {
-        winuser::MonitorFromPoint(ORIGIN, winuser::MONITOR_DEFAULTTOPRIMARY)
-    };
-    MonitorId::from_hmonitor(hmonitor)
-}
-
-impl EventsLoop {
-    // TODO: Investigate opportunities for caching
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        get_available_monitors()
-    }
-
-    pub fn get_current_monitor(hwnd: HWND) -> MonitorId {
-        let hmonitor = unsafe {
-            winuser::MonitorFromWindow(hwnd, winuser::MONITOR_DEFAULTTONEAREST)
-        };
-        MonitorId::from_hmonitor(hmonitor)
-    }
-
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        get_primary_monitor()
-    }
-}
-
-impl Window {
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        get_available_monitors()
-    }
-
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        get_primary_monitor()
-    }
-}
-
-fn get_monitor_info(hmonitor: HMONITOR) -> Result<winuser::MONITORINFOEXW, util::WinError> {
-    let mut monitor_info: winuser::MONITORINFOEXW = unsafe { mem::uninitialized() };
-    monitor_info.cbSize = mem::size_of::<winuser::MONITORINFOEXW>() as DWORD;
-    let status = unsafe {
-        winuser::GetMonitorInfoW(
-            hmonitor,
-            &mut monitor_info as *mut winuser::MONITORINFOEXW as *mut winuser::MONITORINFO,
-        )
-    };
-    if status == 0 {
-        Err(util::WinError::from_last_error())
-    } else {
-        Ok(monitor_info)
-    }
-}
-
-impl MonitorId {
-    pub(crate) fn from_hmonitor(hmonitor: HMONITOR) -> Self {
-        let monitor_info = get_monitor_info(hmonitor).expect("`GetMonitorInfoW` failed");
-        let place = monitor_info.rcMonitor;
-        let dimensions = (
-            (place.right - place.left) as u32,
-            (place.bottom - place.top) as u32,
-        );
-        MonitorId {
-            hmonitor: HMonitor(hmonitor),
-            monitor_name: util::wchar_ptr_to_string(monitor_info.szDevice.as_ptr()),
-            primary: util::has_flag(monitor_info.dwFlags, winuser::MONITORINFOF_PRIMARY),
-            position: (place.left as i32, place.top as i32),
-            dimensions,
-            hidpi_factor: dpi_to_scale_factor(get_monitor_dpi(hmonitor).unwrap_or(96)),
-        }
-    }
-
-    pub(crate) fn contains_point(&self, point: &POINT) -> bool {
-        let left = self.position.0 as LONG;
-        let right = left + self.dimensions.0 as LONG;
-        let top = self.position.1 as LONG;
-        let bottom = top + self.dimensions.1 as LONG;
-        point.x >= left && point.x <= right && point.y >= top && point.y <= bottom
-    }
-
-    #[inline]
-    pub fn get_name(&self) -> Option<String> {
-        Some(self.monitor_name.clone())
-    }
-
-    #[inline]
-    pub fn get_native_identifier(&self) -> String {
-        self.monitor_name.clone()
-    }
-
-    #[inline]
-    pub fn get_hmonitor(&self) -> HMONITOR {
-        self.hmonitor.0
-    }
-
-    #[inline]
-    pub fn get_dimensions(&self) -> PhysicalSize {
-        self.dimensions.into()
-    }
-
-    #[inline]
-    pub fn get_position(&self) -> PhysicalPosition {
-        self.position.into()
-    }
-
-    #[inline]
-    pub fn get_hidpi_factor(&self) -> f64 {
-        self.hidpi_factor
-    }
-}

src/platform/windows/util.rs

@@ -1,104 +0,0 @@
-use std::{self, mem, ptr, slice};
-use std::ops::BitAnd;
-
-use winapi::ctypes::wchar_t;
-use winapi::shared::minwindef::{BOOL, DWORD};
-use winapi::shared::windef::{HWND, POINT, RECT};
-use winapi::um::errhandlingapi::GetLastError;
-use winapi::um::winbase::{
-    FormatMessageW,
-    FORMAT_MESSAGE_ALLOCATE_BUFFER,
-    FORMAT_MESSAGE_FROM_SYSTEM,
-    FORMAT_MESSAGE_IGNORE_INSERTS,
-    lstrlenW,
-    LocalFree,
-};
-use winapi::um::winnt::{
-    LPCWSTR,
-    MAKELANGID,
-    LANG_NEUTRAL,
-    SUBLANG_DEFAULT,
-};
-use winapi::um::winuser;
-
-pub fn has_flag<T>(bitset: T, flag: T) -> bool
-where T:
-    Copy + PartialEq + BitAnd<T, Output = T>
-{
-    bitset & flag == flag
-}
-
-pub fn wchar_to_string(wchar: &[wchar_t]) -> String {
-    String::from_utf16_lossy(wchar).to_string()
-}
-
-pub fn wchar_ptr_to_string(wchar: *const wchar_t) -> String {
-    let len = unsafe { lstrlenW(wchar) } as usize;
-    let wchar_slice = unsafe { slice::from_raw_parts(wchar, len) };
-    wchar_to_string(wchar_slice)
-}
-
-pub unsafe fn status_map<T, F: FnMut(&mut T) -> BOOL>(mut fun: F) -> Option<T> {
-    let mut data: T = mem::uninitialized();
-    if fun(&mut data) != 0 {
-        Some(data)
-    } else {
-        None
-    }
-}
-
-pub fn get_cursor_pos() -> Option<POINT> {
-    unsafe { status_map(|cursor_pos| winuser::GetCursorPos(cursor_pos)) }
-}
-
-pub fn get_window_rect(hwnd: HWND) -> Option<RECT> {
-    unsafe { status_map(|rect| winuser::GetWindowRect(hwnd, rect)) }
-}
-
-// This won't be needed anymore if we just add a derive to winapi.
-pub fn rect_eq(a: &RECT, b: &RECT) -> bool {
-    let left_eq = a.left == b.left;
-    let right_eq = a.right == b.right;
-    let top_eq = a.top == b.top;
-    let bottom_eq = a.bottom == b.bottom;
-    left_eq && right_eq && top_eq && bottom_eq
-}
-
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
-pub struct WinError(Option<String>);
-
-impl WinError {
-    pub fn from_last_error() -> Self {
-        WinError(unsafe { get_last_error() })
-    }
-}
-
-pub unsafe fn get_last_error() -> Option<String> {
-    let err = GetLastError();
-    if err != 0 {
-        let buf_addr: LPCWSTR = {
-            let mut buf_addr: LPCWSTR = mem::uninitialized();
-            FormatMessageW(
-               FORMAT_MESSAGE_ALLOCATE_BUFFER
-               | FORMAT_MESSAGE_FROM_SYSTEM
-               | FORMAT_MESSAGE_IGNORE_INSERTS,
-               ptr::null(),
-               err,
-               MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT) as DWORD,
-               // This is a pointer to a pointer
-               &mut buf_addr as *mut LPCWSTR as *mut _,
-               0,
-               ptr::null_mut(),
-            );
-            buf_addr
-        };
-        if !buf_addr.is_null() {
-            let buf_len = lstrlenW(buf_addr) as usize;
-            let buf_slice = std::slice::from_raw_parts(buf_addr, buf_len);
-            let string = wchar_to_string(buf_slice);
-            LocalFree(buf_addr as *mut _);
-            return Some(string);
-        }
-    }
-    None
-}

src/platform_impl/android/ffi.rs

@@ -0,0 +1,122 @@
+#![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 "C" {}
+
+/**
+ ** asset_manager.h
+ **/
+pub type AAssetManager = raw::c_void;
+
+/**
+ ** native_window.h
+ **/
+pub type ANativeWindow = raw::c_void;
+
+extern "C" {
+    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 "C" fn(*mut ANativeActivity),
+    pub onResume: extern "C" fn(*mut ANativeActivity),
+    pub onSaveInstanceState: extern "C" fn(*mut ANativeActivity, *mut libc::size_t),
+    pub onPause: extern "C" fn(*mut ANativeActivity),
+    pub onStop: extern "C" fn(*mut ANativeActivity),
+    pub onDestroy: extern "C" fn(*mut ANativeActivity),
+    pub onWindowFocusChanged: extern "C" fn(*mut ANativeActivity, libc::c_int),
+    pub onNativeWindowCreated: extern "C" fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowResized: extern "C" fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowRedrawNeeded: extern "C" fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowDestroyed: extern "C" fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onInputQueueCreated: extern "C" fn(*mut ANativeActivity, *mut AInputQueue),
+    pub onInputQueueDestroyed: extern "C" fn(*mut ANativeActivity, *mut AInputQueue),
+    pub onContentRectChanged: extern "C" fn(*mut ANativeActivity, *const ARect),
+    pub onConfigurationChanged: extern "C" fn(*mut ANativeActivity),
+    pub onLowMemory: extern "C" fn(*mut ANativeActivity),
+}
+
+/**
+ ** looper.h
+ **/
+pub type ALooper = ();
+
+#[link(name = "android")]
+extern "C" {
+    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 "C" fn(libc::c_int, libc::c_int, *mut libc::c_void) -> libc::c_int;

src/platform_impl/android/mod.rs

@@ -4,65 +4,63 @@ extern crate android_glue;
 
 mod ffi;
 
-use std::cell::RefCell;
-use std::collections::VecDeque;
-use std::fmt;
-use std::os::raw::c_void;
-use std::sync::mpsc::{Receiver, channel};
+use std::{
+    cell::RefCell,
+    collections::VecDeque,
+    fmt,
+    os::raw::c_void,
+    sync::mpsc::{channel, Receiver},
+};
 
-use {
-    CreationError,
-    Event,
-    LogicalPosition,
-    LogicalSize,
-    MouseCursor,
-    PhysicalPosition,
-    PhysicalSize,
-    WindowAttributes,
-    WindowEvent,
-    WindowId as RootWindowId,
+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::OsError;
-use events::{Touch, TouchPhase};
-use window::MonitorId as RootMonitorId;
 
-pub struct EventsLoop {
+pub type OsError = std::io::Error;
+
+pub struct EventLoop {
     event_rx: Receiver<android_glue::Event>,
-    suspend_callback: RefCell<Option<Box<Fn(bool) -> ()>>>,
+    suspend_callback: RefCell<Option<Box<dyn Fn(bool) -> ()>>>,
 }
 
 #[derive(Clone)]
-pub struct EventsLoopProxy;
+pub struct EventLoopProxy;
 
-impl EventsLoop {
-    pub fn new() -> EventsLoop {
+impl EventLoop {
+    pub fn new() -> EventLoop {
         let (tx, rx) = channel();
         android_glue::add_sender(tx);
-        EventsLoop {
+        EventLoop {
             event_rx: rx,
             suspend_callback: Default::default(),
         }
     }
 
     #[inline]
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
         let mut rb = VecDeque::with_capacity(1);
-        rb.push_back(MonitorId);
+        rb.push_back(MonitorHandle);
         rb
     }
 
     #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        MonitorId
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        MonitorHandle
     }
 
     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 = MonitorId.get_hidpi_factor();
+                    let dpi_factor = MonitorHandle.hidpi_factor();
                     let location = LogicalPosition::from_physical(
                         (motion.x as f64, motion.y as f64),
                         dpi_factor,
@@ -96,15 +94,14 @@ impl EventsLoop {
                     }
                     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::get_native_window() };
+                    let native_window = unsafe { android_glue::native_window() };
                     if native_window.is_null() {
                         None
                     } else {
-                        let dpi_factor = MonitorId.get_hidpi_factor();
-                        let physical_size = MonitorId.get_dimensions();
+                        let dpi_factor = MonitorHandle.hidpi_factor();
+                        let physical_size = MonitorHandle.size();
                         let size = LogicalSize::from_physical(physical_size, dpi_factor);
                         Some(Event::WindowEvent {
                             window_id: RootWindowId(WindowId),
@@ -116,29 +113,26 @@ impl EventsLoop {
                     // The activity needs to be redrawn.
                     Some(Event::WindowEvent {
                         window_id: RootWindowId(WindowId),
-                        event: WindowEvent::Refresh,
+                        event: WindowEvent::Redraw,
                     })
-                }
-                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<Fn(bool) -> ()>>) {
+    pub fn set_suspend_callback(&self, cb: Option<Box<dyn 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 {
@@ -155,13 +149,13 @@ impl EventsLoop {
         }
     }
 
-    pub fn create_proxy(&self) -> EventsLoopProxy {
-        EventsLoopProxy
+    pub fn create_proxy(&self) -> EventLoopProxy {
+        EventLoopProxy
     }
 }
 
-impl EventsLoopProxy {
-    pub fn wakeup(&self) -> Result<(), ::EventsLoopClosed> {
+impl EventLoopProxy {
+    pub fn wakeup(&self) -> Result<(), ::EventLoopClosed> {
         android_glue::wake_event_loop();
         Ok(())
     }
@@ -170,62 +164,75 @@ impl EventsLoopProxy {
 #[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
+    }
+}
+
 pub struct Window {
     native_window: *const c_void,
 }
 
 #[derive(Clone)]
-pub struct MonitorId;
+pub struct MonitorHandle;
 
-impl fmt::Debug for MonitorId {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+impl fmt::Debug for MonitorHandle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         #[derive(Debug)]
-        struct MonitorId {
+        struct MonitorHandle {
             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(),
+        let monitor_id_proxy = MonitorHandle {
+            name: self.name(),
+            dimensions: self.size(),
+            position: self.outer_position(),
+            hidpi_factor: self.hidpi_factor(),
         };
 
         monitor_id_proxy.fmt(f)
     }
 }
 
-impl MonitorId {
+impl MonitorHandle {
     #[inline]
-    pub fn get_name(&self) -> Option<String> {
+    pub fn name(&self) -> Option<String> {
         Some("Primary".to_string())
     }
 
     #[inline]
-    pub fn get_dimensions(&self) -> PhysicalSize {
+    pub fn size(&self) -> PhysicalSize {
         unsafe {
-            let window = android_glue::get_native_window();
+            let window = android_glue::native_window();
             (
                 ffi::ANativeWindow_getWidth(window) as f64,
                 ffi::ANativeWindow_getHeight(window) as f64,
-            ).into()
+            )
+                .into()
         }
     }
 
     #[inline]
-    pub fn get_position(&self) -> PhysicalPosition {
+    pub fn outer_position(&self) -> PhysicalPosition {
         // Android assumes single screen
         (0, 0).into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f64 {
+    pub fn hidpi_factor(&self) -> f64 {
         1.0
     }
 }
@@ -236,16 +243,17 @@ pub struct PlatformSpecificWindowBuilderAttributes;
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
 impl Window {
-    pub fn new(_: &EventsLoop, win_attribs: WindowAttributes,
-               _: PlatformSpecificWindowBuilderAttributes)
-               -> Result<Window, CreationError>
-    {
-        let native_window = unsafe { android_glue::get_native_window() };
+    pub fn new(
+        _: &EventLoop,
+        win_attribs: WindowAttributes,
+        _: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Window, CreationError> {
+        let native_window = unsafe { android_glue::native_window() };
         if native_window.is_null() {
             return Err(OsError(format!("Android's native window is null")));
         }
 
-        android_glue::set_multitouch(win_attribs.multitouch);
+        android_glue::set_multitouch(true);
 
         Ok(Window {
             native_window: native_window as *const _,
@@ -253,7 +261,7 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_native_window(&self) -> *const c_void {
+    pub fn native_window(&self) -> *const c_void {
         self.native_window
     }
 
@@ -273,29 +281,29 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_position(&self) -> Option<LogicalPosition> {
+    pub fn outer_position(&self) -> Option<LogicalPosition> {
         // N/A
         None
     }
 
     #[inline]
-    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+    pub fn inner_position(&self) -> Option<LogicalPosition> {
         // N/A
         None
     }
 
     #[inline]
-    pub fn set_position(&self, _position: LogicalPosition) {
+    pub fn set_outer_position(&self, _position: LogicalPosition) {
         // N/A
     }
 
     #[inline]
-    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_min_inner_size(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
     #[inline]
-    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_max_inner_size(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
@@ -305,19 +313,19 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+    pub fn inner_size(&self) -> Option<LogicalSize> {
         if self.native_window.is_null() {
             None
         } else {
-            let dpi_factor = self.get_hidpi_factor();
-            let physical_size = self.get_current_monitor().get_dimensions();
+            let dpi_factor = self.hidpi_factor();
+            let physical_size = self.current_monitor().size();
             Some(LogicalSize::from_physical(physical_size, dpi_factor))
         }
     }
 
     #[inline]
-    pub fn get_outer_size(&self) -> Option<LogicalSize> {
-        self.get_inner_size()
+    pub fn outer_size(&self) -> Option<LogicalSize> {
+        self.inner_size()
     }
 
     #[inline]
@@ -326,18 +334,18 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f64 {
-        self.get_current_monitor().get_hidpi_factor()
+    pub fn hidpi_factor(&self) -> f64 {
+        self.current_monitor().hidpi_factor()
     }
 
     #[inline]
-    pub fn set_cursor(&self, _: MouseCursor) {
+    pub fn set_cursor_icon(&self, _: CursorIcon) {
         // N/A
     }
 
     #[inline]
-    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
-        Err("Cursor grabbing is not possible on Android.".to_owned())
+    pub fn set_cursor_grab(&self, _grab: bool) -> Result<(), ExternalError> {
+        Err(ExternalError::NotSupported(NotSupportedError::new()))
     }
 
     #[inline]
@@ -346,8 +354,8 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
-        Err("Setting cursor position is not possible on Android.".to_owned())
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), ExternalError> {
+        Err(ExternalError::NotSupported(NotSupportedError::new()))
     }
 
     #[inline]
@@ -357,7 +365,14 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorId>) {
+    pub fn fullscreen(&self) -> Option<RootMonitorHandle> {
+        // N/A
+        // Android has single screen maximized apps so nothing to do
+        None
+    }
+
+    #[inline]
+    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorHandle>) {
         // N/A
         // Android has single screen maximized apps so nothing to do
     }
@@ -378,25 +393,27 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_ime_spot(&self, _spot: LogicalPosition) {
+    pub fn set_ime_position(&self, _spot: LogicalPosition) {
         // N/A
     }
 
     #[inline]
-    pub fn get_current_monitor(&self) -> RootMonitorId {
-        RootMonitorId { inner: MonitorId }
+    pub fn current_monitor(&self) -> RootMonitorHandle {
+        RootMonitorHandle {
+            inner: MonitorHandle,
+        }
     }
 
     #[inline]
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
         let mut rb = VecDeque::with_capacity(1);
-        rb.push_back(MonitorId);
+        rb.push_back(MonitorHandle);
         rb
     }
 
     #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        MonitorId
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        MonitorHandle
     }
 
     #[inline]

src/platform_impl/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,30 +71,45 @@ 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 {
@@ -136,7 +151,9 @@ 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)]
@@ -219,96 +236,128 @@ 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_impl/emscripten/mod.rs

@@ -2,19 +2,27 @@
 
 mod ffi;
 
-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 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 dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
-use window::MonitorId as RootMonitorId;
+use crate::{
+    dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize},
+    error::{ExternalError, NotSupportedError},
+    window::MonitorHandle as RootMonitorHandle,
+};
 
 const DOCUMENT_NAME: &'static str = "#document\0";
 
-fn get_hidpi_factor() -> f64 {
+fn hidpi_factor() -> f64 {
     unsafe { ffi::emscripten_get_device_pixel_ratio() as f64 }
 }
 
@@ -24,34 +32,42 @@ 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;
 
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId
+    }
+}
+
 #[derive(Clone, Default)]
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
 #[derive(Debug, Clone)]
-pub struct MonitorId;
+pub struct MonitorHandle;
 
-impl MonitorId {
+impl MonitorHandle {
     #[inline]
-    pub fn get_name(&self) -> Option<String> {
+    pub fn name(&self) -> Option<String> {
         Some("Canvas".to_owned())
     }
 
     #[inline]
-    pub fn get_position(&self) -> PhysicalPosition {
+    pub fn outer_position(&self) -> PhysicalPosition {
         unimplemented!()
     }
 
     #[inline]
-    pub fn get_dimensions(&self) -> PhysicalSize {
+    pub fn size(&self) -> PhysicalSize {
         (0, 0).into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f64 {
-        get_hidpi_factor()
+    pub fn hidpi_factor(&self) -> f64 {
+        hidpi_factor()
     }
 }
 
@@ -59,14 +75,22 @@ impl MonitorId {
 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)();
@@ -75,22 +99,22 @@ pub fn set_main_loop_callback<F>(callback : F) where F : FnMut() {
 }
 
 #[derive(Clone)]
-pub struct EventsLoopProxy;
+pub struct EventLoopProxy;
 
-impl EventsLoopProxy {
-    pub fn wakeup(&self) -> Result<(), ::EventsLoopClosed> {
+impl EventLoopProxy {
+    pub fn wakeup(&self) -> Result<(), ::EventLoopClosed> {
         unimplemented!()
     }
 }
 
-pub struct EventsLoop {
+pub struct EventLoop {
     window: Mutex<Option<Arc<Window2>>>,
     interrupted: AtomicBool,
 }
 
-impl EventsLoop {
-    pub fn new() -> EventsLoop {
-        EventsLoop {
+impl EventLoop {
+    pub fn new() -> EventLoop {
+        EventLoop {
             window: Mutex::new(None),
             interrupted: AtomicBool::new(false),
         }
@@ -102,24 +126,25 @@ impl EventsLoop {
     }
 
     #[inline]
-    pub fn create_proxy(&self) -> EventsLoopProxy {
+    pub fn create_proxy(&self) -> EventLoopProxy {
         unimplemented!()
     }
 
     #[inline]
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
         let mut list = VecDeque::with_capacity(1);
-        list.push_back(MonitorId);
+        list.push_back(MonitorHandle);
         list
     }
 
     #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        MonitorId
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        MonitorHandle
     }
 
     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 {
@@ -130,17 +155,22 @@ impl EventsLoop {
     }
 
     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();
+                }
             }
         });
     }
@@ -149,9 +179,15 @@ impl EventsLoop {
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct WindowId(usize);
 
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId(0)
+    }
+}
+
 pub struct Window2 {
     cursor_grabbed: Mutex<bool>,
-    cursor_hidden: Mutex<bool>,
+    cursor_visible: Mutex<bool>,
     is_fullscreen: bool,
     events: Box<Mutex<VecDeque<::Event>>>,
 }
@@ -175,15 +211,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);
 
@@ -196,7 +232,7 @@ extern "C" fn mouse_callback(
 
         match event_type {
             ffi::EMSCRIPTEN_EVENT_MOUSEMOVE => {
-                let dpi_factor = get_hidpi_factor();
+                let dpi_factor = hidpi_factor();
                 let position = LogicalPosition::from_physical(
                     ((*event).canvasX as f64, (*event).canvasY as f64),
                     dpi_factor,
@@ -206,18 +242,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,
@@ -233,14 +269,13 @@ extern "C" fn mouse_callback(
                     window_id: ::WindowId(WindowId(0)),
                     event: ::WindowEvent::MouseInput {
                         device_id: ::DeviceId(DeviceId),
-                        state: state,
-                        button: button,
-                        modifiers: modifiers,
-                    }
+                        state,
+                        button,
+                        modifiers,
+                    },
                 })
             },
-            _ => {
-            }
+            _ => {},
         }
     }
     ffi::EM_FALSE
@@ -249,8 +284,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);
 
@@ -290,18 +325,17 @@ extern "C" fn keyboard_callback(
                     },
                 });
             },
-            _ => {
-            }
+            _ => {},
         }
     }
     ffi::EM_FALSE
 }
 
-extern fn touch_callback(
+extern "C" 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);
 
@@ -316,7 +350,7 @@ extern 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 = get_hidpi_factor();
+                let dpi_factor = hidpi_factor();
                 let location = LogicalPosition::from_physical(
                     (touch.canvasX as f64, touch.canvasY as f64),
                     dpi_factor,
@@ -341,8 +375,8 @@ extern 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
 }
@@ -352,8 +386,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
 }
@@ -366,17 +400,20 @@ fn em_try(res: ffi::EMSCRIPTEN_RESULT) -> Result<(), String> {
 }
 
 impl Window {
-    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()));
+    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(),
+            ));
         }
 
         let w = Window2 {
-            cursor_grabbed: Default::default(),
-            cursor_hidden: Default::default(),
+            cursor_grabbed: Mutex::new(false),
+            cursor_visible: Mutex::new(true),
             events: Default::default(),
             is_fullscreen: attribs.fullscreen.is_some(),
         };
@@ -385,41 +422,93 @@ 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.dimensions {
+        } else if let Some(size) = attribs.inner_size {
             window.set_inner_size(size);
         }
 
-        *events_loop.window.lock().unwrap() = Some(window.window.clone());
+        *event_loop.window.lock().unwrap() = Some(window.window.clone());
         Ok(window)
     }
 
@@ -429,25 +518,23 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_title(&self, _title: &str) {
-    }
+    pub fn set_title(&self, _title: &str) {}
 
     #[inline]
-    pub fn get_position(&self) -> Option<LogicalPosition> {
+    pub fn outer_position(&self) -> Option<LogicalPosition> {
         Some((0, 0).into())
     }
 
     #[inline]
-    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+    pub fn inner_position(&self) -> Option<LogicalPosition> {
         Some((0, 0).into())
     }
 
     #[inline]
-    pub fn set_position(&self, _: LogicalPosition) {
-    }
+    pub fn set_outer_position(&self, _: LogicalPosition) {}
 
     #[inline]
-    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+    pub fn inner_size(&self) -> Option<LogicalSize> {
         unsafe {
             let mut width = 0;
             let mut height = 0;
@@ -458,7 +545,7 @@ impl Window {
             {
                 None
             } else {
-                let dpi_factor = self.get_hidpi_factor();
+                let dpi_factor = self.hidpi_factor();
                 let logical = LogicalSize::from_physical((width as u32, height as u32), dpi_factor);
                 Some(logical)
             }
@@ -466,14 +553,14 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_outer_size(&self) -> Option<LogicalSize> {
-        self.get_inner_size()
+    pub fn outer_size(&self) -> Option<LogicalSize> {
+        self.inner_size()
     }
 
     #[inline]
     pub fn set_inner_size(&self, size: LogicalSize) {
         unsafe {
-            let dpi_factor = self.get_hidpi_factor();
+            let dpi_factor = self.hidpi_factor();
             let physical = PhysicalSize::from_logical(size, dpi_factor);
             let (width, height): (u32, u32) = physical.into();
             ffi::emscripten_set_element_css_size(
@@ -485,12 +572,12 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_min_inner_size(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
     #[inline]
-    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_max_inner_size(&self, _dimensions: Option<LogicalSize>) {
         // N/A
     }
 
@@ -510,14 +597,16 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor(&self, _cursor: ::MouseCursor) {
+    pub fn set_cursor_icon(&self, _cursor: ::CursorIcon) {
         // N/A
     }
 
     #[inline]
-    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
+    pub fn set_cursor_grab(&self, grab: bool) -> Result<(), ExternalError> {
         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(
@@ -526,7 +615,10 @@ 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(),
@@ -542,24 +634,26 @@ impl Window {
     }
 
     #[inline]
-    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();
+    pub fn set_cursor_visible(&self, visible: bool) {
+        let mut visible_lock = self.window.cursor_visible.lock().unwrap();
+        if visible == *visible_lock {
+            return;
         }
-        *hidden_lock = hide;
+        if visible {
+            show_mouse();
+        } else {
+            unsafe { ffi::emscripten_hide_mouse() };
+        }
+        *visible_lock = visible;
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f64 {
-        get_hidpi_factor()
+    pub fn hidpi_factor(&self) -> f64 {
+        hidpi_factor()
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), ExternalError> {
         Err("Setting cursor position is not possible on Emscripten.".to_owned())
     }
 
@@ -569,7 +663,12 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_fullscreen(&self, _monitor: Option<::MonitorId>) {
+    pub fn fullscreen(&self) -> Option<::MonitorHandle> {
+        None
+    }
+
+    #[inline]
+    pub fn set_fullscreen(&self, _monitor: Option<::MonitorHandle>) {
         // iOS has single screen maximized apps so nothing to do
     }
 
@@ -589,58 +688,76 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_ime_spot(&self, _logical_spot: LogicalPosition) {
+    pub fn set_ime_position(&self, _logical_spot: LogicalPosition) {
         // N/A
     }
 
     #[inline]
-    pub fn get_current_monitor(&self) -> RootMonitorId {
-        RootMonitorId { inner: MonitorId }
+    pub fn current_monitor(&self) -> RootMonitorHandle {
+        RootMonitorHandle {
+            inner: MonitorHandle,
+        }
     }
 
     #[inline]
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
         let mut list = VecDeque::with_capacity(1);
-        list.push_back(MonitorId);
+        list.push_back(MonitorHandle);
         list
     }
 
     #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        MonitorId
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        MonitorHandle
     }
 }
 
 impl Drop for Window {
     fn drop(&mut self) {
-        // Delete window from events_loop
+        // Delete window from event_loop
         // TODO: ?
-        /*if let Some(ev) = self.events_loop.upgrade() {
+        /*if let Some(ev) = self.event_loop.upgrade() {
             let _ = ev.window.lock().unwrap().take().unwrap();
         }*/
 
         unsafe {
             // Return back to normal cursor state
             self.hide_cursor(false);
-            self.grab_cursor(false);
+            self.set_cursor_grab(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",
@@ -650,7 +767,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",
     }
 }
 
@@ -659,7 +776,9 @@ 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]
@@ -668,28 +787,35 @@ 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,
@@ -697,18 +823,22 @@ fn key_translate_virt(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES
         "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),
@@ -810,11 +940,15 @@ fn key_translate_virt(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES
         "F13" => Some(F13),
         "F14" => Some(F14),
         "F15" => Some(F15),
-        "F16" => None,
-        "F17" => None,
-        "F18" => None,
-        "F19" => None,
-        "F20" => None,
+        "F16" => Some(F16),
+        "F17" => Some(F17),
+        "F18" => Some(F18),
+        "F19" => Some(F19),
+        "F20" => Some(F20),
+        "F21" => Some(F21),
+        "F22" => Some(F22),
+        "F23" => Some(F23),
+        "F24" => Some(F24),
         "Soft1" => None,
         "Soft2" => None,
         "Soft3" => None,
@@ -1029,45 +1163,65 @@ fn key_translate_virt(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES
         "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),
@@ -1100,13 +1254,17 @@ fn key_translate_virt(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES
         "'" => 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_impl/ios/app_state.rs

@@ -0,0 +1,632 @@
+use std::{
+    cell::{RefCell, RefMut},
+    mem::{self, ManuallyDrop},
+    os::raw::c_void,
+    ptr,
+    time::Instant,
+};
+
+use crate::{
+    event::{Event, StartCause},
+    event_loop::ControlFlow,
+};
+
+use crate::platform_impl::platform::{
+    event_loop::{EventHandler, Never},
+    ffi::{
+        id, kCFRunLoopCommonModes, CFAbsoluteTimeGetCurrent, CFRelease, CFRunLoopAddTimer,
+        CFRunLoopGetMain, CFRunLoopRef, CFRunLoopTimerCreate, CFRunLoopTimerInvalidate,
+        CFRunLoopTimerRef, CFRunLoopTimerSetNextFireDate, NSUInteger,
+    },
+};
+
+macro_rules! bug {
+    ($msg:expr) => {
+        panic!("winit iOS bug, file an issue: {}", $msg)
+    };
+}
+
+// this is the state machine for the app lifecycle
+#[derive(Debug)]
+enum AppStateImpl {
+    NotLaunched {
+        queued_windows: Vec<id>,
+        queued_events: Vec<Event<Never>>,
+    },
+    Launching {
+        queued_windows: Vec<id>,
+        queued_events: Vec<Event<Never>>,
+        queued_event_handler: Box<dyn EventHandler>,
+    },
+    ProcessingEvents {
+        event_handler: Box<dyn EventHandler>,
+        active_control_flow: ControlFlow,
+    },
+    // special state to deal with reentrancy and prevent mutable aliasing.
+    InUserCallback {
+        queued_events: Vec<Event<Never>>,
+    },
+    Waiting {
+        waiting_event_handler: Box<dyn EventHandler>,
+        start: Instant,
+    },
+    PollFinished {
+        waiting_event_handler: Box<dyn EventHandler>,
+    },
+    Terminated,
+}
+
+impl Drop for AppStateImpl {
+    fn drop(&mut self) {
+        match self {
+            &mut AppStateImpl::NotLaunched {
+                ref mut queued_windows,
+                ..
+            }
+            | &mut AppStateImpl::Launching {
+                ref mut queued_windows,
+                ..
+            } => unsafe {
+                for &mut window in queued_windows {
+                    let () = msg_send![window, release];
+                }
+            },
+            _ => {},
+        }
+    }
+}
+
+pub struct AppState {
+    app_state: AppStateImpl,
+    control_flow: ControlFlow,
+    waker: EventLoopWaker,
+}
+
+impl AppState {
+    // requires main thread
+    unsafe fn get_mut() -> RefMut<'static, AppState> {
+        // basically everything in UIKit requires the main thread, so it's pointless to use the
+        // std::sync APIs.
+        // must be mut because plain `static` requires `Sync`
+        static mut APP_STATE: RefCell<Option<AppState>> = RefCell::new(None);
+
+        if cfg!(debug_assertions) {
+            assert_main_thread!(
+                "bug in winit: `AppState::get_mut()` can only be called on the main thread"
+            );
+        }
+
+        let mut guard = APP_STATE.borrow_mut();
+        if guard.is_none() {
+            #[inline(never)]
+            #[cold]
+            unsafe fn init_guard(guard: &mut RefMut<'static, Option<AppState>>) {
+                let waker = EventLoopWaker::new(CFRunLoopGetMain());
+                **guard = Some(AppState {
+                    app_state: AppStateImpl::NotLaunched {
+                        queued_windows: Vec::new(),
+                        queued_events: Vec::new(),
+                    },
+                    control_flow: ControlFlow::default(),
+                    waker,
+                });
+            }
+            init_guard(&mut guard)
+        }
+        RefMut::map(guard, |state| state.as_mut().unwrap())
+    }
+
+    // requires main thread and window is a UIWindow
+    // retains window
+    pub unsafe fn set_key_window(window: id) {
+        let mut this = AppState::get_mut();
+        match &mut this.app_state {
+            &mut AppStateImpl::NotLaunched {
+                ref mut queued_windows,
+                ..
+            } => {
+                queued_windows.push(window);
+                msg_send![window, retain];
+                return;
+            },
+            &mut AppStateImpl::ProcessingEvents { .. } => {},
+            &mut AppStateImpl::InUserCallback { .. } => {},
+            &mut AppStateImpl::Terminated => {
+                panic!(
+                    "Attempt to create a `Window` \
+                     after the app has terminated"
+                )
+            },
+            app_state => unreachable!("unexpected state: {:#?}", app_state), /* all other cases should be impossible */
+        }
+        drop(this);
+        msg_send![window, makeKeyAndVisible]
+    }
+
+    // requires main thread
+    pub unsafe fn will_launch(queued_event_handler: Box<dyn EventHandler>) {
+        let mut this = AppState::get_mut();
+        let (queued_windows, queued_events) = match &mut this.app_state {
+            &mut AppStateImpl::NotLaunched {
+                ref mut queued_windows,
+                ref mut queued_events,
+            } => {
+                let windows = ptr::read(queued_windows);
+                let events = ptr::read(queued_events);
+                (windows, events)
+            },
+            _ => {
+                panic!(
+                    "winit iOS expected the app to be in a `NotLaunched` \
+                     state, but was not - please file an issue"
+                )
+            },
+        };
+        ptr::write(
+            &mut this.app_state,
+            AppStateImpl::Launching {
+                queued_windows,
+                queued_events,
+                queued_event_handler,
+            },
+        );
+    }
+
+    // requires main thread
+    pub unsafe fn did_finish_launching() {
+        let mut this = AppState::get_mut();
+        let windows = match &mut this.app_state {
+            &mut AppStateImpl::Launching {
+                ref mut queued_windows,
+                ..
+            } => mem::replace(queued_windows, Vec::new()),
+            _ => {
+                panic!(
+                    "winit iOS expected the app to be in a `Launching` \
+                     state, but was not - please file an issue"
+                )
+            },
+        };
+        // have to drop RefMut because the window setup code below can trigger new events
+        drop(this);
+
+        for window in windows {
+            let count: NSUInteger = msg_send![window, retainCount];
+            // make sure the window is still referenced
+            if count > 1 {
+                // Do a little screen dance here to account for windows being created before
+                // `UIApplicationMain` is called. This fixes visual issues such as being
+                // offcenter and sized incorrectly. Additionally, to fix orientation issues, we
+                // gotta reset the `rootViewController`.
+                //
+                // relevant iOS log:
+                // ```
+                // [ApplicationLifecycle] Windows were created before application initialzation
+                // completed. This may result in incorrect visual appearance.
+                // ```
+                let screen: id = msg_send![window, screen];
+                let () = msg_send![screen, retain];
+                let () = msg_send![window, setScreen:0 as id];
+                let () = msg_send![window, setScreen: screen];
+                let () = msg_send![screen, release];
+                let controller: id = msg_send![window, rootViewController];
+                let () = msg_send![window, setRootViewController:ptr::null::<()>()];
+                let () = msg_send![window, setRootViewController: controller];
+                let () = msg_send![window, makeKeyAndVisible];
+            }
+            let () = msg_send![window, release];
+        }
+
+        let mut this = AppState::get_mut();
+        let (windows, events, event_handler) = match &mut this.app_state {
+            &mut AppStateImpl::Launching {
+                ref mut queued_windows,
+                ref mut queued_events,
+                ref mut queued_event_handler,
+            } => {
+                let windows = ptr::read(queued_windows);
+                let events = ptr::read(queued_events);
+                let event_handler = ptr::read(queued_event_handler);
+                (windows, events, event_handler)
+            },
+            _ => {
+                panic!(
+                    "winit iOS expected the app to be in a `Launching` \
+                     state, but was not - please file an issue"
+                )
+            },
+        };
+        ptr::write(
+            &mut this.app_state,
+            AppStateImpl::ProcessingEvents {
+                event_handler,
+                active_control_flow: ControlFlow::Poll,
+            },
+        );
+        drop(this);
+
+        let events = std::iter::once(Event::NewEvents(StartCause::Init)).chain(events);
+        AppState::handle_nonuser_events(events);
+
+        // the above window dance hack, could possibly trigger new windows to be created.
+        // we can just set those windows up normally, as they were created after didFinishLaunching
+        for window in windows {
+            let count: NSUInteger = msg_send![window, retainCount];
+            // make sure the window is still referenced
+            if count > 1 {
+                let () = msg_send![window, makeKeyAndVisible];
+            }
+            let () = msg_send![window, release];
+        }
+    }
+
+    // requires main thread
+    // AppState::did_finish_launching handles the special transition `Init`
+    pub unsafe fn handle_wakeup_transition() {
+        let mut this = AppState::get_mut();
+        let event =
+            match this.control_flow {
+                ControlFlow::Poll => {
+                    let event_handler = match &mut this.app_state {
+                        &mut AppStateImpl::NotLaunched { .. }
+                        | &mut AppStateImpl::Launching { .. } => return,
+                        &mut AppStateImpl::PollFinished {
+                            ref mut waiting_event_handler,
+                        } => ptr::read(waiting_event_handler),
+                        _ => bug!("`EventHandler` unexpectedly started polling"),
+                    };
+                    ptr::write(
+                        &mut this.app_state,
+                        AppStateImpl::ProcessingEvents {
+                            event_handler,
+                            active_control_flow: ControlFlow::Poll,
+                        },
+                    );
+                    Event::NewEvents(StartCause::Poll)
+                },
+                ControlFlow::Wait => {
+                    let (event_handler, start) = match &mut this.app_state {
+                        &mut AppStateImpl::NotLaunched { .. }
+                        | &mut AppStateImpl::Launching { .. } => return,
+                        &mut AppStateImpl::Waiting {
+                            ref mut waiting_event_handler,
+                            ref mut start,
+                        } => (ptr::read(waiting_event_handler), *start),
+                        _ => bug!("`EventHandler` unexpectedly woke up"),
+                    };
+                    ptr::write(
+                        &mut this.app_state,
+                        AppStateImpl::ProcessingEvents {
+                            event_handler,
+                            active_control_flow: ControlFlow::Wait,
+                        },
+                    );
+                    Event::NewEvents(StartCause::WaitCancelled {
+                        start,
+                        requested_resume: None,
+                    })
+                },
+                ControlFlow::WaitUntil(requested_resume) => {
+                    let (event_handler, start) = match &mut this.app_state {
+                        &mut AppStateImpl::NotLaunched { .. }
+                        | &mut AppStateImpl::Launching { .. } => return,
+                        &mut AppStateImpl::Waiting {
+                            ref mut waiting_event_handler,
+                            ref mut start,
+                        } => (ptr::read(waiting_event_handler), *start),
+                        _ => bug!("`EventHandler` unexpectedly woke up"),
+                    };
+                    ptr::write(
+                        &mut this.app_state,
+                        AppStateImpl::ProcessingEvents {
+                            event_handler,
+                            active_control_flow: ControlFlow::WaitUntil(requested_resume),
+                        },
+                    );
+                    if Instant::now() >= requested_resume {
+                        Event::NewEvents(StartCause::ResumeTimeReached {
+                            start,
+                            requested_resume,
+                        })
+                    } else {
+                        Event::NewEvents(StartCause::WaitCancelled {
+                            start,
+                            requested_resume: Some(requested_resume),
+                        })
+                    }
+                },
+                ControlFlow::Exit => bug!("unexpected controlflow `Exit`"),
+            };
+        drop(this);
+        AppState::handle_nonuser_event(event)
+    }
+
+    // requires main thread
+    pub unsafe fn handle_nonuser_event(event: Event<Never>) {
+        AppState::handle_nonuser_events(std::iter::once(event))
+    }
+
+    // requires main thread
+    pub unsafe fn handle_nonuser_events<I: IntoIterator<Item = Event<Never>>>(events: I) {
+        let mut this = AppState::get_mut();
+        let mut control_flow = this.control_flow;
+        let (mut event_handler, active_control_flow) = match &mut this.app_state {
+            &mut AppStateImpl::Launching {
+                ref mut queued_events,
+                ..
+            }
+            | &mut AppStateImpl::NotLaunched {
+                ref mut queued_events,
+                ..
+            }
+            | &mut AppStateImpl::InUserCallback {
+                ref mut queued_events,
+                ..
+            } => {
+                queued_events.extend(events);
+                return;
+            },
+            &mut AppStateImpl::ProcessingEvents {
+                ref mut event_handler,
+                ref mut active_control_flow,
+            } => (ptr::read(event_handler), *active_control_flow),
+            &mut AppStateImpl::PollFinished { .. }
+            | &mut AppStateImpl::Waiting { .. }
+            | &mut AppStateImpl::Terminated => bug!("unexpected attempted to process an event"),
+        };
+        ptr::write(
+            &mut this.app_state,
+            AppStateImpl::InUserCallback {
+                queued_events: Vec::new(),
+            },
+        );
+        drop(this);
+
+        for event in events {
+            event_handler.handle_nonuser_event(event, &mut control_flow)
+        }
+        loop {
+            let mut this = AppState::get_mut();
+            let queued_events = match &mut this.app_state {
+                &mut AppStateImpl::InUserCallback {
+                    ref mut queued_events,
+                } => mem::replace(queued_events, Vec::new()),
+                _ => bug!("unexpected `AppStateImpl`"),
+            };
+            if queued_events.is_empty() {
+                this.app_state = AppStateImpl::ProcessingEvents {
+                    event_handler,
+                    active_control_flow,
+                };
+                this.control_flow = control_flow;
+                break;
+            }
+            drop(this);
+            for event in queued_events {
+                event_handler.handle_nonuser_event(event, &mut control_flow)
+            }
+        }
+    }
+
+    // requires main thread
+    pub unsafe fn handle_user_events() {
+        let mut this = AppState::get_mut();
+        let mut control_flow = this.control_flow;
+        let (mut event_handler, active_control_flow) = match &mut this.app_state {
+            &mut AppStateImpl::NotLaunched { .. } | &mut AppStateImpl::Launching { .. } => return,
+            &mut AppStateImpl::ProcessingEvents {
+                ref mut event_handler,
+                ref mut active_control_flow,
+            } => (ptr::read(event_handler), *active_control_flow),
+            &mut AppStateImpl::InUserCallback { .. }
+            | &mut AppStateImpl::PollFinished { .. }
+            | &mut AppStateImpl::Waiting { .. }
+            | &mut AppStateImpl::Terminated => bug!("unexpected attempted to process an event"),
+        };
+        ptr::write(
+            &mut this.app_state,
+            AppStateImpl::InUserCallback {
+                queued_events: Vec::new(),
+            },
+        );
+        drop(this);
+
+        event_handler.handle_user_events(&mut control_flow);
+        loop {
+            let mut this = AppState::get_mut();
+            let queued_events = match &mut this.app_state {
+                &mut AppStateImpl::InUserCallback {
+                    ref mut queued_events,
+                } => mem::replace(queued_events, Vec::new()),
+                _ => bug!("unexpected `AppStateImpl`"),
+            };
+            if queued_events.is_empty() {
+                this.app_state = AppStateImpl::ProcessingEvents {
+                    event_handler,
+                    active_control_flow,
+                };
+                this.control_flow = control_flow;
+                break;
+            }
+            drop(this);
+            for event in queued_events {
+                event_handler.handle_nonuser_event(event, &mut control_flow)
+            }
+            event_handler.handle_user_events(&mut control_flow);
+        }
+    }
+
+    // requires main thread
+    pub unsafe fn handle_events_cleared() {
+        let mut this = AppState::get_mut();
+        match &mut this.app_state {
+            &mut AppStateImpl::NotLaunched { .. } | &mut AppStateImpl::Launching { .. } => return,
+            &mut AppStateImpl::ProcessingEvents { .. } => {},
+            _ => unreachable!(),
+        };
+        drop(this);
+
+        AppState::handle_user_events();
+        AppState::handle_nonuser_event(Event::EventsCleared);
+
+        let mut this = AppState::get_mut();
+        let (event_handler, old) = match &mut this.app_state {
+            &mut AppStateImpl::ProcessingEvents {
+                ref mut event_handler,
+                ref mut active_control_flow,
+            } => {
+                (
+                    ManuallyDrop::new(ptr::read(event_handler)),
+                    *active_control_flow,
+                )
+            },
+            _ => unreachable!(),
+        };
+
+        let new = this.control_flow;
+        match (old, new) {
+            (ControlFlow::Poll, ControlFlow::Poll) => {
+                ptr::write(
+                    &mut this.app_state,
+                    AppStateImpl::PollFinished {
+                        waiting_event_handler: ManuallyDrop::into_inner(event_handler),
+                    },
+                )
+            },
+            (ControlFlow::Wait, ControlFlow::Wait) => {
+                let start = Instant::now();
+                ptr::write(
+                    &mut this.app_state,
+                    AppStateImpl::Waiting {
+                        waiting_event_handler: ManuallyDrop::into_inner(event_handler),
+                        start,
+                    },
+                )
+            },
+            (ControlFlow::WaitUntil(old_instant), ControlFlow::WaitUntil(new_instant))
+                if old_instant == new_instant =>
+            {
+                let start = Instant::now();
+                ptr::write(
+                    &mut this.app_state,
+                    AppStateImpl::Waiting {
+                        waiting_event_handler: ManuallyDrop::into_inner(event_handler),
+                        start,
+                    },
+                )
+            }
+            (_, ControlFlow::Wait) => {
+                let start = Instant::now();
+                ptr::write(
+                    &mut this.app_state,
+                    AppStateImpl::Waiting {
+                        waiting_event_handler: ManuallyDrop::into_inner(event_handler),
+                        start,
+                    },
+                );
+                this.waker.stop()
+            },
+            (_, ControlFlow::WaitUntil(new_instant)) => {
+                let start = Instant::now();
+                ptr::write(
+                    &mut this.app_state,
+                    AppStateImpl::Waiting {
+                        waiting_event_handler: ManuallyDrop::into_inner(event_handler),
+                        start,
+                    },
+                );
+                this.waker.start_at(new_instant)
+            },
+            (_, ControlFlow::Poll) => {
+                ptr::write(
+                    &mut this.app_state,
+                    AppStateImpl::PollFinished {
+                        waiting_event_handler: ManuallyDrop::into_inner(event_handler),
+                    },
+                );
+                this.waker.start()
+            },
+            (_, ControlFlow::Exit) => {
+                // https://developer.apple.com/library/archive/qa/qa1561/_index.html
+                // it is not possible to quit an iOS app gracefully and programatically
+                warn!("`ControlFlow::Exit` ignored on iOS");
+                this.control_flow = old
+            },
+        }
+    }
+
+    pub fn terminated() {
+        let mut this = unsafe { AppState::get_mut() };
+        let mut old = mem::replace(&mut this.app_state, AppStateImpl::Terminated);
+        let mut control_flow = this.control_flow;
+        if let AppStateImpl::ProcessingEvents {
+            ref mut event_handler,
+            ..
+        } = old
+        {
+            drop(this);
+            event_handler.handle_nonuser_event(Event::LoopDestroyed, &mut control_flow)
+        } else {
+            bug!("`LoopDestroyed` happened while not processing events")
+        }
+    }
+}
+
+struct EventLoopWaker {
+    timer: CFRunLoopTimerRef,
+}
+
+impl Drop for EventLoopWaker {
+    fn drop(&mut self) {
+        unsafe {
+            CFRunLoopTimerInvalidate(self.timer);
+            CFRelease(self.timer as _);
+        }
+    }
+}
+
+impl EventLoopWaker {
+    fn new(rl: CFRunLoopRef) -> EventLoopWaker {
+        extern "C" fn wakeup_main_loop(_timer: CFRunLoopTimerRef, _info: *mut c_void) {}
+        unsafe {
+            // create a timer with a 1microsec interval (1ns does not work) to mimic polling.
+            // it is initially setup with a first fire time really far into the
+            // future, but that gets changed to fire immediatley in did_finish_launching
+            let timer = CFRunLoopTimerCreate(
+                ptr::null_mut(),
+                std::f64::MAX,
+                0.000_000_1,
+                0,
+                0,
+                wakeup_main_loop,
+                ptr::null_mut(),
+            );
+            CFRunLoopAddTimer(rl, timer, kCFRunLoopCommonModes);
+
+            EventLoopWaker { timer }
+        }
+    }
+
+    fn stop(&mut self) {
+        unsafe { CFRunLoopTimerSetNextFireDate(self.timer, std::f64::MAX) }
+    }
+
+    fn start(&mut self) {
+        unsafe { CFRunLoopTimerSetNextFireDate(self.timer, std::f64::MIN) }
+    }
+
+    fn start_at(&mut self, instant: Instant) {
+        let now = Instant::now();
+        if now >= instant {
+            self.start();
+        } else {
+            unsafe {
+                let current = CFAbsoluteTimeGetCurrent();
+                let duration = instant - now;
+                let fsecs =
+                    duration.subsec_nanos() as f64 / 1_000_000_000.0 + duration.as_secs() as f64;
+                CFRunLoopTimerSetNextFireDate(self.timer, current + fsecs)
+            }
+        }
+    }
+}

src/platform_impl/ios/event_loop.rs

@@ -0,0 +1,317 @@
+use std::{
+    collections::VecDeque,
+    ffi::c_void,
+    fmt::{self, Debug, Formatter},
+    marker::PhantomData,
+    mem, ptr,
+    sync::mpsc::{self, Receiver, Sender},
+};
+
+use crate::{
+    event::Event,
+    event_loop::{
+        ControlFlow, EventLoopClosed, EventLoopWindowTarget as RootEventLoopWindowTarget,
+    },
+    platform::ios::Idiom,
+};
+
+use crate::platform_impl::platform::{
+    app_state::AppState,
+    ffi::{
+        id, kCFRunLoopAfterWaiting, kCFRunLoopBeforeWaiting, kCFRunLoopCommonModes,
+        kCFRunLoopDefaultMode, kCFRunLoopEntry, kCFRunLoopExit, nil, CFIndex, CFRelease,
+        CFRunLoopActivity, CFRunLoopAddObserver, CFRunLoopAddSource, CFRunLoopGetMain,
+        CFRunLoopObserverCreate, CFRunLoopObserverRef, CFRunLoopSourceContext,
+        CFRunLoopSourceCreate, CFRunLoopSourceInvalidate, CFRunLoopSourceRef,
+        CFRunLoopSourceSignal, CFRunLoopWakeUp, NSOperatingSystemVersion, NSString,
+        UIApplicationMain, UIUserInterfaceIdiom,
+    },
+    monitor, view, MonitorHandle,
+};
+
+pub struct EventLoopWindowTarget<T: 'static> {
+    receiver: Receiver<T>,
+    sender_to_clone: Sender<T>,
+    capabilities: Capabilities,
+}
+
+impl<T: 'static> EventLoopWindowTarget<T> {
+    pub fn capabilities(&self) -> &Capabilities {
+        &self.capabilities
+    }
+}
+
+pub struct EventLoop<T: 'static> {
+    window_target: RootEventLoopWindowTarget<T>,
+}
+
+impl<T: 'static> EventLoop<T> {
+    pub fn new() -> EventLoop<T> {
+        static mut SINGLETON_INIT: bool = false;
+        unsafe {
+            assert_main_thread!("`EventLoop` can only be created on the main thread on iOS");
+            assert!(
+                !SINGLETON_INIT,
+                "Only one `EventLoop` is supported on iOS. \
+                 `EventLoopProxy` might be helpful"
+            );
+            SINGLETON_INIT = true;
+            view::create_delegate_class();
+        }
+
+        let (sender_to_clone, receiver) = mpsc::channel();
+
+        // this line sets up the main run loop before `UIApplicationMain`
+        setup_control_flow_observers();
+
+        let version: NSOperatingSystemVersion = unsafe {
+            let process_info: id = msg_send![class!(NSProcessInfo), processInfo];
+            msg_send![process_info, operatingSystemVersion]
+        };
+        let capabilities = version.into();
+
+        EventLoop {
+            window_target: RootEventLoopWindowTarget {
+                p: EventLoopWindowTarget {
+                    receiver,
+                    sender_to_clone,
+                    capabilities,
+                },
+                _marker: PhantomData,
+            },
+        }
+    }
+
+    pub fn run<F>(self, event_handler: F) -> !
+    where
+        F: 'static + FnMut(Event<T>, &RootEventLoopWindowTarget<T>, &mut ControlFlow),
+    {
+        unsafe {
+            let application: *mut c_void = msg_send![class!(UIApplication), sharedApplication];
+            assert_eq!(
+                application,
+                ptr::null_mut(),
+                "\
+                 `EventLoop` cannot be `run` after a call to `UIApplicationMain` on iOS\n\
+                 Note: `EventLoop::run` calls `UIApplicationMain` on iOS"
+            );
+            AppState::will_launch(Box::new(EventLoopHandler {
+                f: event_handler,
+                event_loop: self.window_target,
+            }));
+
+            UIApplicationMain(
+                0,
+                ptr::null(),
+                nil,
+                NSString::alloc(nil).init_str("AppDelegate"),
+            );
+            unreachable!()
+        }
+    }
+
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        EventLoopProxy::new(self.window_target.p.sender_to_clone.clone())
+    }
+
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        // guaranteed to be on main thread
+        unsafe { monitor::uiscreens() }
+    }
+
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        // guaranteed to be on main thread
+        unsafe { monitor::main_uiscreen() }
+    }
+
+    pub fn window_target(&self) -> &RootEventLoopWindowTarget<T> {
+        &self.window_target
+    }
+}
+
+// EventLoopExtIOS
+impl<T: 'static> EventLoop<T> {
+    pub fn idiom(&self) -> Idiom {
+        // guaranteed to be on main thread
+        unsafe { self::get_idiom() }
+    }
+}
+
+pub struct EventLoopProxy<T> {
+    sender: Sender<T>,
+    source: CFRunLoopSourceRef,
+}
+
+unsafe impl<T> Send for EventLoopProxy<T> {}
+unsafe impl<T> Sync for EventLoopProxy<T> {}
+
+impl<T> Clone for EventLoopProxy<T> {
+    fn clone(&self) -> EventLoopProxy<T> {
+        EventLoopProxy::new(self.sender.clone())
+    }
+}
+
+impl<T> Drop for EventLoopProxy<T> {
+    fn drop(&mut self) {
+        unsafe {
+            CFRunLoopSourceInvalidate(self.source);
+            CFRelease(self.source as _);
+        }
+    }
+}
+
+impl<T> EventLoopProxy<T> {
+    fn new(sender: Sender<T>) -> EventLoopProxy<T> {
+        unsafe {
+            // just wakeup the eventloop
+            extern "C" fn event_loop_proxy_handler(_: *mut c_void) {}
+
+            // adding a Source to the main CFRunLoop lets us wake it up and
+            // process user events through the normal OS EventLoop mechanisms.
+            let rl = CFRunLoopGetMain();
+            // we want all the members of context to be zero/null, except one
+            let mut context: CFRunLoopSourceContext = mem::zeroed();
+            context.perform = event_loop_proxy_handler;
+            let source =
+                CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::max_value() - 1, &mut context);
+            CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes);
+            CFRunLoopWakeUp(rl);
+
+            EventLoopProxy { sender, source }
+        }
+    }
+
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
+        self.sender.send(event).map_err(|_| EventLoopClosed)?;
+        unsafe {
+            // let the main thread know there's a new event
+            CFRunLoopSourceSignal(self.source);
+            let rl = CFRunLoopGetMain();
+            CFRunLoopWakeUp(rl);
+        }
+        Ok(())
+    }
+}
+
+fn setup_control_flow_observers() {
+    unsafe {
+        // begin is queued with the highest priority to ensure it is processed before other observers
+        extern "C" fn control_flow_begin_handler(
+            _: CFRunLoopObserverRef,
+            activity: CFRunLoopActivity,
+            _: *mut c_void,
+        ) {
+            unsafe {
+                #[allow(non_upper_case_globals)]
+                match activity {
+                    kCFRunLoopAfterWaiting => AppState::handle_wakeup_transition(),
+                    kCFRunLoopEntry => unimplemented!(), // not expected to ever happen
+                    _ => unreachable!(),
+                }
+            }
+        }
+
+        // end is queued with the lowest priority to ensure it is processed after other observers
+        // without that, LoopDestroyed will get sent after EventsCleared
+        extern "C" fn control_flow_end_handler(
+            _: CFRunLoopObserverRef,
+            activity: CFRunLoopActivity,
+            _: *mut c_void,
+        ) {
+            unsafe {
+                #[allow(non_upper_case_globals)]
+                match activity {
+                    kCFRunLoopBeforeWaiting => AppState::handle_events_cleared(),
+                    kCFRunLoopExit => unimplemented!(), // not expected to ever happen
+                    _ => unreachable!(),
+                }
+            }
+        }
+
+        let main_loop = CFRunLoopGetMain();
+        let begin_observer = CFRunLoopObserverCreate(
+            ptr::null_mut(),
+            kCFRunLoopEntry | kCFRunLoopAfterWaiting,
+            1, // repeat = true
+            CFIndex::min_value(),
+            control_flow_begin_handler,
+            ptr::null_mut(),
+        );
+        CFRunLoopAddObserver(main_loop, begin_observer, kCFRunLoopDefaultMode);
+        let end_observer = CFRunLoopObserverCreate(
+            ptr::null_mut(),
+            kCFRunLoopExit | kCFRunLoopBeforeWaiting,
+            1, // repeat = true
+            CFIndex::max_value(),
+            control_flow_end_handler,
+            ptr::null_mut(),
+        );
+        CFRunLoopAddObserver(main_loop, end_observer, kCFRunLoopDefaultMode);
+    }
+}
+
+#[derive(Debug)]
+pub enum Never {}
+
+pub trait EventHandler: Debug {
+    fn handle_nonuser_event(&mut self, event: Event<Never>, control_flow: &mut ControlFlow);
+    fn handle_user_events(&mut self, control_flow: &mut ControlFlow);
+}
+
+struct EventLoopHandler<F, T: 'static> {
+    f: F,
+    event_loop: RootEventLoopWindowTarget<T>,
+}
+
+impl<F, T: 'static> Debug for EventLoopHandler<F, T> {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter
+            .debug_struct("EventLoopHandler")
+            .field("event_loop", &self.event_loop)
+            .finish()
+    }
+}
+
+impl<F, T> EventHandler for EventLoopHandler<F, T>
+where
+    F: 'static + FnMut(Event<T>, &RootEventLoopWindowTarget<T>, &mut ControlFlow),
+    T: 'static,
+{
+    fn handle_nonuser_event(&mut self, event: Event<Never>, control_flow: &mut ControlFlow) {
+        (self.f)(
+            event.map_nonuser_event().unwrap(),
+            &self.event_loop,
+            control_flow,
+        );
+    }
+
+    fn handle_user_events(&mut self, control_flow: &mut ControlFlow) {
+        for event in self.event_loop.p.receiver.try_iter() {
+            (self.f)(Event::UserEvent(event), &self.event_loop, control_flow);
+        }
+    }
+}
+
+// must be called on main thread
+pub unsafe fn get_idiom() -> Idiom {
+    let device: id = msg_send![class!(UIDevice), currentDevice];
+    let raw_idiom: UIUserInterfaceIdiom = msg_send![device, userInterfaceIdiom];
+    raw_idiom.into()
+}
+
+pub struct Capabilities {
+    pub supports_safe_area: bool,
+}
+
+impl From<NSOperatingSystemVersion> for Capabilities {
+    fn from(os_version: NSOperatingSystemVersion) -> Capabilities {
+        assert!(
+            os_version.major >= 8,
+            "`winit` current requires iOS version 8 or greater"
+        );
+
+        let supports_safe_area = os_version.major >= 11;
+
+        Capabilities { supports_safe_area }
+    }
+}

src/platform_impl/ios/ffi.rs

@@ -0,0 +1,309 @@
+#![allow(non_camel_case_types, non_snake_case, non_upper_case_globals)]
+
+use std::{ffi::CString, ops::BitOr, os::raw::*};
+
+use objc::{runtime::Object, Encode, Encoding};
+
+use crate::platform::ios::{Idiom, ValidOrientations};
+
+pub type id = *mut Object;
+pub const nil: id = 0 as id;
+
+#[cfg(target_pointer_width = "32")]
+pub type CGFloat = f32;
+#[cfg(target_pointer_width = "64")]
+pub type CGFloat = f64;
+
+pub type NSInteger = isize;
+pub type NSUInteger = usize;
+
+#[repr(C)]
+#[derive(Clone, Debug)]
+pub struct NSOperatingSystemVersion {
+    pub major: NSInteger,
+    pub minor: NSInteger,
+    pub patch: NSInteger,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGPoint {
+    pub x: CGFloat,
+    pub y: CGFloat,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGSize {
+    pub width: CGFloat,
+    pub height: CGFloat,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGRect {
+    pub origin: CGPoint,
+    pub size: CGSize,
+}
+
+unsafe impl Encode for CGRect {
+    fn encode() -> Encoding {
+        unsafe {
+            if cfg!(target_pointer_width = "32") {
+                Encoding::from_str("{CGRect={CGPoint=ff}{CGSize=ff}}")
+            } else if cfg!(target_pointer_width = "64") {
+                Encoding::from_str("{CGRect={CGPoint=dd}{CGSize=dd}}")
+            } else {
+                unimplemented!()
+            }
+        }
+    }
+}
+#[derive(Debug)]
+#[allow(dead_code)]
+#[repr(isize)]
+pub enum UITouchPhase {
+    Began = 0,
+    Moved,
+    Stationary,
+    Ended,
+    Cancelled,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct UIEdgeInsets {
+    pub top: CGFloat,
+    pub left: CGFloat,
+    pub bottom: CGFloat,
+    pub right: CGFloat,
+}
+
+#[repr(transparent)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct UIUserInterfaceIdiom(NSInteger);
+
+unsafe impl Encode for UIUserInterfaceIdiom {
+    fn encode() -> Encoding {
+        NSInteger::encode()
+    }
+}
+
+impl UIUserInterfaceIdiom {
+    pub const Unspecified: UIUserInterfaceIdiom = UIUserInterfaceIdiom(-1);
+    pub const Phone: UIUserInterfaceIdiom = UIUserInterfaceIdiom(0);
+    pub const Pad: UIUserInterfaceIdiom = UIUserInterfaceIdiom(1);
+    pub const TV: UIUserInterfaceIdiom = UIUserInterfaceIdiom(2);
+    pub const CarPlay: UIUserInterfaceIdiom = UIUserInterfaceIdiom(3);
+}
+
+impl From<Idiom> for UIUserInterfaceIdiom {
+    fn from(idiom: Idiom) -> UIUserInterfaceIdiom {
+        match idiom {
+            Idiom::Unspecified => UIUserInterfaceIdiom::Unspecified,
+            Idiom::Phone => UIUserInterfaceIdiom::Phone,
+            Idiom::Pad => UIUserInterfaceIdiom::Pad,
+            Idiom::TV => UIUserInterfaceIdiom::TV,
+            Idiom::CarPlay => UIUserInterfaceIdiom::CarPlay,
+        }
+    }
+}
+
+impl Into<Idiom> for UIUserInterfaceIdiom {
+    fn into(self) -> Idiom {
+        match self {
+            UIUserInterfaceIdiom::Unspecified => Idiom::Unspecified,
+            UIUserInterfaceIdiom::Phone => Idiom::Phone,
+            UIUserInterfaceIdiom::Pad => Idiom::Pad,
+            UIUserInterfaceIdiom::TV => Idiom::TV,
+            UIUserInterfaceIdiom::CarPlay => Idiom::CarPlay,
+            _ => unreachable!(),
+        }
+    }
+}
+
+#[repr(transparent)]
+#[derive(Clone, Copy, Debug)]
+pub struct UIInterfaceOrientationMask(NSUInteger);
+
+unsafe impl Encode for UIInterfaceOrientationMask {
+    fn encode() -> Encoding {
+        NSUInteger::encode()
+    }
+}
+
+impl UIInterfaceOrientationMask {
+    pub const Portrait: UIInterfaceOrientationMask = UIInterfaceOrientationMask(1 << 1);
+    pub const PortraitUpsideDown: UIInterfaceOrientationMask = UIInterfaceOrientationMask(1 << 2);
+    pub const LandscapeLeft: UIInterfaceOrientationMask = UIInterfaceOrientationMask(1 << 4);
+    pub const LandscapeRight: UIInterfaceOrientationMask = UIInterfaceOrientationMask(1 << 3);
+    pub const Landscape: UIInterfaceOrientationMask =
+        UIInterfaceOrientationMask(Self::LandscapeLeft.0 | Self::LandscapeRight.0);
+    pub const AllButUpsideDown: UIInterfaceOrientationMask =
+        UIInterfaceOrientationMask(Self::Landscape.0 | Self::Portrait.0);
+    pub const All: UIInterfaceOrientationMask =
+        UIInterfaceOrientationMask(Self::AllButUpsideDown.0 | Self::PortraitUpsideDown.0);
+}
+
+impl BitOr for UIInterfaceOrientationMask {
+    type Output = Self;
+
+    fn bitor(self, rhs: Self) -> Self {
+        UIInterfaceOrientationMask(self.0 | rhs.0)
+    }
+}
+
+impl UIInterfaceOrientationMask {
+    pub fn from_valid_orientations_idiom(
+        valid_orientations: ValidOrientations,
+        idiom: Idiom,
+    ) -> UIInterfaceOrientationMask {
+        match (valid_orientations, idiom) {
+            (ValidOrientations::LandscapeAndPortrait, Idiom::Phone) => {
+                UIInterfaceOrientationMask::AllButUpsideDown
+            },
+            (ValidOrientations::LandscapeAndPortrait, _) => UIInterfaceOrientationMask::All,
+            (ValidOrientations::Landscape, _) => UIInterfaceOrientationMask::Landscape,
+            (ValidOrientations::Portrait, Idiom::Phone) => UIInterfaceOrientationMask::Portrait,
+            (ValidOrientations::Portrait, _) => {
+                UIInterfaceOrientationMask::Portrait
+                    | UIInterfaceOrientationMask::PortraitUpsideDown
+            },
+        }
+    }
+}
+
+#[link(name = "UIKit", kind = "framework")]
+#[link(name = "CoreFoundation", kind = "framework")]
+extern "C" {
+    pub static kCFRunLoopDefaultMode: CFRunLoopMode;
+    pub static kCFRunLoopCommonModes: CFRunLoopMode;
+
+    pub fn UIApplicationMain(
+        argc: c_int,
+        argv: *const c_char,
+        principalClassName: id,
+        delegateClassName: id,
+    ) -> c_int;
+
+    pub fn CFRunLoopGetMain() -> CFRunLoopRef;
+    pub fn CFRunLoopWakeUp(rl: CFRunLoopRef);
+
+    pub fn CFRunLoopObserverCreate(
+        allocator: CFAllocatorRef,
+        activities: CFOptionFlags,
+        repeats: Boolean,
+        order: CFIndex,
+        callout: CFRunLoopObserverCallBack,
+        context: *mut CFRunLoopObserverContext,
+    ) -> CFRunLoopObserverRef;
+    pub fn CFRunLoopAddObserver(
+        rl: CFRunLoopRef,
+        observer: CFRunLoopObserverRef,
+        mode: CFRunLoopMode,
+    );
+
+    pub fn CFRunLoopTimerCreate(
+        allocator: CFAllocatorRef,
+        fireDate: CFAbsoluteTime,
+        interval: CFTimeInterval,
+        flags: CFOptionFlags,
+        order: CFIndex,
+        callout: CFRunLoopTimerCallBack,
+        context: *mut CFRunLoopTimerContext,
+    ) -> CFRunLoopTimerRef;
+    pub fn CFRunLoopAddTimer(rl: CFRunLoopRef, timer: CFRunLoopTimerRef, mode: CFRunLoopMode);
+    pub fn CFRunLoopTimerSetNextFireDate(timer: CFRunLoopTimerRef, fireDate: CFAbsoluteTime);
+    pub fn CFRunLoopTimerInvalidate(time: CFRunLoopTimerRef);
+
+    pub fn CFRunLoopSourceCreate(
+        allocator: CFAllocatorRef,
+        order: CFIndex,
+        context: *mut CFRunLoopSourceContext,
+    ) -> CFRunLoopSourceRef;
+    pub fn CFRunLoopAddSource(rl: CFRunLoopRef, source: CFRunLoopSourceRef, mode: CFRunLoopMode);
+    pub fn CFRunLoopSourceInvalidate(source: CFRunLoopSourceRef);
+    pub fn CFRunLoopSourceSignal(source: CFRunLoopSourceRef);
+
+    pub fn CFAbsoluteTimeGetCurrent() -> CFAbsoluteTime;
+    pub fn CFRelease(cftype: *const c_void);
+}
+
+pub type Boolean = u8;
+pub enum CFAllocator {}
+pub type CFAllocatorRef = *mut CFAllocator;
+pub enum CFRunLoop {}
+pub type CFRunLoopRef = *mut CFRunLoop;
+pub type CFRunLoopMode = CFStringRef;
+pub enum CFRunLoopObserver {}
+pub type CFRunLoopObserverRef = *mut CFRunLoopObserver;
+pub enum CFRunLoopTimer {}
+pub type CFRunLoopTimerRef = *mut CFRunLoopTimer;
+pub enum CFRunLoopSource {}
+pub type CFRunLoopSourceRef = *mut CFRunLoopSource;
+pub enum CFString {}
+pub type CFStringRef = *const CFString;
+
+pub type CFHashCode = c_ulong;
+pub type CFIndex = c_long;
+pub type CFOptionFlags = c_ulong;
+pub type CFRunLoopActivity = CFOptionFlags;
+
+pub type CFAbsoluteTime = CFTimeInterval;
+pub type CFTimeInterval = f64;
+
+pub const kCFRunLoopEntry: CFRunLoopActivity = 0;
+pub const kCFRunLoopBeforeWaiting: CFRunLoopActivity = 1 << 5;
+pub const kCFRunLoopAfterWaiting: CFRunLoopActivity = 1 << 6;
+pub const kCFRunLoopExit: CFRunLoopActivity = 1 << 7;
+
+pub type CFRunLoopObserverCallBack =
+    extern "C" fn(observer: CFRunLoopObserverRef, activity: CFRunLoopActivity, info: *mut c_void);
+pub type CFRunLoopTimerCallBack = extern "C" fn(timer: CFRunLoopTimerRef, info: *mut c_void);
+
+pub enum CFRunLoopObserverContext {}
+pub enum CFRunLoopTimerContext {}
+
+#[repr(C)]
+pub struct CFRunLoopSourceContext {
+    pub version: CFIndex,
+    pub info: *mut c_void,
+    pub retain: extern "C" fn(*const c_void) -> *const c_void,
+    pub release: extern "C" fn(*const c_void),
+    pub copyDescription: extern "C" fn(*const c_void) -> CFStringRef,
+    pub equal: extern "C" fn(*const c_void, *const c_void) -> Boolean,
+    pub hash: extern "C" fn(*const c_void) -> CFHashCode,
+    pub schedule: extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode),
+    pub cancel: extern "C" fn(*mut c_void, CFRunLoopRef, CFRunLoopMode),
+    pub perform: extern "C" fn(*mut c_void),
+}
+
+pub 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_impl/ios/mod.rs

@@ -0,0 +1,111 @@
+//! 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 Suspended(false)
+//!  - applicationWillResignActive is Suspended(true)
+//!  - applicationWillTerminate is LoopDestroyed
+//!
+//! Keep in mind that after LoopDestroyed event is received every attempt to draw with
+//! opengl will result in segfault.
+//!
+//! Also note that app may not receive the LoopDestroyed event if suspended; it might be SIGKILL'ed.
+
+#![cfg(target_os = "ios")]
+
+// TODO: (mtak-) UIKit requires main thread for virtually all function/method calls. This could be
+// worked around in the future by using GCD (grand central dispatch) and/or caching of values like
+// window size/position.
+macro_rules! assert_main_thread {
+    ($($t:tt)*) => {
+        if !msg_send![class!(NSThread), isMainThread] {
+            panic!($($t)*);
+        }
+    };
+}
+
+mod app_state;
+mod event_loop;
+mod ffi;
+mod monitor;
+mod view;
+mod window;
+
+use std::fmt;
+
+pub use self::{
+    event_loop::{EventLoop, EventLoopProxy, EventLoopWindowTarget},
+    monitor::MonitorHandle,
+    window::{PlatformSpecificWindowBuilderAttributes, Window, WindowId},
+};
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId {
+    uiscreen: ffi::id,
+}
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId {
+            uiscreen: std::ptr::null_mut(),
+        }
+    }
+}
+
+unsafe impl Send for DeviceId {}
+unsafe impl Sync for DeviceId {}
+
+#[derive(Debug)]
+pub enum OsError {}
+
+impl fmt::Display for OsError {
+    fn fmt(&self, _: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            _ => unreachable!(),
+        }
+    }
+}

src/platform_impl/ios/monitor.rs

@@ -0,0 +1,197 @@
+use std::{
+    collections::{HashSet, VecDeque},
+    fmt,
+    ops::{Deref, DerefMut},
+};
+
+use crate::{
+    dpi::{PhysicalPosition, PhysicalSize},
+    monitor::VideoMode,
+};
+
+use crate::platform_impl::platform::ffi::{
+    id, nil, CGFloat, CGRect, CGSize, NSInteger, NSUInteger,
+};
+
+pub struct Inner {
+    uiscreen: id,
+}
+
+impl Drop for Inner {
+    fn drop(&mut self) {
+        unsafe {
+            let () = msg_send![self.uiscreen, release];
+        }
+    }
+}
+
+pub struct MonitorHandle {
+    inner: Inner,
+}
+
+impl Deref for MonitorHandle {
+    type Target = Inner;
+
+    fn deref(&self) -> &Inner {
+        unsafe {
+            assert_main_thread!(
+                "`MonitorHandle` methods can only be run on the main thread on iOS"
+            );
+        }
+        &self.inner
+    }
+}
+
+impl DerefMut for MonitorHandle {
+    fn deref_mut(&mut self) -> &mut Inner {
+        unsafe {
+            assert_main_thread!(
+                "`MonitorHandle` methods can only be run on the main thread on iOS"
+            );
+        }
+        &mut self.inner
+    }
+}
+
+unsafe impl Send for MonitorHandle {}
+unsafe impl Sync for MonitorHandle {}
+
+impl Clone for MonitorHandle {
+    fn clone(&self) -> MonitorHandle {
+        MonitorHandle::retained_new(self.uiscreen)
+    }
+}
+
+impl Drop for MonitorHandle {
+    fn drop(&mut self) {
+        unsafe {
+            assert_main_thread!("`MonitorHandle` can only be dropped on the main thread on iOS");
+        }
+    }
+}
+
+impl fmt::Debug for MonitorHandle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorHandle {
+            name: Option<String>,
+            size: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: f64,
+        }
+
+        let monitor_id_proxy = MonitorHandle {
+            name: self.name(),
+            size: self.size(),
+            position: self.position(),
+            hidpi_factor: self.hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
+
+impl MonitorHandle {
+    pub fn retained_new(uiscreen: id) -> MonitorHandle {
+        unsafe {
+            assert_main_thread!("`MonitorHandle` can only be cloned on the main thread on iOS");
+            let () = msg_send![uiscreen, retain];
+        }
+        MonitorHandle {
+            inner: Inner { uiscreen },
+        }
+    }
+}
+
+impl Inner {
+    pub fn name(&self) -> Option<String> {
+        unsafe {
+            if self.uiscreen == main_uiscreen().uiscreen {
+                Some("Primary".to_string())
+            } else if self.uiscreen == mirrored_uiscreen().uiscreen {
+                Some("Mirrored".to_string())
+            } else {
+                uiscreens()
+                    .iter()
+                    .position(|rhs| rhs.uiscreen == self.uiscreen)
+                    .map(|idx| idx.to_string())
+            }
+        }
+    }
+
+    pub fn size(&self) -> PhysicalSize {
+        unsafe {
+            let bounds: CGRect = msg_send![self.ui_screen(), nativeBounds];
+            (bounds.size.width as f64, bounds.size.height as f64).into()
+        }
+    }
+
+    pub fn position(&self) -> PhysicalPosition {
+        unsafe {
+            let bounds: CGRect = msg_send![self.ui_screen(), nativeBounds];
+            (bounds.origin.x as f64, bounds.origin.y as f64).into()
+        }
+    }
+
+    pub fn hidpi_factor(&self) -> f64 {
+        unsafe {
+            let scale: CGFloat = msg_send![self.ui_screen(), nativeScale];
+            scale as f64
+        }
+    }
+
+    pub fn video_modes(&self) -> impl Iterator<Item = VideoMode> {
+        let refresh_rate: NSInteger = unsafe { msg_send![self.uiscreen, maximumFramesPerSecond] };
+
+        let available_modes: id = unsafe { msg_send![self.uiscreen, availableModes] };
+        let available_mode_count: NSUInteger = unsafe { msg_send![available_modes, count] };
+
+        let mut modes = HashSet::with_capacity(available_mode_count);
+
+        for i in 0..available_mode_count {
+            let mode: id = unsafe { msg_send![available_modes, objectAtIndex: i] };
+            let size: CGSize = unsafe { msg_send![mode, size] };
+            modes.insert(VideoMode {
+                size: (size.width as u32, size.height as u32),
+                bit_depth: 32,
+                refresh_rate: refresh_rate as u16,
+            });
+        }
+
+        modes.into_iter()
+    }
+}
+
+// MonitorHandleExtIOS
+impl Inner {
+    pub fn ui_screen(&self) -> id {
+        self.uiscreen
+    }
+}
+
+// requires being run on main thread
+pub unsafe fn main_uiscreen() -> MonitorHandle {
+    let uiscreen: id = msg_send![class!(UIScreen), mainScreen];
+    MonitorHandle::retained_new(uiscreen)
+}
+
+// requires being run on main thread
+unsafe fn mirrored_uiscreen() -> MonitorHandle {
+    let uiscreen: id = msg_send![class!(UIScreen), mirroredScreen];
+    MonitorHandle::retained_new(uiscreen)
+}
+
+// requires being run on main thread
+pub unsafe fn uiscreens() -> VecDeque<MonitorHandle> {
+    let screens: id = msg_send![class!(UIScreen), screens];
+    let count: NSUInteger = msg_send![screens, count];
+    let mut result = VecDeque::with_capacity(count as _);
+    let screens_enum: id = msg_send![screens, objectEnumerator];
+    loop {
+        let screen: id = msg_send![screens_enum, nextObject];
+        if screen == nil {
+            break result;
+        }
+        result.push_back(MonitorHandle::retained_new(screen));
+    }
+}

src/platform_impl/ios/view.rs

@@ -0,0 +1,453 @@
+use std::collections::HashMap;
+
+use objc::{
+    declare::ClassDecl,
+    runtime::{Class, Object, Sel, BOOL, NO, YES},
+};
+
+use crate::{
+    event::{DeviceId as RootDeviceId, Event, Touch, TouchPhase, WindowEvent},
+    platform::ios::MonitorHandleExtIOS,
+    window::{WindowAttributes, WindowId as RootWindowId},
+};
+
+use crate::platform_impl::platform::{
+    app_state::AppState,
+    event_loop,
+    ffi::{id, nil, CGFloat, CGPoint, CGRect, UIInterfaceOrientationMask, UITouchPhase},
+    window::PlatformSpecificWindowBuilderAttributes,
+    DeviceId,
+};
+
+// requires main thread
+unsafe fn get_view_class(root_view_class: &'static Class) -> &'static Class {
+    static mut CLASSES: Option<HashMap<*const Class, &'static Class>> = None;
+    static mut ID: usize = 0;
+
+    if CLASSES.is_none() {
+        CLASSES = Some(HashMap::default());
+    }
+
+    let classes = CLASSES.as_mut().unwrap();
+
+    classes.entry(root_view_class).or_insert_with(move || {
+        let uiview_class = class!(UIView);
+        let is_uiview: BOOL = msg_send![root_view_class, isSubclassOfClass: uiview_class];
+        assert_eq!(
+            is_uiview, YES,
+            "`root_view_class` must inherit from `UIView`"
+        );
+
+        extern "C" fn draw_rect(object: &Object, _: Sel, rect: CGRect) {
+            unsafe {
+                let window: id = msg_send![object, window];
+                AppState::handle_nonuser_event(Event::WindowEvent {
+                    window_id: RootWindowId(window.into()),
+                    event: WindowEvent::RedrawRequested,
+                });
+                let superclass: &'static Class = msg_send![object, superclass];
+                let () = msg_send![super(object, superclass), drawRect: rect];
+            }
+        }
+
+        extern "C" fn layout_subviews(object: &Object, _: Sel) {
+            unsafe {
+                let window: id = msg_send![object, window];
+                let bounds: CGRect = msg_send![window, bounds];
+                let screen: id = msg_send![window, screen];
+                let screen_space: id = msg_send![screen, coordinateSpace];
+                let screen_frame: CGRect =
+                    msg_send![object, convertRect:bounds toCoordinateSpace:screen_space];
+                let size = crate::dpi::LogicalSize {
+                    width: screen_frame.size.width,
+                    height: screen_frame.size.height,
+                };
+                AppState::handle_nonuser_event(Event::WindowEvent {
+                    window_id: RootWindowId(window.into()),
+                    event: WindowEvent::Resized(size),
+                });
+                let superclass: &'static Class = msg_send![object, superclass];
+                let () = msg_send![super(object, superclass), layoutSubviews];
+            }
+        }
+
+        let mut decl = ClassDecl::new(&format!("WinitUIView{}", ID), root_view_class)
+            .expect("Failed to declare class `WinitUIView`");
+        ID += 1;
+        decl.add_method(
+            sel!(drawRect:),
+            draw_rect as extern "C" fn(&Object, Sel, CGRect),
+        );
+        decl.add_method(
+            sel!(layoutSubviews),
+            layout_subviews as extern "C" fn(&Object, Sel),
+        );
+        decl.register()
+    })
+}
+
+// requires main thread
+unsafe fn get_view_controller_class() -> &'static Class {
+    static mut CLASS: Option<&'static Class> = None;
+    if CLASS.is_none() {
+        let uiviewcontroller_class = class!(UIViewController);
+
+        extern "C" fn set_prefers_status_bar_hidden(object: &mut Object, _: Sel, hidden: BOOL) {
+            unsafe {
+                object.set_ivar::<BOOL>("_prefers_status_bar_hidden", hidden);
+                let () = msg_send![object, setNeedsStatusBarAppearanceUpdate];
+            }
+        }
+
+        extern "C" fn prefers_status_bar_hidden(object: &Object, _: Sel) -> BOOL {
+            unsafe { *object.get_ivar::<BOOL>("_prefers_status_bar_hidden") }
+        }
+
+        extern "C" fn set_supported_orientations(
+            object: &mut Object,
+            _: Sel,
+            orientations: UIInterfaceOrientationMask,
+        ) {
+            unsafe {
+                object.set_ivar::<UIInterfaceOrientationMask>(
+                    "_supported_orientations",
+                    orientations,
+                );
+                let () = msg_send![class!(UIViewController), attemptRotationToDeviceOrientation];
+            }
+        }
+
+        extern "C" fn supported_orientations(
+            object: &Object,
+            _: Sel,
+        ) -> UIInterfaceOrientationMask {
+            unsafe { *object.get_ivar::<UIInterfaceOrientationMask>("_supported_orientations") }
+        }
+
+        extern "C" fn should_autorotate(_: &Object, _: Sel) -> BOOL {
+            YES
+        }
+
+        let mut decl = ClassDecl::new("WinitUIViewController", uiviewcontroller_class)
+            .expect("Failed to declare class `WinitUIViewController`");
+        decl.add_ivar::<BOOL>("_prefers_status_bar_hidden");
+        decl.add_ivar::<UIInterfaceOrientationMask>("_supported_orientations");
+        decl.add_method(
+            sel!(setPrefersStatusBarHidden:),
+            set_prefers_status_bar_hidden as extern "C" fn(&mut Object, Sel, BOOL),
+        );
+        decl.add_method(
+            sel!(prefersStatusBarHidden),
+            prefers_status_bar_hidden as extern "C" fn(&Object, Sel) -> BOOL,
+        );
+        decl.add_method(
+            sel!(setSupportedInterfaceOrientations:),
+            set_supported_orientations
+                as extern "C" fn(&mut Object, Sel, UIInterfaceOrientationMask),
+        );
+        decl.add_method(
+            sel!(supportedInterfaceOrientations),
+            supported_orientations as extern "C" fn(&Object, Sel) -> UIInterfaceOrientationMask,
+        );
+        decl.add_method(
+            sel!(shouldAutorotate),
+            should_autorotate as extern "C" fn(&Object, Sel) -> BOOL,
+        );
+        CLASS = Some(decl.register());
+    }
+    CLASS.unwrap()
+}
+
+// requires main thread
+unsafe fn get_window_class() -> &'static Class {
+    static mut CLASS: Option<&'static Class> = None;
+    if CLASS.is_none() {
+        let uiwindow_class = class!(UIWindow);
+
+        extern "C" fn become_key_window(object: &Object, _: Sel) {
+            unsafe {
+                AppState::handle_nonuser_event(Event::WindowEvent {
+                    window_id: RootWindowId(object.into()),
+                    event: WindowEvent::Focused(true),
+                });
+                let () = msg_send![super(object, class!(UIWindow)), becomeKeyWindow];
+            }
+        }
+
+        extern "C" fn resign_key_window(object: &Object, _: Sel) {
+            unsafe {
+                AppState::handle_nonuser_event(Event::WindowEvent {
+                    window_id: RootWindowId(object.into()),
+                    event: WindowEvent::Focused(false),
+                });
+                let () = msg_send![super(object, class!(UIWindow)), resignKeyWindow];
+            }
+        }
+
+        extern "C" fn handle_touches(object: &Object, _: Sel, touches: id, _: id) {
+            unsafe {
+                let uiscreen = msg_send![object, screen];
+                let touches_enum: id = msg_send![touches, objectEnumerator];
+                let mut touch_events = Vec::new();
+                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: UITouchPhase = msg_send![touch, phase];
+                    let phase = match phase {
+                        UITouchPhase::Began => TouchPhase::Started,
+                        UITouchPhase::Moved => TouchPhase::Moved,
+                        // 2 is UITouchPhase::Stationary and is not expected here
+                        UITouchPhase::Ended => TouchPhase::Ended,
+                        UITouchPhase::Cancelled => TouchPhase::Cancelled,
+                        _ => panic!("unexpected touch phase: {:?}", phase as i32),
+                    };
+
+                    touch_events.push(Event::WindowEvent {
+                        window_id: RootWindowId(object.into()),
+                        event: WindowEvent::Touch(Touch {
+                            device_id: RootDeviceId(DeviceId { uiscreen }),
+                            id: touch_id,
+                            location: (location.x as f64, location.y as f64).into(),
+                            phase,
+                        }),
+                    });
+                }
+                AppState::handle_nonuser_events(touch_events);
+            }
+        }
+
+        extern "C" fn set_content_scale_factor(object: &mut Object, _: Sel, hidpi_factor: CGFloat) {
+            unsafe {
+                let () = msg_send![
+                    super(object, class!(UIWindow)),
+                    setContentScaleFactor: hidpi_factor
+                ];
+                let view_controller: id = msg_send![object, rootViewController];
+                let view: id = msg_send![view_controller, view];
+                let () = msg_send![view, setContentScaleFactor: hidpi_factor];
+                let bounds: CGRect = msg_send![object, bounds];
+                let screen: id = msg_send![object, screen];
+                let screen_space: id = msg_send![screen, coordinateSpace];
+                let screen_frame: CGRect =
+                    msg_send![object, convertRect:bounds toCoordinateSpace:screen_space];
+                let size = crate::dpi::LogicalSize {
+                    width: screen_frame.size.width,
+                    height: screen_frame.size.height,
+                };
+                AppState::handle_nonuser_events(
+                    std::iter::once(Event::WindowEvent {
+                        window_id: RootWindowId(object.into()),
+                        event: WindowEvent::HiDpiFactorChanged(hidpi_factor as _),
+                    })
+                    .chain(std::iter::once(Event::WindowEvent {
+                        window_id: RootWindowId(object.into()),
+                        event: WindowEvent::Resized(size),
+                    })),
+                );
+            }
+        }
+
+        let mut decl = ClassDecl::new("WinitUIWindow", uiwindow_class)
+            .expect("Failed to declare class `WinitUIWindow`");
+        decl.add_method(
+            sel!(becomeKeyWindow),
+            become_key_window as extern "C" fn(&Object, Sel),
+        );
+        decl.add_method(
+            sel!(resignKeyWindow),
+            resign_key_window as extern "C" fn(&Object, Sel),
+        );
+
+        decl.add_method(
+            sel!(touchesBegan:withEvent:),
+            handle_touches as extern "C" fn(this: &Object, _: Sel, _: id, _: id),
+        );
+        decl.add_method(
+            sel!(touchesMoved:withEvent:),
+            handle_touches as extern "C" fn(this: &Object, _: Sel, _: id, _: id),
+        );
+        decl.add_method(
+            sel!(touchesEnded:withEvent:),
+            handle_touches as extern "C" fn(this: &Object, _: Sel, _: id, _: id),
+        );
+        decl.add_method(
+            sel!(touchesCancelled:withEvent:),
+            handle_touches as extern "C" fn(this: &Object, _: Sel, _: id, _: id),
+        );
+
+        decl.add_method(
+            sel!(setContentScaleFactor:),
+            set_content_scale_factor as extern "C" fn(&mut Object, Sel, CGFloat),
+        );
+
+        CLASS = Some(decl.register());
+    }
+    CLASS.unwrap()
+}
+
+// requires main thread
+pub unsafe fn create_view(
+    _window_attributes: &WindowAttributes,
+    platform_attributes: &PlatformSpecificWindowBuilderAttributes,
+    frame: CGRect,
+) -> id {
+    let class = get_view_class(platform_attributes.root_view_class);
+
+    let view: id = msg_send![class, alloc];
+    assert!(!view.is_null(), "Failed to create `UIView` instance");
+    let view: id = msg_send![view, initWithFrame: frame];
+    assert!(!view.is_null(), "Failed to initialize `UIView` instance");
+    let () = msg_send![view, setMultipleTouchEnabled: YES];
+
+    view
+}
+
+// requires main thread
+pub unsafe fn create_view_controller(
+    window_attributes: &WindowAttributes,
+    platform_attributes: &PlatformSpecificWindowBuilderAttributes,
+    view: id,
+) -> id {
+    let class = get_view_controller_class();
+
+    let view_controller: id = msg_send![class, alloc];
+    assert!(
+        !view_controller.is_null(),
+        "Failed to create `UIViewController` instance"
+    );
+    let view_controller: id = msg_send![view_controller, init];
+    assert!(
+        !view_controller.is_null(),
+        "Failed to initialize `UIViewController` instance"
+    );
+    let status_bar_hidden = if window_attributes.decorations {
+        NO
+    } else {
+        YES
+    };
+    let idiom = event_loop::get_idiom();
+    let supported_orientations = UIInterfaceOrientationMask::from_valid_orientations_idiom(
+        platform_attributes.valid_orientations,
+        idiom,
+    );
+    let () = msg_send![
+        view_controller,
+        setPrefersStatusBarHidden: status_bar_hidden
+    ];
+    let () = msg_send![
+        view_controller,
+        setSupportedInterfaceOrientations: supported_orientations
+    ];
+    let () = msg_send![view_controller, setView: view];
+    view_controller
+}
+
+// requires main thread
+pub unsafe fn create_window(
+    window_attributes: &WindowAttributes,
+    platform_attributes: &PlatformSpecificWindowBuilderAttributes,
+    frame: CGRect,
+    view_controller: id,
+) -> id {
+    let class = get_window_class();
+
+    let window: id = msg_send![class, alloc];
+    assert!(!window.is_null(), "Failed to create `UIWindow` instance");
+    let window: id = msg_send![window, initWithFrame: frame];
+    assert!(
+        !window.is_null(),
+        "Failed to initialize `UIWindow` instance"
+    );
+    let () = msg_send![window, setRootViewController: view_controller];
+    if let Some(hidpi_factor) = platform_attributes.hidpi_factor {
+        let () = msg_send![window, setContentScaleFactor: hidpi_factor as CGFloat];
+    }
+    if let &Some(ref monitor) = &window_attributes.fullscreen {
+        let () = msg_send![window, setScreen:monitor.ui_screen()];
+    }
+
+    window
+}
+
+pub fn create_delegate_class() {
+    extern "C" fn did_finish_launching(_: &mut Object, _: Sel, _: id, _: id) -> BOOL {
+        unsafe {
+            AppState::did_finish_launching();
+        }
+        YES
+    }
+
+    extern "C" fn did_become_active(_: &Object, _: Sel, _: id) {
+        unsafe { AppState::handle_nonuser_event(Event::Suspended(false)) }
+    }
+
+    extern "C" fn will_resign_active(_: &Object, _: Sel, _: id) {
+        unsafe { AppState::handle_nonuser_event(Event::Suspended(true)) }
+    }
+
+    extern "C" fn will_enter_foreground(_: &Object, _: Sel, _: id) {}
+    extern "C" fn did_enter_background(_: &Object, _: Sel, _: id) {}
+
+    extern "C" fn will_terminate(_: &Object, _: Sel, _: id) {
+        unsafe {
+            let app: id = msg_send![class!(UIApplication), sharedApplication];
+            let windows: id = msg_send![app, windows];
+            let windows_enum: id = msg_send![windows, objectEnumerator];
+            let mut events = Vec::new();
+            loop {
+                let window: id = msg_send![windows_enum, nextObject];
+                if window == nil {
+                    break;
+                }
+                let is_winit_window: BOOL = msg_send![window, isKindOfClass: class!(WinitUIWindow)];
+                if is_winit_window == YES {
+                    events.push(Event::WindowEvent {
+                        window_id: RootWindowId(window.into()),
+                        event: WindowEvent::Destroyed,
+                    });
+                }
+            }
+            AppState::handle_nonuser_events(events);
+            AppState::terminated();
+        }
+    }
+
+    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 "C" fn(&mut Object, Sel, id, id) -> BOOL,
+        );
+
+        decl.add_method(
+            sel!(applicationDidBecomeActive:),
+            did_become_active as extern "C" fn(&Object, Sel, id),
+        );
+        decl.add_method(
+            sel!(applicationWillResignActive:),
+            will_resign_active as extern "C" fn(&Object, Sel, id),
+        );
+        decl.add_method(
+            sel!(applicationWillEnterForeground:),
+            will_enter_foreground as extern "C" fn(&Object, Sel, id),
+        );
+        decl.add_method(
+            sel!(applicationDidEnterBackground:),
+            did_enter_background as extern "C" fn(&Object, Sel, id),
+        );
+
+        decl.add_method(
+            sel!(applicationWillTerminate:),
+            will_terminate as extern "C" fn(&Object, Sel, id),
+        );
+
+        decl.register();
+    }
+}

src/platform_impl/ios/window.rs

@@ -0,0 +1,509 @@
+use std::{
+    collections::VecDeque,
+    ops::{Deref, DerefMut},
+};
+
+use objc::runtime::{Class, Object, NO, YES};
+
+use crate::{
+    dpi::{self, LogicalPosition, LogicalSize},
+    error::{ExternalError, NotSupportedError, OsError as RootOsError},
+    icon::Icon,
+    monitor::MonitorHandle as RootMonitorHandle,
+    platform::ios::{MonitorHandleExtIOS, ValidOrientations},
+    platform_impl::platform::{
+        app_state::AppState,
+        event_loop,
+        ffi::{id, CGFloat, CGPoint, CGRect, CGSize, UIEdgeInsets, UIInterfaceOrientationMask},
+        monitor, view, EventLoopWindowTarget, MonitorHandle,
+    },
+    window::{CursorIcon, WindowAttributes},
+};
+
+pub struct Inner {
+    pub window: id,
+    pub view_controller: id,
+    pub view: id,
+    supports_safe_area: bool,
+}
+
+impl Drop for Inner {
+    fn drop(&mut self) {
+        unsafe {
+            let () = msg_send![self.view, release];
+            let () = msg_send![self.view_controller, release];
+            let () = msg_send![self.window, release];
+        }
+    }
+}
+
+impl Inner {
+    pub fn set_title(&self, _title: &str) {
+        debug!("`Window::set_title` is ignored on iOS")
+    }
+
+    pub fn set_visible(&self, visible: bool) {
+        match visible {
+            true => unsafe {
+                let () = msg_send![self.window, setHidden: NO];
+            },
+            false => unsafe {
+                let () = msg_send![self.window, setHidden: YES];
+            },
+        }
+    }
+
+    pub fn request_redraw(&self) {
+        unsafe {
+            let () = msg_send![self.view, setNeedsDisplay];
+        }
+    }
+
+    pub fn inner_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+        unsafe {
+            let safe_area = self.safe_area_screen_space();
+            Ok(LogicalPosition {
+                x: safe_area.origin.x,
+                y: safe_area.origin.y,
+            })
+        }
+    }
+
+    pub fn outer_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+        unsafe {
+            let screen_frame = self.screen_frame();
+            Ok(LogicalPosition {
+                x: screen_frame.origin.x,
+                y: screen_frame.origin.y,
+            })
+        }
+    }
+
+    pub fn set_outer_position(&self, position: LogicalPosition) {
+        unsafe {
+            let screen_frame = self.screen_frame();
+            let new_screen_frame = CGRect {
+                origin: CGPoint {
+                    x: position.x as _,
+                    y: position.y as _,
+                },
+                size: screen_frame.size,
+            };
+            let bounds = self.from_screen_space(new_screen_frame);
+            let () = msg_send![self.window, setBounds: bounds];
+        }
+    }
+
+    pub fn inner_size(&self) -> LogicalSize {
+        unsafe {
+            let safe_area = self.safe_area_screen_space();
+            LogicalSize {
+                width: safe_area.size.width,
+                height: safe_area.size.height,
+            }
+        }
+    }
+
+    pub fn outer_size(&self) -> LogicalSize {
+        unsafe {
+            let screen_frame = self.screen_frame();
+            LogicalSize {
+                width: screen_frame.size.width,
+                height: screen_frame.size.height,
+            }
+        }
+    }
+
+    pub fn set_inner_size(&self, _size: LogicalSize) {
+        unimplemented!("not clear what `Window::set_inner_size` means on iOS");
+    }
+
+    pub fn set_min_inner_size(&self, _dimensions: Option<LogicalSize>) {
+        warn!("`Window::set_min_inner_size` is ignored on iOS")
+    }
+
+    pub fn set_max_inner_size(&self, _dimensions: Option<LogicalSize>) {
+        warn!("`Window::set_max_inner_size` is ignored on iOS")
+    }
+
+    pub fn set_resizable(&self, _resizable: bool) {
+        warn!("`Window::set_resizable` is ignored on iOS")
+    }
+
+    pub fn hidpi_factor(&self) -> f64 {
+        unsafe {
+            let hidpi: CGFloat = msg_send![self.view, contentScaleFactor];
+            hidpi as _
+        }
+    }
+
+    pub fn set_cursor_icon(&self, _cursor: CursorIcon) {
+        debug!("`Window::set_cursor_icon` ignored on iOS")
+    }
+
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), ExternalError> {
+        Err(ExternalError::NotSupported(NotSupportedError::new()))
+    }
+
+    pub fn set_cursor_grab(&self, _grab: bool) -> Result<(), ExternalError> {
+        Err(ExternalError::NotSupported(NotSupportedError::new()))
+    }
+
+    pub fn set_cursor_visible(&self, _visible: bool) {
+        debug!("`Window::set_cursor_visible` is ignored on iOS")
+    }
+
+    pub fn set_maximized(&self, _maximized: bool) {
+        warn!("`Window::set_maximized` is ignored on iOS")
+    }
+
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorHandle>) {
+        unsafe {
+            match monitor {
+                Some(monitor) => {
+                    let uiscreen = monitor.ui_screen() as id;
+                    let current: id = msg_send![self.window, screen];
+                    let bounds: CGRect = msg_send![uiscreen, bounds];
+
+                    // this is pretty slow on iOS, so avoid doing it if we can
+                    if uiscreen != current {
+                        let () = msg_send![self.window, setScreen: uiscreen];
+                    }
+                    let () = msg_send![self.window, setFrame: bounds];
+                },
+                None => warn!("`Window::set_fullscreen(None)` ignored on iOS"),
+            }
+        }
+    }
+
+    pub fn fullscreen(&self) -> Option<RootMonitorHandle> {
+        unsafe {
+            let monitor = self.current_monitor();
+            let uiscreen = monitor.inner.ui_screen();
+            let screen_space_bounds = self.screen_frame();
+            let screen_bounds: CGRect = msg_send![uiscreen, bounds];
+
+            // TODO: track fullscreen instead of relying on brittle float comparisons
+            if screen_space_bounds.origin.x == screen_bounds.origin.x
+                && screen_space_bounds.origin.y == screen_bounds.origin.y
+                && screen_space_bounds.size.width == screen_bounds.size.width
+                && screen_space_bounds.size.height == screen_bounds.size.height
+            {
+                Some(monitor)
+            } else {
+                None
+            }
+        }
+    }
+
+    pub fn set_decorations(&self, decorations: bool) {
+        unsafe {
+            let status_bar_hidden = if decorations { NO } else { YES };
+            let () = msg_send![
+                self.view_controller,
+                setPrefersStatusBarHidden: status_bar_hidden
+            ];
+        }
+    }
+
+    pub fn set_always_on_top(&self, _always_on_top: bool) {
+        warn!("`Window::set_always_on_top` is ignored on iOS")
+    }
+
+    pub fn set_window_icon(&self, _icon: Option<Icon>) {
+        warn!("`Window::set_window_icon` is ignored on iOS")
+    }
+
+    pub fn set_ime_position(&self, _position: LogicalPosition) {
+        warn!("`Window::set_ime_position` is ignored on iOS")
+    }
+
+    pub fn current_monitor(&self) -> RootMonitorHandle {
+        unsafe {
+            let uiscreen: id = msg_send![self.window, screen];
+            RootMonitorHandle {
+                inner: MonitorHandle::retained_new(uiscreen),
+            }
+        }
+    }
+
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        unsafe { monitor::uiscreens() }
+    }
+
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        unsafe { monitor::main_uiscreen() }
+    }
+
+    pub fn id(&self) -> WindowId {
+        self.window.into()
+    }
+}
+
+pub struct Window {
+    pub inner: Inner,
+}
+
+impl Drop for Window {
+    fn drop(&mut self) {
+        unsafe {
+            assert_main_thread!("`Window::drop` can only be run on the main thread on iOS");
+        }
+    }
+}
+
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
+
+impl Deref for Window {
+    type Target = Inner;
+
+    fn deref(&self) -> &Inner {
+        unsafe {
+            assert_main_thread!("`Window` methods can only be run on the main thread on iOS");
+        }
+        &self.inner
+    }
+}
+
+impl DerefMut for Window {
+    fn deref_mut(&mut self) -> &mut Inner {
+        unsafe {
+            assert_main_thread!("`Window` methods can only be run on the main thread on iOS");
+        }
+        &mut self.inner
+    }
+}
+
+impl Window {
+    pub fn new<T>(
+        event_loop: &EventLoopWindowTarget<T>,
+        window_attributes: WindowAttributes,
+        platform_attributes: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Window, RootOsError> {
+        if let Some(_) = window_attributes.min_inner_size {
+            warn!("`WindowAttributes::min_inner_size` is ignored on iOS");
+        }
+        if let Some(_) = window_attributes.max_inner_size {
+            warn!("`WindowAttributes::max_inner_size` is ignored on iOS");
+        }
+        if window_attributes.always_on_top {
+            warn!("`WindowAttributes::always_on_top` is unsupported on iOS");
+        }
+        // TODO: transparency, visible
+
+        unsafe {
+            let screen = window_attributes
+                .fullscreen
+                .as_ref()
+                .map(|screen| screen.ui_screen() as _)
+                .unwrap_or_else(|| monitor::main_uiscreen().ui_screen());
+            let screen_bounds: CGRect = msg_send![screen, bounds];
+
+            let frame = match window_attributes.inner_size {
+                Some(dim) => {
+                    CGRect {
+                        origin: screen_bounds.origin,
+                        size: CGSize {
+                            width: dim.width,
+                            height: dim.height,
+                        },
+                    }
+                },
+                None => screen_bounds,
+            };
+
+            let view = view::create_view(&window_attributes, &platform_attributes, frame.clone());
+            let view_controller =
+                view::create_view_controller(&window_attributes, &platform_attributes, view);
+            let window = view::create_window(
+                &window_attributes,
+                &platform_attributes,
+                frame,
+                view_controller,
+            );
+
+            let supports_safe_area = event_loop.capabilities().supports_safe_area;
+
+            let result = Window {
+                inner: Inner {
+                    window,
+                    view_controller,
+                    view,
+                    supports_safe_area,
+                },
+            };
+            AppState::set_key_window(window);
+            Ok(result)
+        }
+    }
+}
+
+// WindowExtIOS
+impl Inner {
+    pub fn ui_window(&self) -> id {
+        self.window
+    }
+    pub fn ui_view_controller(&self) -> id {
+        self.view_controller
+    }
+    pub fn ui_view(&self) -> id {
+        self.view
+    }
+
+    pub fn set_hidpi_factor(&self, hidpi_factor: f64) {
+        unsafe {
+            assert!(
+                dpi::validate_hidpi_factor(hidpi_factor),
+                "`WindowExtIOS::set_hidpi_factor` received an invalid hidpi factor"
+            );
+            let hidpi_factor = hidpi_factor as CGFloat;
+            let () = msg_send![self.view, setContentScaleFactor: hidpi_factor];
+        }
+    }
+
+    pub fn set_valid_orientations(&self, valid_orientations: ValidOrientations) {
+        unsafe {
+            let idiom = event_loop::get_idiom();
+            let supported_orientations = UIInterfaceOrientationMask::from_valid_orientations_idiom(
+                valid_orientations,
+                idiom,
+            );
+            msg_send![
+                self.view_controller,
+                setSupportedInterfaceOrientations: supported_orientations
+            ];
+        }
+    }
+}
+
+impl Inner {
+    // requires main thread
+    unsafe fn screen_frame(&self) -> CGRect {
+        self.to_screen_space(msg_send![self.window, bounds])
+    }
+
+    // requires main thread
+    unsafe fn to_screen_space(&self, rect: CGRect) -> CGRect {
+        let screen: id = msg_send![self.window, screen];
+        if !screen.is_null() {
+            let screen_space: id = msg_send![screen, coordinateSpace];
+            msg_send![self.window, convertRect:rect toCoordinateSpace:screen_space]
+        } else {
+            rect
+        }
+    }
+
+    // requires main thread
+    unsafe fn from_screen_space(&self, rect: CGRect) -> CGRect {
+        let screen: id = msg_send![self.window, screen];
+        if !screen.is_null() {
+            let screen_space: id = msg_send![screen, coordinateSpace];
+            msg_send![self.window, convertRect:rect fromCoordinateSpace:screen_space]
+        } else {
+            rect
+        }
+    }
+
+    // requires main thread
+    unsafe fn safe_area_screen_space(&self) -> CGRect {
+        let bounds: CGRect = msg_send![self.window, bounds];
+        if self.supports_safe_area {
+            let safe_area: UIEdgeInsets = msg_send![self.window, safeAreaInsets];
+            let safe_bounds = CGRect {
+                origin: CGPoint {
+                    x: bounds.origin.x + safe_area.left,
+                    y: bounds.origin.y + safe_area.top,
+                },
+                size: CGSize {
+                    width: bounds.size.width - safe_area.left - safe_area.right,
+                    height: bounds.size.height - safe_area.top - safe_area.bottom,
+                },
+            };
+            self.to_screen_space(safe_bounds)
+        } else {
+            let screen_frame = self.to_screen_space(bounds);
+            let status_bar_frame: CGRect = {
+                let app: id = msg_send![class!(UIApplication), sharedApplication];
+                assert!(
+                    !app.is_null(),
+                    "`Window::get_inner_position` cannot be called before `EventLoop::run` on iOS"
+                );
+                msg_send![app, statusBarFrame]
+            };
+            let (y, height) = if screen_frame.origin.y > status_bar_frame.size.height {
+                (screen_frame.origin.y, screen_frame.size.height)
+            } else {
+                let y = status_bar_frame.size.height;
+                let height = screen_frame.size.height
+                    - (status_bar_frame.size.height - screen_frame.origin.y);
+                (y, height)
+            };
+            CGRect {
+                origin: CGPoint {
+                    x: screen_frame.origin.x,
+                    y,
+                },
+                size: CGSize {
+                    width: screen_frame.size.width,
+                    height,
+                },
+            }
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId {
+    window: id,
+}
+
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId {
+            window: std::ptr::null_mut(),
+        }
+    }
+}
+
+unsafe impl Send for WindowId {}
+unsafe impl Sync for WindowId {}
+
+impl From<&Object> for WindowId {
+    fn from(window: &Object) -> WindowId {
+        WindowId {
+            window: window as *const _ as _,
+        }
+    }
+}
+
+impl From<&mut Object> for WindowId {
+    fn from(window: &mut Object) -> WindowId {
+        WindowId {
+            window: window as _,
+        }
+    }
+}
+
+impl From<id> for WindowId {
+    fn from(window: id) -> WindowId {
+        WindowId { window }
+    }
+}
+
+#[derive(Clone)]
+pub struct PlatformSpecificWindowBuilderAttributes {
+    pub root_view_class: &'static Class,
+    pub hidpi_factor: Option<f64>,
+    pub valid_orientations: ValidOrientations,
+}
+
+impl Default for PlatformSpecificWindowBuilderAttributes {
+    fn default() -> PlatformSpecificWindowBuilderAttributes {
+        PlatformSpecificWindowBuilderAttributes {
+            root_view_class: class!(UIView),
+            hidpi_factor: None,
+            valid_orientations: Default::default(),
+        }
+    }
+}

src/platform_impl/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_void, c_char, c_int};
+use std::os::raw::{c_char, c_int, c_void};
 
 pub const RTLD_LAZY: c_int = 0x001;
 pub const RTLD_NOW: c_int = 0x002;
 
-#[link="dl"]
-extern {
+#[link(name = "dl")]
+extern "C" {
     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_impl/linux/mod.rs

@@ -0,0 +1,613 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+
+use std::{collections::VecDeque, env, ffi::CStr, fmt, mem, os::raw::*, sync::Arc};
+
+use parking_lot::Mutex;
+use smithay_client_toolkit::reexports::client::ConnectError;
+
+pub use self::x11::XNotSupported;
+use self::x11::{ffi::XVisualInfo, XConnection, XError};
+use crate::{
+    dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize},
+    error::{ExternalError, NotSupportedError, OsError as RootOsError},
+    event::Event,
+    event_loop::{ControlFlow, EventLoopClosed, EventLoopWindowTarget as RootELW},
+    icon::Icon,
+    monitor::{MonitorHandle as RootMonitorHandle, VideoMode},
+    window::{CursorIcon, WindowAttributes},
+};
+
+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)) };
+}
+
+#[derive(Debug, Clone)]
+pub enum OsError {
+    XError(XError),
+    XMisc(&'static str),
+}
+
+impl fmt::Display for OsError {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        match self {
+            OsError::XError(e) => formatter.pad(&e.description),
+            OsError::XMisc(e) => formatter.pad(e),
+        }
+    }
+}
+
+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::Wayland(wayland::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::Wayland(wayland::DeviceId::dummy())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum MonitorHandle {
+    X(x11::MonitorHandle),
+    Wayland(wayland::MonitorHandle),
+}
+
+impl MonitorHandle {
+    #[inline]
+    pub fn name(&self) -> Option<String> {
+        match self {
+            &MonitorHandle::X(ref m) => m.name(),
+            &MonitorHandle::Wayland(ref m) => m.name(),
+        }
+    }
+
+    #[inline]
+    pub fn native_identifier(&self) -> u32 {
+        match self {
+            &MonitorHandle::X(ref m) => m.native_identifier(),
+            &MonitorHandle::Wayland(ref m) => m.native_identifier(),
+        }
+    }
+
+    #[inline]
+    pub fn size(&self) -> PhysicalSize {
+        match self {
+            &MonitorHandle::X(ref m) => m.size(),
+            &MonitorHandle::Wayland(ref m) => m.size(),
+        }
+    }
+
+    #[inline]
+    pub fn position(&self) -> PhysicalPosition {
+        match self {
+            &MonitorHandle::X(ref m) => m.position(),
+            &MonitorHandle::Wayland(ref m) => m.position(),
+        }
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> f64 {
+        match self {
+            &MonitorHandle::X(ref m) => m.hidpi_factor(),
+            &MonitorHandle::Wayland(ref m) => m.hidpi_factor() as f64,
+        }
+    }
+
+    #[inline]
+    pub fn video_modes(&self) -> Box<dyn Iterator<Item = VideoMode>> {
+        match self {
+            MonitorHandle::X(m) => Box::new(m.video_modes()),
+            MonitorHandle::Wayland(m) => Box::new(m.video_modes()),
+        }
+    }
+}
+
+impl Window {
+    #[inline]
+    pub fn new<T>(
+        window_target: &EventLoopWindowTarget<T>,
+        attribs: WindowAttributes,
+        pl_attribs: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Self, RootOsError> {
+        match *window_target {
+            EventLoopWindowTarget::Wayland(ref window_target) => {
+                wayland::Window::new(window_target, attribs, pl_attribs).map(Window::Wayland)
+            },
+            EventLoopWindowTarget::X(ref window_target) => {
+                x11::Window::new(window_target, 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 set_visible(&self, visible: bool) {
+        match self {
+            &Window::X(ref w) => w.set_visible(visible),
+            &Window::Wayland(ref w) => w.set_visible(visible),
+        }
+    }
+
+    #[inline]
+    pub fn outer_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+        match self {
+            &Window::X(ref w) => w.outer_position(),
+            &Window::Wayland(ref w) => w.outer_position(),
+        }
+    }
+
+    #[inline]
+    pub fn inner_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+        match self {
+            &Window::X(ref m) => m.inner_position(),
+            &Window::Wayland(ref m) => m.inner_position(),
+        }
+    }
+
+    #[inline]
+    pub fn set_outer_position(&self, position: LogicalPosition) {
+        match self {
+            &Window::X(ref w) => w.set_outer_position(position),
+            &Window::Wayland(ref w) => w.set_outer_position(position),
+        }
+    }
+
+    #[inline]
+    pub fn inner_size(&self) -> LogicalSize {
+        match self {
+            &Window::X(ref w) => w.inner_size(),
+            &Window::Wayland(ref w) => w.inner_size(),
+        }
+    }
+
+    #[inline]
+    pub fn outer_size(&self) -> LogicalSize {
+        match self {
+            &Window::X(ref w) => w.outer_size(),
+            &Window::Wayland(ref w) => w.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_inner_size(&self, dimensions: Option<LogicalSize>) {
+        match self {
+            &Window::X(ref w) => w.set_min_inner_size(dimensions),
+            &Window::Wayland(ref w) => w.set_min_inner_size(dimensions),
+        }
+    }
+
+    #[inline]
+    pub fn set_max_inner_size(&self, dimensions: Option<LogicalSize>) {
+        match self {
+            &Window::X(ref w) => w.set_max_inner_size(dimensions),
+            &Window::Wayland(ref w) => w.set_max_inner_size(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_icon(&self, cursor: CursorIcon) {
+        match self {
+            &Window::X(ref w) => w.set_cursor_icon(cursor),
+            &Window::Wayland(ref w) => w.set_cursor_icon(cursor),
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor_grab(&self, grab: bool) -> Result<(), ExternalError> {
+        match self {
+            &Window::X(ref window) => window.set_cursor_grab(grab),
+            &Window::Wayland(ref window) => window.set_cursor_grab(grab),
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor_visible(&self, visible: bool) {
+        match self {
+            &Window::X(ref window) => window.set_cursor_visible(visible),
+            &Window::Wayland(ref window) => window.set_cursor_visible(visible),
+        }
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> f64 {
+        match self {
+            &Window::X(ref w) => w.hidpi_factor(),
+            &Window::Wayland(ref w) => w.hidpi_factor() as f64,
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), ExternalError> {
+        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 fullscreen(&self) -> Option<RootMonitorHandle> {
+        match self {
+            &Window::X(ref w) => w.fullscreen(),
+            &Window::Wayland(ref w) => {
+                w.fullscreen().map(|monitor_id| {
+                    RootMonitorHandle {
+                        inner: MonitorHandle::Wayland(monitor_id),
+                    }
+                })
+            },
+        }
+    }
+
+    #[inline]
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorHandle>) {
+        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_position(&self, position: LogicalPosition) {
+        match self {
+            &Window::X(ref w) => w.set_ime_position(position),
+            &Window::Wayland(_) => (),
+        }
+    }
+
+    #[inline]
+    pub fn request_redraw(&self) {
+        match self {
+            &Window::X(ref w) => w.request_redraw(),
+            &Window::Wayland(ref w) => w.request_redraw(),
+        }
+    }
+
+    #[inline]
+    pub fn current_monitor(&self) -> RootMonitorHandle {
+        match self {
+            &Window::X(ref window) => {
+                RootMonitorHandle {
+                    inner: MonitorHandle::X(window.current_monitor()),
+                }
+            },
+            &Window::Wayland(ref window) => {
+                RootMonitorHandle {
+                    inner: MonitorHandle::Wayland(window.current_monitor()),
+                }
+            },
+        }
+    }
+
+    #[inline]
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        match self {
+            &Window::X(ref window) => {
+                window
+                    .available_monitors()
+                    .into_iter()
+                    .map(MonitorHandle::X)
+                    .collect()
+            },
+            &Window::Wayland(ref window) => {
+                window
+                    .available_monitors()
+                    .into_iter()
+                    .map(MonitorHandle::Wayland)
+                    .collect()
+            },
+        }
+    }
+
+    #[inline]
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        match self {
+            &Window::X(ref window) => MonitorHandle::X(window.primary_monitor()),
+            &Window::Wayland(ref window) => MonitorHandle::Wayland(window.primary_monitor()),
+        }
+    }
+}
+
+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 EventLoop<T: 'static> {
+    Wayland(wayland::EventLoop<T>),
+    X(x11::EventLoop<T>),
+}
+
+#[derive(Clone)]
+pub enum EventLoopProxy<T: 'static> {
+    X(x11::EventLoopProxy<T>),
+    Wayland(wayland::EventLoopProxy<T>),
+}
+
+impl<T: 'static> EventLoop<T> {
+    pub fn new() -> EventLoop<T> {
+        if let Ok(env_var) = env::var(BACKEND_PREFERENCE_ENV_VAR) {
+            match env_var.as_str() {
+                "x11" => {
+                    // TODO: propagate
+                    return EventLoop::new_x11().expect("Failed to initialize X11 backend");
+                },
+                "wayland" => {
+                    return EventLoop::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 EventLoop::new_wayland() {
+            Ok(event_loop) => return event_loop,
+            Err(err) => err,
+        };
+
+        let x11_err = match EventLoop::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<EventLoop<T>, ConnectError> {
+        wayland::EventLoop::new().map(EventLoop::Wayland)
+    }
+
+    pub fn new_x11() -> Result<EventLoop<T>, XNotSupported> {
+        X11_BACKEND
+            .lock()
+            .as_ref()
+            .map(Arc::clone)
+            .map(x11::EventLoop::new)
+            .map(EventLoop::X)
+            .map_err(|err| err.clone())
+    }
+
+    #[inline]
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        match *self {
+            EventLoop::Wayland(ref evlp) => {
+                evlp.available_monitors()
+                    .into_iter()
+                    .map(MonitorHandle::Wayland)
+                    .collect()
+            },
+            EventLoop::X(ref evlp) => {
+                evlp.x_connection()
+                    .available_monitors()
+                    .into_iter()
+                    .map(MonitorHandle::X)
+                    .collect()
+            },
+        }
+    }
+
+    #[inline]
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        match *self {
+            EventLoop::Wayland(ref evlp) => MonitorHandle::Wayland(evlp.primary_monitor()),
+            EventLoop::X(ref evlp) => MonitorHandle::X(evlp.x_connection().primary_monitor()),
+        }
+    }
+
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        match *self {
+            EventLoop::Wayland(ref evlp) => EventLoopProxy::Wayland(evlp.create_proxy()),
+            EventLoop::X(ref evlp) => EventLoopProxy::X(evlp.create_proxy()),
+        }
+    }
+
+    pub fn run_return<F>(&mut self, callback: F)
+    where
+        F: FnMut(crate::event::Event<T>, &RootELW<T>, &mut ControlFlow),
+    {
+        match *self {
+            EventLoop::Wayland(ref mut evlp) => evlp.run_return(callback),
+            EventLoop::X(ref mut evlp) => evlp.run_return(callback),
+        }
+    }
+
+    pub fn run<F>(self, callback: F) -> !
+    where
+        F: 'static + FnMut(crate::event::Event<T>, &RootELW<T>, &mut ControlFlow),
+    {
+        match self {
+            EventLoop::Wayland(evlp) => evlp.run(callback),
+            EventLoop::X(evlp) => evlp.run(callback),
+        }
+    }
+
+    #[inline]
+    pub fn is_wayland(&self) -> bool {
+        match *self {
+            EventLoop::Wayland(_) => true,
+            EventLoop::X(_) => false,
+        }
+    }
+
+    pub fn window_target(&self) -> &crate::event_loop::EventLoopWindowTarget<T> {
+        match *self {
+            EventLoop::Wayland(ref evl) => evl.window_target(),
+            EventLoop::X(ref evl) => evl.window_target(),
+        }
+    }
+}
+
+impl<T: 'static> EventLoopProxy<T> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
+        match *self {
+            EventLoopProxy::Wayland(ref proxy) => proxy.send_event(event),
+            EventLoopProxy::X(ref proxy) => proxy.send_event(event),
+        }
+    }
+}
+
+pub enum EventLoopWindowTarget<T> {
+    Wayland(wayland::EventLoopWindowTarget<T>),
+    X(x11::EventLoopWindowTarget<T>),
+}
+
+fn sticky_exit_callback<T, F>(
+    evt: Event<T>,
+    target: &RootELW<T>,
+    control_flow: &mut ControlFlow,
+    callback: &mut F,
+) where
+    F: FnMut(Event<T>, &RootELW<T>, &mut ControlFlow),
+{
+    // make ControlFlow::Exit sticky by providing a dummy
+    // control flow reference if it is already Exit.
+    let mut dummy = ControlFlow::Exit;
+    let cf = if *control_flow == ControlFlow::Exit {
+        &mut dummy
+    } else {
+        control_flow
+    };
+    // user callback
+    callback(evt, target, cf)
+}

src/platform_impl/linux/wayland/event_loop.rs

@@ -0,0 +1,685 @@
+use std::{
+    cell::RefCell,
+    collections::VecDeque,
+    fmt,
+    rc::Rc,
+    sync::{Arc, Mutex},
+    time::Instant,
+};
+
+use crate::{
+    dpi::{PhysicalPosition, PhysicalSize},
+    event::ModifiersState,
+    event_loop::{ControlFlow, EventLoopClosed, EventLoopWindowTarget as RootELW},
+    monitor::VideoMode,
+    platform_impl::platform::sticky_exit_callback,
+};
+
+use super::{window::WindowStore, WindowId};
+
+use smithay_client_toolkit::{
+    output::OutputMgr,
+    reexports::client::{
+        protocol::{wl_keyboard, wl_output, wl_pointer, wl_registry, wl_seat, wl_touch},
+        ConnectError, Display, EventQueue, GlobalEvent,
+    },
+    Environment,
+};
+
+pub struct WindowEventsSink {
+    buffer: VecDeque<(crate::event::WindowEvent, crate::window::WindowId)>,
+}
+
+impl WindowEventsSink {
+    pub fn new() -> WindowEventsSink {
+        WindowEventsSink {
+            buffer: VecDeque::new(),
+        }
+    }
+
+    pub fn send_event(&mut self, evt: crate::event::WindowEvent, wid: WindowId) {
+        self.buffer.push_back((
+            evt,
+            crate::window::WindowId(crate::platform_impl::WindowId::Wayland(wid)),
+        ));
+    }
+
+    fn empty_with<F, T>(&mut self, mut callback: F)
+    where
+        F: FnMut(crate::event::Event<T>),
+    {
+        for (evt, wid) in self.buffer.drain(..) {
+            callback(crate::event::Event::WindowEvent {
+                event: evt,
+                window_id: wid,
+            })
+        }
+    }
+}
+
+pub struct EventLoop<T: 'static> {
+    // The loop
+    inner_loop: ::calloop::EventLoop<()>,
+    // The wayland display
+    pub display: Arc<Display>,
+    // the output manager
+    pub outputs: OutputMgr,
+    // our sink, shared with some handlers, buffering the events
+    sink: Arc<Mutex<WindowEventsSink>>,
+    pending_user_events: Rc<RefCell<VecDeque<T>>>,
+    _user_source: ::calloop::Source<::calloop::channel::Channel<T>>,
+    user_sender: ::calloop::channel::Sender<T>,
+    _kbd_source: ::calloop::Source<
+        ::calloop::channel::Channel<(crate::event::WindowEvent, super::WindowId)>,
+    >,
+    window_target: RootELW<T>,
+}
+
+// A handle that can be sent across threads and used to wake up the `EventLoop`.
+//
+// We should only try and wake up the `EventLoop` if it still exists, so we hold Weak ptrs.
+#[derive(Clone)]
+pub struct EventLoopProxy<T: 'static> {
+    user_sender: ::calloop::channel::Sender<T>,
+}
+
+pub struct EventLoopWindowTarget<T> {
+    // the event queue
+    pub evq: RefCell<::calloop::Source<EventQueue>>,
+    // 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, wl_seat::WlSeat)>>>,
+    _marker: ::std::marker::PhantomData<T>,
+}
+
+impl<T: 'static> EventLoopProxy<T> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
+        self.user_sender.send(event).map_err(|_| EventLoopClosed)
+    }
+}
+
+impl<T: 'static> EventLoop<T> {
+    pub fn new() -> Result<EventLoop<T>, ConnectError> {
+        let (display, mut event_queue) = Display::connect_to_env()?;
+
+        let display = Arc::new(display);
+        let sink = Arc::new(Mutex::new(WindowEventsSink::new()));
+        let store = Arc::new(Mutex::new(WindowStore::new()));
+        let seats = Arc::new(Mutex::new(Vec::new()));
+
+        let inner_loop = ::calloop::EventLoop::new().unwrap();
+
+        let (kbd_sender, kbd_channel) = ::calloop::channel::channel();
+        let kbd_sink = sink.clone();
+        let kbd_source = inner_loop
+            .handle()
+            .insert_source(kbd_channel, move |evt, &mut ()| {
+                if let ::calloop::channel::Event::Msg((evt, wid)) = evt {
+                    kbd_sink.lock().unwrap().send_event(evt, wid);
+                }
+            })
+            .unwrap();
+
+        let mut seat_manager = SeatManager {
+            sink: sink.clone(),
+            store: store.clone(),
+            seats: seats.clone(),
+            kbd_sender,
+        };
+
+        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();
+
+        let source = inner_loop
+            .handle()
+            .insert_source(event_queue, |(), &mut ()| {})
+            .unwrap();
+
+        let pending_user_events = Rc::new(RefCell::new(VecDeque::new()));
+        let pending_user_events2 = pending_user_events.clone();
+
+        let (user_sender, user_channel) = ::calloop::channel::channel();
+
+        let user_source = inner_loop
+            .handle()
+            .insert_source(user_channel, move |evt, &mut ()| {
+                if let ::calloop::channel::Event::Msg(msg) = evt {
+                    pending_user_events2.borrow_mut().push_back(msg);
+                }
+            })
+            .unwrap();
+
+        Ok(EventLoop {
+            inner_loop,
+            sink,
+            pending_user_events,
+            display: display.clone(),
+            outputs: env.outputs.clone(),
+            _user_source: user_source,
+            user_sender,
+            _kbd_source: kbd_source,
+            window_target: RootELW {
+                p: crate::platform_impl::EventLoopWindowTarget::Wayland(EventLoopWindowTarget {
+                    evq: RefCell::new(source),
+                    store,
+                    env,
+                    cleanup_needed: Arc::new(Mutex::new(false)),
+                    seats,
+                    display,
+                    _marker: ::std::marker::PhantomData,
+                }),
+                _marker: ::std::marker::PhantomData,
+            },
+        })
+    }
+
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        EventLoopProxy {
+            user_sender: self.user_sender.clone(),
+        }
+    }
+
+    pub fn run<F>(mut self, callback: F) -> !
+    where
+        F: 'static + FnMut(crate::event::Event<T>, &RootELW<T>, &mut ControlFlow),
+    {
+        self.run_return(callback);
+        ::std::process::exit(0);
+    }
+
+    pub fn run_return<F>(&mut self, mut callback: F)
+    where
+        F: FnMut(crate::event::Event<T>, &RootELW<T>, &mut ControlFlow),
+    {
+        // send pending events to the server
+        self.display.flush().expect("Wayland connection lost.");
+
+        let mut control_flow = ControlFlow::default();
+
+        let sink = self.sink.clone();
+        let user_events = self.pending_user_events.clone();
+
+        callback(
+            crate::event::Event::NewEvents(crate::event::StartCause::Init),
+            &self.window_target,
+            &mut control_flow,
+        );
+
+        loop {
+            self.post_dispatch_triggers();
+
+            // empty buffer of events
+            {
+                let mut guard = sink.lock().unwrap();
+                guard.empty_with(|evt| {
+                    sticky_exit_callback(
+                        evt,
+                        &self.window_target,
+                        &mut control_flow,
+                        &mut callback,
+                    );
+                });
+            }
+            // empty user events
+            {
+                let mut guard = user_events.borrow_mut();
+                for evt in guard.drain(..) {
+                    sticky_exit_callback(
+                        crate::event::Event::UserEvent(evt),
+                        &self.window_target,
+                        &mut control_flow,
+                        &mut callback,
+                    );
+                }
+            }
+            // do a second run of post-dispatch-triggers, to handle user-generated "request-redraw"
+            // in response of resize & friends
+            self.post_dispatch_triggers();
+            {
+                let mut guard = sink.lock().unwrap();
+                guard.empty_with(|evt| {
+                    sticky_exit_callback(
+                        evt,
+                        &self.window_target,
+                        &mut control_flow,
+                        &mut callback,
+                    );
+                });
+            }
+            // send Events cleared
+            {
+                sticky_exit_callback(
+                    crate::event::Event::EventsCleared,
+                    &self.window_target,
+                    &mut control_flow,
+                    &mut callback,
+                );
+            }
+
+            // send pending events to the server
+            self.display.flush().expect("Wayland connection lost.");
+
+            match control_flow {
+                ControlFlow::Exit => break,
+                ControlFlow::Poll => {
+                    // non-blocking dispatch
+                    self.inner_loop
+                        .dispatch(Some(::std::time::Duration::from_millis(0)), &mut ())
+                        .unwrap();
+                    callback(
+                        crate::event::Event::NewEvents(crate::event::StartCause::Poll),
+                        &self.window_target,
+                        &mut control_flow,
+                    );
+                },
+                ControlFlow::Wait => {
+                    self.inner_loop.dispatch(None, &mut ()).unwrap();
+                    callback(
+                        crate::event::Event::NewEvents(crate::event::StartCause::WaitCancelled {
+                            start: Instant::now(),
+                            requested_resume: None,
+                        }),
+                        &self.window_target,
+                        &mut control_flow,
+                    );
+                },
+                ControlFlow::WaitUntil(deadline) => {
+                    let start = Instant::now();
+                    // compute the blocking duration
+                    let duration = if deadline > start {
+                        deadline - start
+                    } else {
+                        ::std::time::Duration::from_millis(0)
+                    };
+                    self.inner_loop.dispatch(Some(duration), &mut ()).unwrap();
+                    let now = Instant::now();
+                    if now < deadline {
+                        callback(
+                            crate::event::Event::NewEvents(
+                                crate::event::StartCause::WaitCancelled {
+                                    start,
+                                    requested_resume: Some(deadline),
+                                },
+                            ),
+                            &self.window_target,
+                            &mut control_flow,
+                        );
+                    } else {
+                        callback(
+                            crate::event::Event::NewEvents(
+                                crate::event::StartCause::ResumeTimeReached {
+                                    start,
+                                    requested_resume: deadline,
+                                },
+                            ),
+                            &self.window_target,
+                            &mut control_flow,
+                        );
+                    }
+                },
+            }
+        }
+
+        callback(
+            crate::event::Event::LoopDestroyed,
+            &self.window_target,
+            &mut control_flow,
+        );
+    }
+
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        primary_monitor(&self.outputs)
+    }
+
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        available_monitors(&self.outputs)
+    }
+
+    pub fn display(&self) -> &Display {
+        &*self.display
+    }
+
+    pub fn window_target(&self) -> &RootELW<T> {
+        &self.window_target
+    }
+}
+
+/*
+ * Private EventLoop Internals
+ */
+
+impl<T> EventLoop<T> {
+    fn post_dispatch_triggers(&mut self) {
+        let mut sink = self.sink.lock().unwrap();
+        let window_target = match self.window_target.p {
+            crate::platform_impl::EventLoopWindowTarget::Wayland(ref wt) => wt,
+            _ => unreachable!(),
+        };
+        // prune possible dead windows
+        {
+            let mut cleanup_needed = window_target.cleanup_needed.lock().unwrap();
+            if *cleanup_needed {
+                let pruned = window_target.store.lock().unwrap().cleanup();
+                *cleanup_needed = false;
+                for wid in pruned {
+                    sink.send_event(crate::event::WindowEvent::Destroyed, wid);
+                }
+            }
+        }
+        // process pending resize/refresh
+        window_target.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 = crate::dpi::LogicalSize::new(w as f64, h as f64);
+                        sink.send_event(crate::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(
+                        crate::event::WindowEvent::HiDpiFactorChanged(dpi as f64),
+                        wid,
+                    );
+                }
+                if refresh {
+                    sink.send_event(crate::event::WindowEvent::RedrawRequested, wid);
+                }
+                if closed {
+                    sink.send_event(crate::event::WindowEvent::CloseRequested, wid);
+                }
+            },
+        )
+    }
+}
+
+/*
+ * Wayland protocol implementations
+ */
+
+struct SeatManager {
+    sink: Arc<Mutex<WindowEventsSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    seats: Arc<Mutex<Vec<(u32, wl_seat::WlSeat)>>>,
+    kbd_sender: ::calloop::channel::Sender<(crate::event::WindowEvent, super::WindowId)>,
+}
+
+impl SeatManager {
+    fn add_seat(&mut self, id: u32, version: u32, registry: wl_registry::WlRegistry) {
+        use std::cmp::min;
+
+        let mut seat_data = SeatData {
+            sink: self.sink.clone(),
+            store: self.store.clone(),
+            pointer: None,
+            keyboard: None,
+            touch: None,
+            kbd_sender: self.kbd_sender.clone(),
+            modifiers_tracker: Arc::new(Mutex::new(ModifiersState::default())),
+        };
+        let seat = registry
+            .bind(min(version, 5), id, move |seat| {
+                seat.implement_closure(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) {
+        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.as_ref().version() >= 5 {
+                seat.release();
+            }
+        }
+    }
+}
+
+struct SeatData {
+    sink: Arc<Mutex<WindowEventsSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    kbd_sender: ::calloop::channel::Sender<(crate::event::WindowEvent, super::WindowId)>,
+    pointer: Option<wl_pointer::WlPointer>,
+    keyboard: Option<wl_keyboard::WlKeyboard>,
+    touch: Option<wl_touch::WlTouch>,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+}
+
+impl SeatData {
+    fn receive(&mut self, evt: wl_seat::Event, seat: 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.as_ref().version() >= 3 {
+                            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.kbd_sender.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.as_ref().version() >= 3 {
+                            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.as_ref().version() >= 3 {
+                            touch.release();
+                        }
+                    }
+                }
+            },
+            _ => unreachable!(),
+        }
+    }
+}
+
+impl Drop for SeatData {
+    fn drop(&mut self) {
+        if let Some(pointer) = self.pointer.take() {
+            if pointer.as_ref().version() >= 3 {
+                pointer.release();
+            }
+        }
+        if let Some(kbd) = self.keyboard.take() {
+            if kbd.as_ref().version() >= 3 {
+                kbd.release();
+            }
+        }
+        if let Some(touch) = self.touch.take() {
+            if touch.as_ref().version() >= 3 {
+                touch.release();
+            }
+        }
+    }
+}
+
+/*
+ * Monitor stuff
+ */
+
+pub struct MonitorHandle {
+    pub(crate) proxy: wl_output::WlOutput,
+    pub(crate) mgr: OutputMgr,
+}
+
+impl Clone for MonitorHandle {
+    fn clone(&self) -> MonitorHandle {
+        MonitorHandle {
+            proxy: self.proxy.clone(),
+            mgr: self.mgr.clone(),
+        }
+    }
+}
+
+impl fmt::Debug for MonitorHandle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorHandle {
+            name: Option<String>,
+            native_identifier: u32,
+            size: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: i32,
+        }
+
+        let monitor_id_proxy = MonitorHandle {
+            name: self.name(),
+            native_identifier: self.native_identifier(),
+            size: self.size(),
+            position: self.position(),
+            hidpi_factor: self.hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
+
+impl MonitorHandle {
+    pub fn name(&self) -> Option<String> {
+        self.mgr.with_info(&self.proxy, |_, info| {
+            format!("{} ({})", info.model, info.make)
+        })
+    }
+
+    #[inline]
+    pub fn native_identifier(&self) -> u32 {
+        self.mgr.with_info(&self.proxy, |id, _| id).unwrap_or(0)
+    }
+
+    pub fn size(&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 position(&self) -> PhysicalPosition {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.location)
+            .unwrap_or((0, 0))
+            .into()
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> i32 {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.scale_factor)
+            .unwrap_or(1)
+    }
+
+    #[inline]
+    pub fn video_modes(&self) -> impl Iterator<Item = VideoMode> {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.modes.clone())
+            .unwrap_or(vec![])
+            .into_iter()
+            .map(|x| {
+                VideoMode {
+                    size: (x.dimensions.0 as u32, x.dimensions.1 as u32),
+                    refresh_rate: (x.refresh_rate as f32 / 1000.0).round() as u16,
+                    bit_depth: 32,
+                }
+            })
+    }
+}
+
+pub fn primary_monitor(outputs: &OutputMgr) -> MonitorHandle {
+    outputs.with_all(|list| {
+        if let Some(&(_, ref proxy, _)) = list.first() {
+            MonitorHandle {
+                proxy: proxy.clone(),
+                mgr: outputs.clone(),
+            }
+        } else {
+            panic!("No monitor is available.")
+        }
+    })
+}
+
+pub fn available_monitors(outputs: &OutputMgr) -> VecDeque<MonitorHandle> {
+    outputs.with_all(|list| {
+        list.iter()
+            .map(|&(_, ref proxy, _)| {
+                MonitorHandle {
+                    proxy: proxy.clone(),
+                    mgr: outputs.clone(),
+                }
+            })
+            .collect()
+    })
+}

src/platform_impl/linux/wayland/keyboard.rs

@@ -1,114 +1,125 @@
 use std::sync::{Arc, Mutex};
 
-use super::{make_wid, DeviceId, EventsLoopProxy, EventsLoopSink};
-use sctk::keyboard::{
-    self, map_keyboard_auto_with_repeat, Event as KbEvent, KeyRepeatEvent, KeyRepeatKind,
+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 sctk::reexports::client::protocol::wl_keyboard;
-use sctk::reexports::client::{NewProxy, Proxy};
-use {ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
+
+use crate::event::{ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
 
 pub fn init_keyboard(
-    keyboard: NewProxy<wl_keyboard::WlKeyboard>,
-    sink: Arc<Mutex<EventsLoopSink>>,
-    events_loop_proxy: EventsLoopProxy,
-) -> Proxy<wl_keyboard::WlKeyboard> {
+    seat: &wl_seat::WlSeat,
+    sink: ::calloop::channel::Sender<(crate::event::WindowEvent, super::WindowId)>,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+) -> wl_keyboard::WlKeyboard {
     // { variables to be captured by the closures
     let target = Arc::new(Mutex::new(None));
     let my_sink = sink.clone();
     let repeat_sink = sink.clone();
     let repeat_target = target.clone();
+    let my_modifiers = modifiers_tracker.clone();
     // }
     let ret = map_keyboard_auto_with_repeat(
-        keyboard,
+        seat,
         KeyRepeatKind::System,
-        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 {
-                modifiers,
-                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.into(),
-                            },
-                        },
-                        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);
+        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();
+                            }
                         }
                     }
-                }
+                },
+                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 */ }
         },
         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);
-                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: repeat_event.modifiers.into(),
+                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(),
+                            },
                         },
-                    },
-                    wid,
-                );
+                        wid,
+                    ))
+                    .unwrap();
                 if let Some(txt) = repeat_event.utf8 {
                     for chr in txt.chars() {
-                        guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
+                        repeat_sink
+                            .send((WindowEvent::ReceivedCharacter(chr), wid))
+                            .unwrap();
                     }
                 }
-                events_loop_proxy.wakeup().unwrap();
             }
         },
     );
 
     match ret {
         Ok(keyboard) => keyboard,
-        Err((_, keyboard)) => {
+        Err(_) => {
             // This is a fallback impl if libxkbcommon was not available
             // This case should probably never happen, as most wayland
             // compositors _need_ libxkbcommon anyway...
@@ -120,46 +131,55 @@ pub fn init_keyboard(
             let mut target = None;
             let my_sink = sink;
             // }
-            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(),
-                                },
+            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);
                             },
-                            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();
+                                }
+                            },
+                            _ => (),
+                        }
+                    },
+                    (),
+                )
             })
-        }
+            .unwrap()
+        },
     }
 }
 
@@ -181,7 +201,7 @@ fn key_to_vkey(rawkey: u32, keysym: u32) -> Option<VirtualKeyCode> {
 }
 
 fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
-    use sctk::keyboard::keysyms;
+    use smithay_client_toolkit::keyboard::keysyms;
     match keysym {
         // letters
         keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),
@@ -226,6 +246,15 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         keysyms::XKB_KEY_F13 => Some(VirtualKeyCode::F13),
         keysyms::XKB_KEY_F14 => Some(VirtualKeyCode::F14),
         keysyms::XKB_KEY_F15 => Some(VirtualKeyCode::F15),
+        keysyms::XKB_KEY_F16 => Some(VirtualKeyCode::F16),
+        keysyms::XKB_KEY_F17 => Some(VirtualKeyCode::F17),
+        keysyms::XKB_KEY_F18 => Some(VirtualKeyCode::F18),
+        keysyms::XKB_KEY_F19 => Some(VirtualKeyCode::F19),
+        keysyms::XKB_KEY_F20 => Some(VirtualKeyCode::F20),
+        keysyms::XKB_KEY_F21 => Some(VirtualKeyCode::F21),
+        keysyms::XKB_KEY_F22 => Some(VirtualKeyCode::F22),
+        keysyms::XKB_KEY_F23 => Some(VirtualKeyCode::F23),
+        keysyms::XKB_KEY_F24 => Some(VirtualKeyCode::F24),
         // flow control
         keysyms::XKB_KEY_Print => Some(VirtualKeyCode::Snapshot),
         keysyms::XKB_KEY_Scroll_Lock => Some(VirtualKeyCode::Scroll),
@@ -294,6 +323,13 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         keysyms::XKB_KEY_KP_Separator => Some(VirtualKeyCode::NumpadComma),
         keysyms::XKB_KEY_KP_Enter => Some(VirtualKeyCode::NumpadEnter),
         keysyms::XKB_KEY_KP_Equal => Some(VirtualKeyCode::NumpadEquals),
+        keysyms::XKB_KEY_KP_Add => Some(VirtualKeyCode::Add),
+        keysyms::XKB_KEY_KP_Subtract => Some(VirtualKeyCode::Subtract),
+        keysyms::XKB_KEY_KP_Divide => Some(VirtualKeyCode::Divide),
+        keysyms::XKB_KEY_KP_Page_Up => Some(VirtualKeyCode::PageUp),
+        keysyms::XKB_KEY_KP_Page_Down => Some(VirtualKeyCode::PageDown),
+        keysyms::XKB_KEY_KP_Home => Some(VirtualKeyCode::Home),
+        keysyms::XKB_KEY_KP_End => Some(VirtualKeyCode::End),
         // => Some(VirtualKeyCode::OEM102),
         // => Some(VirtualKeyCode::Period),
         // => Some(VirtualKeyCode::Playpause),

src/platform_impl/linux/wayland/mod.rs

@@ -0,0 +1,40 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd",
+           target_os = "netbsd", target_os = "openbsd"))]
+
+pub use self::{
+    event_loop::{
+        EventLoop, EventLoopProxy, EventLoopWindowTarget, MonitorHandle, WindowEventsSink,
+    },
+    window::Window,
+};
+
+use smithay_client_toolkit::reexports::client::protocol::wl_surface;
+
+mod event_loop;
+mod keyboard;
+mod pointer;
+mod touch;
+mod window;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(usize);
+
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId(0)
+    }
+}
+
+#[inline]
+fn make_wid(s: &wl_surface::WlSurface) -> WindowId {
+    WindowId(s.as_ref().c_ptr() as usize)
+}

src/platform_impl/linux/wayland/pointer.rs

@@ -0,0 +1,217 @@
+use std::sync::{Arc, Mutex};
+
+use crate::event::{
+    ElementState, ModifiersState, MouseButton, MouseScrollDelta, TouchPhase, WindowEvent,
+};
+
+use super::{event_loop::WindowEventsSink, window::WindowStore, DeviceId};
+
+use smithay_client_toolkit::reexports::client::protocol::{
+    wl_pointer::{self, Event as PtrEvent, WlPointer},
+    wl_seat,
+};
+
+pub fn implement_pointer(
+    seat: &wl_seat::WlSeat,
+    sink: Arc<Mutex<WindowEventsSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+) -> 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_closure(
+            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: crate::event::DeviceId(
+                                        crate::platform_impl::DeviceId::Wayland(DeviceId),
+                                    ),
+                                },
+                                wid,
+                            );
+                            sink.send_event(
+                                WindowEvent::CursorMoved {
+                                    device_id: crate::event::DeviceId(
+                                        crate::platform_impl::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: crate::event::DeviceId(
+                                        crate::platform_impl::DeviceId::Wayland(DeviceId),
+                                    ),
+                                },
+                                wid,
+                            );
+                        }
+                    },
+                    PtrEvent::Motion {
+                        surface_x,
+                        surface_y,
+                        ..
+                    } => {
+                        if let Some(wid) = mouse_focus {
+                            sink.send_event(
+                                WindowEvent::CursorMoved {
+                                    device_id: crate::event::DeviceId(
+                                        crate::platform_impl::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,
+                                _ => unreachable!(),
+                            };
+                            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: crate::event::DeviceId(
+                                        crate::platform_impl::DeviceId::Wayland(DeviceId),
+                                    ),
+                                    state,
+                                    button,
+                                    modifiers: modifiers_tracker.lock().unwrap().clone(),
+                                },
+                                wid,
+                            );
+                        }
+                    },
+                    PtrEvent::Axis { axis, value, .. } => {
+                        if let Some(wid) = mouse_focus {
+                            if pointer.as_ref().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,
+                                    _ => unreachable!(),
+                                }
+                                sink.send_event(
+                                    WindowEvent::MouseWheel {
+                                        device_id: crate::event::DeviceId(
+                                            crate::platform_impl::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,
+                                    _ => unreachable!(),
+                                }
+                                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: crate::event::DeviceId(
+                                            crate::platform_impl::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: crate::event::DeviceId(
+                                            crate::platform_impl::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,
+                            _ => unreachable!(),
+                        }
+                        axis_discrete_buffer = Some((x, y));
+                        axis_state = match axis_state {
+                            TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
+                            _ => TouchPhase::Started,
+                        }
+                    },
+                    _ => unreachable!(),
+                }
+            },
+            (),
+        )
+    })
+    .unwrap()
+}

src/platform_impl/linux/wayland/touch.rs

@@ -0,0 +1,110 @@
+use std::sync::{Arc, Mutex};
+
+use crate::event::{TouchPhase, WindowEvent};
+
+use super::{event_loop::WindowEventsSink, window::WindowStore, DeviceId, WindowId};
+
+use smithay_client_toolkit::reexports::client::protocol::{
+    wl_seat,
+    wl_touch::{Event as TouchEvent, WlTouch},
+};
+
+struct TouchPoint {
+    wid: WindowId,
+    location: (f64, f64),
+    id: i32,
+}
+
+pub(crate) fn implement_touch(
+    seat: &wl_seat::WlSeat,
+    sink: Arc<Mutex<WindowEventsSink>>,
+    store: Arc<Mutex<WindowStore>>,
+) -> WlTouch {
+    let mut pending_ids = Vec::new();
+    seat.get_touch(|touch| {
+        touch.implement_closure(
+            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(crate::event::Touch {
+                                    device_id: crate::event::DeviceId(
+                                        crate::platform_impl::DeviceId::Wayland(DeviceId),
+                                    ),
+                                    phase: TouchPhase::Started,
+                                    location: (x, y).into(),
+                                    id: id as u64,
+                                }),
+                                wid,
+                            );
+                            pending_ids.push(TouchPoint {
+                                wid,
+                                location: (x, y),
+                                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(crate::event::Touch {
+                                    device_id: crate::event::DeviceId(
+                                        crate::platform_impl::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(crate::event::Touch {
+                                    device_id: crate::event::DeviceId(
+                                        crate::platform_impl::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(crate::event::Touch {
+                                    device_id: crate::event::DeviceId(
+                                        crate::platform_impl::DeviceId::Wayland(DeviceId),
+                                    ),
+                                    phase: TouchPhase::Cancelled,
+                                    location: pt.location.into(),
+                                    id: pt.id as u64,
+                                }),
+                                pt.wid,
+                            );
+                        }
+                    },
+                    _ => unreachable!(),
+                }
+            },
+            (),
+        )
+    })
+    .unwrap()
+}

src/platform_impl/linux/wayland/window.rs

@@ -0,0 +1,470 @@
+use std::{
+    collections::VecDeque,
+    io::{Seek, SeekFrom, Write},
+    sync::{Arc, Mutex, Weak},
+};
+
+use crate::{
+    dpi::{LogicalPosition, LogicalSize},
+    error::{ExternalError, NotSupportedError, OsError as RootOsError},
+    monitor::MonitorHandle as RootMonitorHandle,
+    platform_impl::{
+        MonitorHandle as PlatformMonitorHandle,
+        PlatformSpecificWindowBuilderAttributes as PlAttributes,
+    },
+    window::{CursorIcon, WindowAttributes},
+};
+
+use smithay_client_toolkit::{
+    output::OutputMgr,
+    reexports::client::{
+        protocol::{wl_seat, wl_shm, wl_subsurface, wl_surface},
+        Display, NewProxy,
+    },
+    surface::{get_dpi_factor, get_outputs},
+    window::{ConceptFrame, Event as WEvent, State as WState, Theme, Window as SWindow},
+};
+
+use super::{make_wid, EventLoopWindowTarget, MonitorHandle, WindowId};
+use crate::platform_impl::platform::wayland::event_loop::{available_monitors, primary_monitor};
+
+pub struct Window {
+    _bg_surface: wl_surface::WlSurface,
+    user_surface: wl_surface::WlSurface,
+    _user_subsurface: wl_subsurface::WlSubsurface,
+    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>>,
+    need_refresh: Arc<Mutex<bool>>,
+    fullscreen: Arc<Mutex<bool>>,
+}
+
+impl Window {
+    pub fn new<T>(
+        evlp: &EventLoopWindowTarget<T>,
+        attributes: WindowAttributes,
+        pl_attribs: PlAttributes,
+    ) -> Result<Window, RootOsError> {
+        let (width, height) = attributes.inner_size.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 bg_surface = evlp
+            .env
+            .compositor
+            .create_surface(NewProxy::implement_dummy)
+            .unwrap();
+        let user_surface = evlp.env.create_surface(move |dpi, surface| {
+            window_store.lock().unwrap().dpi_change(&surface, dpi);
+            surface.set_buffer_scale(dpi);
+        });
+        let user_subsurface = evlp
+            .env
+            .subcompositor
+            .get_subsurface(&user_surface, &bg_surface, NewProxy::implement_dummy)
+            .unwrap();
+        user_subsurface.set_desync();
+
+        let window_store = evlp.store.clone();
+        let my_surface = user_surface.clone();
+        let my_bg_surface = bg_surface.clone();
+
+        // prepare a 1px buffer to display on the root window
+        let mut pool = smithay_client_toolkit::utils::MemPool::new(&evlp.env.shm, || {}).unwrap();
+        pool.resize(4).unwrap();
+        pool.seek(SeekFrom::Start(0)).unwrap();
+        pool.write(&[0, 0, 0, 0]).unwrap();
+        pool.flush().unwrap();
+        let buffer = pool.buffer(0, 1, 1, 4, wl_shm::Format::Argb8888);
+
+        let mut frame = SWindow::<ConceptFrame>::init_from_env(
+            &evlp.env,
+            bg_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.as_ref().equals(&my_surface.as_ref()) {
+                                window.newsize = new_size;
+                                *(window.need_refresh.lock().unwrap()) = true;
+                                *(window.fullscreen.lock().unwrap()) = is_fullscreen;
+                                *(window.need_frame_refresh.lock().unwrap()) = true;
+                                if !window.configured {
+                                    // this is our first configure event, display ourselves !
+                                    window.configured = true;
+                                    my_bg_surface.attach(Some(&buffer), 0, 0);
+                                    my_bg_surface.commit();
+                                }
+                                return;
+                            }
+                        }
+                    },
+                    WEvent::Refresh => {
+                        let store = window_store.lock().unwrap();
+                        for window in &store.windows {
+                            if window.surface.as_ref().equals(&my_surface.as_ref()) {
+                                *(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.as_ref().equals(&my_surface.as_ref()) {
+                                window.closed = true;
+                                return;
+                            }
+                        }
+                    },
+                }
+            },
+        )
+        .unwrap();
+
+        if let Some(app_id) = pl_attribs.app_id {
+            frame.set_app_id(app_id);
+        }
+
+        for &(_, ref seat) in evlp.seats.lock().unwrap().iter() {
+            frame.new_seat(seat);
+        }
+
+        // Check for fullscreen requirements
+        if let Some(RootMonitorHandle {
+            inner: PlatformMonitorHandle::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);
+
+        // set title
+        frame.set_title(attributes.title);
+
+        // min-max dimensions
+        frame.set_min_size(attributes.min_inner_size.map(Into::into));
+        frame.set_max_size(attributes.max_inner_size.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));
+        let need_refresh = Arc::new(Mutex::new(true));
+
+        evlp.store.lock().unwrap().windows.push(InternalWindow {
+            closed: false,
+            newsize: None,
+            size: size.clone(),
+            need_refresh: need_refresh.clone(),
+            fullscreen: fullscreen.clone(),
+            need_frame_refresh: need_frame_refresh.clone(),
+            surface: user_surface.clone(),
+            kill_switch: kill_switch.clone(),
+            frame: Arc::downgrade(&frame),
+            current_dpi: 1,
+            new_dpi: None,
+            configured: false,
+        });
+
+        Ok(Window {
+            display: evlp.display.clone(),
+            _bg_surface: bg_surface,
+            user_surface,
+            _user_subsurface: user_subsurface,
+            frame,
+            outputs: evlp.env.outputs.clone(),
+            size,
+            kill_switch: (kill_switch, evlp.cleanup_needed.clone()),
+            need_frame_refresh,
+            need_refresh,
+            fullscreen,
+        })
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        make_wid(&self.user_surface)
+    }
+
+    pub fn set_title(&self, title: &str) {
+        self.frame.lock().unwrap().set_title(title.into());
+    }
+
+    pub fn set_visible(&self, _visible: bool) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn outer_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+        Err(NotSupportedError::new())
+    }
+
+    #[inline]
+    pub fn inner_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+        Err(NotSupportedError::new())
+    }
+
+    #[inline]
+    pub fn set_outer_position(&self, _pos: LogicalPosition) {
+        // Not possible with wayland
+    }
+
+    pub fn inner_size(&self) -> LogicalSize {
+        self.size.lock().unwrap().clone().into()
+    }
+
+    pub fn request_redraw(&self) {
+        *self.need_refresh.lock().unwrap() = true;
+    }
+
+    #[inline]
+    pub fn outer_size(&self) -> LogicalSize {
+        let (w, h) = self.size.lock().unwrap().clone();
+        // let (w, h) = super::wayland_window::add_borders(w as i32, h as i32);
+        (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_inner_size(&self, dimensions: Option<LogicalSize>) {
+        self.frame
+            .lock()
+            .unwrap()
+            .set_min_size(dimensions.map(Into::into));
+    }
+
+    #[inline]
+    pub fn set_max_inner_size(&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.user_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 fullscreen(&self) -> Option<MonitorHandle> {
+        if *(self.fullscreen.lock().unwrap()) {
+            Some(self.current_monitor())
+        } else {
+            None
+        }
+    }
+
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorHandle>) {
+        if let Some(RootMonitorHandle {
+            inner: PlatformMonitorHandle::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_icon(&self, _cursor: CursorIcon) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn set_cursor_visible(&self, _visible: bool) {
+        // TODO: This isn't possible on Wayland yet
+    }
+
+    #[inline]
+    pub fn set_cursor_grab(&self, _grab: bool) -> Result<(), ExternalError> {
+        Err(ExternalError::NotSupported(NotSupportedError::new()))
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _pos: LogicalPosition) -> Result<(), ExternalError> {
+        Err(ExternalError::NotSupported(NotSupportedError::new()))
+    }
+
+    pub fn display(&self) -> &Display {
+        &*self.display
+    }
+
+    pub fn surface(&self) -> &wl_surface::WlSurface {
+        &self.user_surface
+    }
+
+    pub fn current_monitor(&self) -> MonitorHandle {
+        let output = get_outputs(&self.user_surface).last().unwrap().clone();
+        MonitorHandle {
+            proxy: output,
+            mgr: self.outputs.clone(),
+        }
+    }
+
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        available_monitors(&self.outputs)
+    }
+
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        primary_monitor(&self.outputs)
+    }
+}
+
+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: wl_surface::WlSurface,
+    newsize: Option<(u32, u32)>,
+    size: Arc<Mutex<(u32, u32)>>,
+    need_refresh: Arc<Mutex<bool>>,
+    fullscreen: Arc<Mutex<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>,
+    configured: bool,
+}
+
+pub struct WindowStore {
+    windows: Vec<InternalWindow>,
+}
+
+impl WindowStore {
+    pub fn new() -> WindowStore {
+        WindowStore {
+            windows: Vec::new(),
+        }
+    }
+
+    pub fn find_wid(&self, surface: &wl_surface::WlSurface) -> Option<WindowId> {
+        for window in &self.windows {
+            if surface.as_ref().equals(&window.surface.as_ref()) {
+                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: &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: &wl_surface::WlSurface, new: i32) {
+        for window in &mut self.windows {
+            if surface.as_ref().equals(&window.surface.as_ref()) {
+                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,
+                ::std::mem::replace(&mut *window.need_refresh.lock().unwrap(), false),
+                ::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;
+            }
+            // avoid re-spamming the event
+            window.closed = false;
+        }
+    }
+}

src/platform_impl/linux/x11/dnd.rs

@@ -1,8 +1,10 @@
-use std::io;
-use std::sync::Arc;
-use std::path::{Path, PathBuf};
-use std::str::Utf8Error;
-use std::os::raw::*;
+use std::{
+    io,
+    os::raw::*,
+    path::{Path, PathBuf},
+    str::Utf8Error,
+    sync::Arc,
+};
 
 use percent_encoding::percent_decode;
 
@@ -127,13 +129,15 @@ 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(
@@ -146,24 +150,23 @@ 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) {
@@ -181,11 +184,8 @@ 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_impl/linux/x11/ffi.rs

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

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

@@ -1,13 +1,12 @@
-use std::ptr;
-use std::sync::Arc;
-use std::collections::HashMap;
-use std::os::raw::c_char;
+use std::{collections::HashMap, os::raw::c_char, ptr, sync::Arc};
 
 use super::{ffi, XConnection, XError};
 
-use super::inner::{close_im, ImeInner};
-use super::input_method::PotentialInputMethods;
-use super::context::{ImeContextCreationError, ImeContext};
+use super::{
+    context::{ImeContext, ImeContextCreationError},
+    inner::{close_im, ImeInner},
+    input_method::PotentialInputMethods,
+};
 
 pub unsafe fn xim_set_callback(
     xconn: &Arc<XConnection>,
@@ -17,12 +16,7 @@ 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()
 }
 
@@ -107,18 +101,14 @@ 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);
             }
@@ -137,7 +127,7 @@ unsafe fn replace_im(inner: *mut ImeInner) -> Result<(), ReplaceImError> {
     Ok(())
 }
 
-pub unsafe extern fn xim_instantiate_callback(
+pub unsafe extern "C" fn xim_instantiate_callback(
     _display: *mut ffi::Display,
     client_data: ffi::XPointer,
     // This field is unsupplied.
@@ -160,7 +150,7 @@ pub unsafe extern 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 fn xim_destroy_callback(
+pub unsafe extern "C" fn xim_destroy_callback(
     _xim: ffi::XIM,
     client_data: ffi::XPointer,
     // This field is unsupplied.

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

@@ -1,6 +1,8 @@
-use std::ptr;
-use std::sync::Arc;
-use std::os::raw::{c_short, c_void};
+use std::{
+    os::raw::{c_short, c_void},
+    ptr,
+    sync::Arc,
+};
 
 use super::{ffi, util, XConnection, XError};
 
@@ -22,7 +24,8 @@ 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.
@@ -49,7 +52,9 @@ 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_impl/linux/x11/ime/inner.rs

@@ -1,12 +1,8 @@
-use std::mem;
-use std::ptr;
-use std::sync::Arc;
-use std::collections::HashMap;
+use std::{collections::HashMap, mem, ptr, sync::Arc};
 
 use super::{ffi, XConnection, XError};
 
-use super::input_method::PotentialInputMethods;
-use super::context::ImeContext;
+use super::{context::ImeContext, input_method::PotentialInputMethods};
 
 pub unsafe fn close_im(xconn: &Arc<XConnection>, im: ffi::XIM) -> Result<(), XError> {
     (xconn.xlib.XCloseIM)(im);
@@ -33,10 +29,7 @@ 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_impl/linux/x11/ime/input_method.rs

@@ -1,9 +1,11 @@
-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 std::{
+    env,
+    ffi::{CStr, CString, IntoStringError},
+    fmt,
+    os::raw::c_char,
+    ptr,
+    sync::Arc,
+};
 
 use parking_lot::Mutex;
 
@@ -13,10 +15,7 @@ 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...
@@ -97,11 +96,9 @@ 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)(
@@ -135,15 +132,12 @@ 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(),
@@ -152,7 +146,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)
     }
 }
@@ -254,7 +248,7 @@ impl PotentialInputMethods {
     pub fn open_im(
         &mut self,
         xconn: &Arc<XConnection>,
-        callback: Option<&Fn() -> ()>,
+        callback: Option<&dyn Fn() -> ()>,
     ) -> InputMethodResult {
         use self::InputMethodResult::*;
 

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

@@ -1,19 +1,24 @@
 // 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::Arc;
-use std::sync::mpsc::{Receiver, Sender};
+use std::sync::{
+    mpsc::{Receiver, Sender},
+    Arc,
+};
 
 use super::{ffi, util, XConnection, XError};
 
-use self::inner::{close_im, ImeInner};
-use self::input_method::PotentialInputMethods;
-use self::context::{ImeContextCreationError, ImeContext};
-use self::callbacks::*;
+pub use self::context::ImeContextCreationError;
+use self::{
+    callbacks::*,
+    context::ImeContext,
+    inner::{close_im, ImeInner},
+    input_method::PotentialInputMethods,
+};
 
 pub type ImeReceiver = Receiver<(ffi::Window, i16, i16)>;
 pub type ImeSender = Sender<(ffi::Window, i16, i16)>;
@@ -36,10 +41,7 @@ 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 {
@@ -53,9 +55,12 @@ 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() {
@@ -83,19 +88,12 @@ 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_impl/linux/x11/mod.rs

@@ -0,0 +1,645 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+
+mod dnd;
+mod event_processor;
+mod events;
+pub mod ffi;
+mod ime;
+mod monitor;
+pub mod util;
+mod window;
+mod xdisplay;
+
+pub use self::{
+    monitor::MonitorHandle,
+    window::UnownedWindow,
+    xdisplay::{XConnection, XError, XNotSupported},
+};
+
+use std::{
+    cell::RefCell,
+    collections::{HashMap, HashSet, VecDeque},
+    ffi::CStr,
+    mem,
+    ops::Deref,
+    os::raw::*,
+    rc::Rc,
+    slice,
+    sync::{mpsc, Arc, Mutex, Weak},
+};
+
+use libc::{self, setlocale, LC_CTYPE};
+
+use self::{
+    dnd::{Dnd, DndState},
+    event_processor::EventProcessor,
+    ime::{Ime, ImeCreationError, ImeReceiver, ImeSender},
+};
+use crate::{
+    error::OsError as RootOsError,
+    event::{Event, WindowEvent},
+    event_loop::{ControlFlow, EventLoopClosed, EventLoopWindowTarget as RootELW},
+    platform_impl::{platform::sticky_exit_callback, PlatformSpecificWindowBuilderAttributes},
+    window::WindowAttributes,
+};
+
+pub struct EventLoopWindowTarget<T> {
+    xconn: Arc<XConnection>,
+    wm_delete_window: ffi::Atom,
+    ime_sender: ImeSender,
+    root: ffi::Window,
+    ime: RefCell<Ime>,
+    windows: RefCell<HashMap<WindowId, Weak<UnownedWindow>>>,
+    pending_redraws: Arc<Mutex<HashSet<WindowId>>>,
+    _marker: ::std::marker::PhantomData<T>,
+}
+
+pub struct EventLoop<T: 'static> {
+    inner_loop: ::calloop::EventLoop<()>,
+    _x11_source: ::calloop::Source<::calloop::generic::Generic<::calloop::generic::EventedRawFd>>,
+    _user_source: ::calloop::Source<::calloop::channel::Channel<T>>,
+    pending_user_events: Rc<RefCell<VecDeque<T>>>,
+    user_sender: ::calloop::channel::Sender<T>,
+    pending_events: Rc<RefCell<VecDeque<Event<T>>>>,
+    target: Rc<RootELW<T>>,
+}
+
+#[derive(Clone)]
+pub struct EventLoopProxy<T: 'static> {
+    user_sender: ::calloop::channel::Sender<T>,
+}
+
+impl<T: 'static> EventLoop<T> {
+    pub fn new(xconn: Arc<XConnection>) -> EventLoop<T> {
+        let root = unsafe { (xconn.xlib.XDefaultRootWindow)(xconn.display) };
+
+        let wm_delete_window = unsafe { xconn.get_atom_unchecked(b"WM_DELETE_WINDOW\0") };
+
+        let dnd = Dnd::new(Arc::clone(&xconn))
+            .expect("Failed to call XInternAtoms when initializing drag and drop");
+
+        let (ime_sender, ime_receiver) = mpsc::channel();
+        // Input methods will open successfully without setting the locale, but it won't be
+        // possible to actually commit pre-edit sequences.
+        unsafe {
+            setlocale(LC_CTYPE, b"\0".as_ptr() as *const _);
+        }
+        let ime = RefCell::new({
+            let result = Ime::new(Arc::clone(&xconn));
+            if let Err(ImeCreationError::OpenFailure(ref state)) = result {
+                panic!(format!("Failed to open input method: {:#?}", state));
+            }
+            result.expect("Failed to set input method destruction callback")
+        });
+
+        let randr_event_offset = xconn
+            .select_xrandr_input(root)
+            .expect("Failed to query XRandR extension");
+
+        let xi2ext = unsafe {
+            let mut result = XExtension {
+                opcode: mem::uninitialized(),
+                first_event_id: mem::uninitialized(),
+                first_error_id: mem::uninitialized(),
+            };
+            let res = (xconn.xlib.XQueryExtension)(
+                xconn.display,
+                b"XInputExtension\0".as_ptr() as *const c_char,
+                &mut result.opcode as *mut c_int,
+                &mut result.first_event_id as *mut c_int,
+                &mut result.first_error_id as *mut c_int,
+            );
+            if res == ffi::False {
+                panic!("X server missing XInput extension");
+            }
+            result
+        };
+
+        unsafe {
+            let mut xinput_major_ver = ffi::XI_2_Major;
+            let mut xinput_minor_ver = ffi::XI_2_Minor;
+            if (xconn.xinput2.XIQueryVersion)(
+                xconn.display,
+                &mut xinput_major_ver,
+                &mut xinput_minor_ver,
+            ) != ffi::Success as libc::c_int
+            {
+                panic!(
+                    "X server has XInput extension {}.{} but does not support XInput2",
+                    xinput_major_ver, xinput_minor_ver,
+                );
+            }
+        }
+
+        xconn.update_cached_wm_info(root);
+
+        let target = Rc::new(RootELW {
+            p: super::EventLoopWindowTarget::X(EventLoopWindowTarget {
+                ime,
+                root,
+                windows: Default::default(),
+                _marker: ::std::marker::PhantomData,
+                ime_sender,
+                xconn,
+                wm_delete_window,
+                pending_redraws: Default::default(),
+            }),
+            _marker: ::std::marker::PhantomData,
+        });
+
+        // A calloop event loop to drive us
+        let inner_loop = ::calloop::EventLoop::new().unwrap();
+
+        // Handle user events
+        let pending_user_events = Rc::new(RefCell::new(VecDeque::new()));
+        let pending_user_events2 = pending_user_events.clone();
+
+        let (user_sender, user_channel) = ::calloop::channel::channel();
+
+        let _user_source = inner_loop
+            .handle()
+            .insert_source(user_channel, move |evt, &mut ()| {
+                if let ::calloop::channel::Event::Msg(msg) = evt {
+                    pending_user_events2.borrow_mut().push_back(msg);
+                }
+            })
+            .unwrap();
+
+        // Handle X11 events
+        let pending_events: Rc<RefCell<VecDeque<_>>> = Default::default();
+
+        let mut processor = EventProcessor {
+            target: target.clone(),
+            dnd,
+            devices: Default::default(),
+            randr_event_offset,
+            ime_receiver,
+            xi2ext,
+        };
+
+        // Register for device hotplug events
+        // (The request buffer is flushed during `init_device`)
+        get_xtarget(&target)
+            .xconn
+            .select_xinput_events(root, ffi::XIAllDevices, ffi::XI_HierarchyChangedMask)
+            .queue();
+
+        processor.init_device(ffi::XIAllDevices);
+
+        // Setup the X11 event source
+        let mut x11_events =
+            ::calloop::generic::Generic::from_raw_fd(get_xtarget(&target).xconn.x11_fd);
+        x11_events.set_interest(::calloop::mio::Ready::readable());
+        let _x11_source = inner_loop
+            .handle()
+            .insert_source(x11_events, {
+                let pending_events = pending_events.clone();
+                let mut callback = move |event| {
+                    pending_events.borrow_mut().push_back(event);
+                };
+                move |evt, &mut ()| {
+                    if evt.readiness.is_readable() {
+                        // process all pending events
+                        let mut xev = unsafe { mem::uninitialized() };
+                        while unsafe { processor.poll_one_event(&mut xev) } {
+                            processor.process_event(&mut xev, &mut callback);
+                        }
+                    }
+                }
+            })
+            .unwrap();
+
+        let result = EventLoop {
+            inner_loop,
+            pending_events,
+            _x11_source,
+            _user_source,
+            user_sender,
+            pending_user_events,
+            target,
+        };
+
+        result
+    }
+
+    /// Returns the `XConnection` of this events loop.
+    #[inline]
+    pub fn x_connection(&self) -> &Arc<XConnection> {
+        &get_xtarget(&self.target).xconn
+    }
+
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        EventLoopProxy {
+            user_sender: self.user_sender.clone(),
+        }
+    }
+
+    pub(crate) fn window_target(&self) -> &RootELW<T> {
+        &self.target
+    }
+
+    pub fn run_return<F>(&mut self, mut callback: F)
+    where
+        F: FnMut(Event<T>, &RootELW<T>, &mut ControlFlow),
+    {
+        let mut control_flow = ControlFlow::default();
+        let wt = get_xtarget(&self.target);
+
+        loop {
+            // Empty the event buffer
+            {
+                let mut guard = self.pending_events.borrow_mut();
+                for evt in guard.drain(..) {
+                    sticky_exit_callback(evt, &self.target, &mut control_flow, &mut callback);
+                }
+            }
+
+            // Empty the user event buffer
+            {
+                let mut guard = self.pending_user_events.borrow_mut();
+                for evt in guard.drain(..) {
+                    sticky_exit_callback(
+                        crate::event::Event::UserEvent(evt),
+                        &self.target,
+                        &mut control_flow,
+                        &mut callback,
+                    );
+                }
+            }
+            // Empty the redraw requests
+            {
+                let mut guard = wt.pending_redraws.lock().unwrap();
+                for wid in guard.drain() {
+                    sticky_exit_callback(
+                        Event::WindowEvent {
+                            window_id: crate::window::WindowId(super::WindowId::X(wid)),
+                            event: WindowEvent::RedrawRequested,
+                        },
+                        &self.target,
+                        &mut control_flow,
+                        &mut callback,
+                    );
+                }
+            }
+            // send Events cleared
+            {
+                sticky_exit_callback(
+                    crate::event::Event::EventsCleared,
+                    &self.target,
+                    &mut control_flow,
+                    &mut callback,
+                );
+            }
+
+            // flush the X11 connection
+            unsafe {
+                (wt.xconn.xlib.XFlush)(wt.xconn.display);
+            }
+
+            match control_flow {
+                ControlFlow::Exit => break,
+                ControlFlow::Poll => {
+                    // non-blocking dispatch
+                    self.inner_loop
+                        .dispatch(Some(::std::time::Duration::from_millis(0)), &mut ())
+                        .unwrap();
+                    callback(
+                        crate::event::Event::NewEvents(crate::event::StartCause::Poll),
+                        &self.target,
+                        &mut control_flow,
+                    );
+                },
+                ControlFlow::Wait => {
+                    self.inner_loop.dispatch(None, &mut ()).unwrap();
+                    callback(
+                        crate::event::Event::NewEvents(crate::event::StartCause::WaitCancelled {
+                            start: ::std::time::Instant::now(),
+                            requested_resume: None,
+                        }),
+                        &self.target,
+                        &mut control_flow,
+                    );
+                },
+                ControlFlow::WaitUntil(deadline) => {
+                    let start = ::std::time::Instant::now();
+                    // compute the blocking duration
+                    let duration = if deadline > start {
+                        deadline - start
+                    } else {
+                        ::std::time::Duration::from_millis(0)
+                    };
+                    self.inner_loop.dispatch(Some(duration), &mut ()).unwrap();
+                    let now = std::time::Instant::now();
+                    if now < deadline {
+                        callback(
+                            crate::event::Event::NewEvents(
+                                crate::event::StartCause::WaitCancelled {
+                                    start,
+                                    requested_resume: Some(deadline),
+                                },
+                            ),
+                            &self.target,
+                            &mut control_flow,
+                        );
+                    } else {
+                        callback(
+                            crate::event::Event::NewEvents(
+                                crate::event::StartCause::ResumeTimeReached {
+                                    start,
+                                    requested_resume: deadline,
+                                },
+                            ),
+                            &self.target,
+                            &mut control_flow,
+                        );
+                    }
+                },
+            }
+        }
+
+        callback(
+            crate::event::Event::LoopDestroyed,
+            &self.target,
+            &mut control_flow,
+        );
+    }
+
+    pub fn run<F>(mut self, callback: F) -> !
+    where
+        F: 'static + FnMut(Event<T>, &RootELW<T>, &mut ControlFlow),
+    {
+        self.run_return(callback);
+        ::std::process::exit(0);
+    }
+}
+
+fn get_xtarget<T>(rt: &RootELW<T>) -> &EventLoopWindowTarget<T> {
+    if let super::EventLoopWindowTarget::X(ref target) = rt.p {
+        target
+    } else {
+        unreachable!();
+    }
+}
+
+impl<T: 'static> EventLoopProxy<T> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
+        self.user_sender.send(event).map_err(|_| EventLoopClosed)
+    }
+}
+
+struct DeviceInfo<'a> {
+    xconn: &'a XConnection,
+    info: *const ffi::XIDeviceInfo,
+    count: usize,
+}
+
+impl<'a> DeviceInfo<'a> {
+    fn get(xconn: &'a XConnection, device: c_int) -> Option<Self> {
+        unsafe {
+            let mut count = mem::uninitialized();
+            let info = (xconn.xinput2.XIQueryDevice)(xconn.display, device, &mut count);
+            xconn.check_errors().ok().and_then(|_| {
+                if info.is_null() || count == 0 {
+                    None
+                } else {
+                    Some(DeviceInfo {
+                        xconn,
+                        info,
+                        count: count as usize,
+                    })
+                }
+            })
+        }
+    }
+}
+
+impl<'a> Drop for DeviceInfo<'a> {
+    fn drop(&mut self) {
+        assert!(!self.info.is_null());
+        unsafe { (self.xconn.xinput2.XIFreeDeviceInfo)(self.info as *mut _) };
+    }
+}
+
+impl<'a> Deref for DeviceInfo<'a> {
+    type Target = [ffi::XIDeviceInfo];
+    fn deref(&self) -> &Self::Target {
+        unsafe { slice::from_raw_parts(self.info, self.count) }
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(ffi::Window);
+
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId(0)
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId(c_int);
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId(0)
+    }
+}
+
+pub struct Window(Arc<UnownedWindow>);
+
+impl Deref for Window {
+    type Target = UnownedWindow;
+    #[inline]
+    fn deref(&self) -> &UnownedWindow {
+        &*self.0
+    }
+}
+
+impl Window {
+    pub fn new<T>(
+        event_loop: &EventLoopWindowTarget<T>,
+        attribs: WindowAttributes,
+        pl_attribs: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Self, RootOsError> {
+        let window = Arc::new(UnownedWindow::new(&event_loop, attribs, pl_attribs)?);
+        event_loop
+            .windows
+            .borrow_mut()
+            .insert(window.id(), Arc::downgrade(&window));
+        Ok(Window(window))
+    }
+}
+
+impl Drop for Window {
+    fn drop(&mut self) {
+        let window = self.deref();
+        let xconn = &window.xconn;
+        unsafe {
+            (xconn.xlib.XDestroyWindow)(xconn.display, window.id().0);
+            // If the window was somehow already destroyed, we'll get a `BadWindow` error, which we don't care about.
+            let _ = xconn.check_errors();
+        }
+    }
+}
+
+/// XEvents of type GenericEvent store their actual data in an XGenericEventCookie data structure. This is a wrapper to
+/// extract the cookie from a GenericEvent XEvent and release the cookie data once it has been processed
+struct GenericEventCookie<'a> {
+    xconn: &'a XConnection,
+    cookie: ffi::XGenericEventCookie,
+}
+
+impl<'a> GenericEventCookie<'a> {
+    fn from_event<'b>(
+        xconn: &'b XConnection,
+        event: ffi::XEvent,
+    ) -> Option<GenericEventCookie<'b>> {
+        unsafe {
+            let mut cookie: ffi::XGenericEventCookie = From::from(event);
+            if (xconn.xlib.XGetEventData)(xconn.display, &mut cookie) == ffi::True {
+                Some(GenericEventCookie { xconn, cookie })
+            } else {
+                None
+            }
+        }
+    }
+}
+
+impl<'a> Drop for GenericEventCookie<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            (self.xconn.xlib.XFreeEventData)(self.xconn.display, &mut self.cookie);
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone)]
+struct XExtension {
+    opcode: c_int,
+    first_event_id: c_int,
+    first_error_id: c_int,
+}
+
+fn mkwid(w: ffi::Window) -> crate::window::WindowId {
+    crate::window::WindowId(crate::platform_impl::WindowId::X(WindowId(w)))
+}
+fn mkdid(w: c_int) -> crate::event::DeviceId {
+    crate::event::DeviceId(crate::platform_impl::DeviceId::X(DeviceId(w)))
+}
+
+#[derive(Debug)]
+struct Device {
+    name: String,
+    scroll_axes: Vec<(i32, ScrollAxis)>,
+    // For master devices, this is the paired device (pointer <-> keyboard).
+    // For slave devices, this is the master.
+    attachment: c_int,
+}
+
+#[derive(Debug, Copy, Clone)]
+struct ScrollAxis {
+    increment: f64,
+    orientation: ScrollOrientation,
+    position: f64,
+}
+
+#[derive(Debug, Copy, Clone)]
+enum ScrollOrientation {
+    Vertical,
+    Horizontal,
+}
+
+impl Device {
+    fn new<T: 'static>(el: &EventProcessor<T>, info: &ffi::XIDeviceInfo) -> Self {
+        let name = unsafe { CStr::from_ptr(info.name).to_string_lossy() };
+        let mut scroll_axes = Vec::new();
+
+        let wt = get_xtarget(&el.target);
+
+        if Device::physical_device(info) {
+            // Register for global raw events
+            let mask = ffi::XI_RawMotionMask
+                | ffi::XI_RawButtonPressMask
+                | ffi::XI_RawButtonReleaseMask
+                | ffi::XI_RawKeyPressMask
+                | ffi::XI_RawKeyReleaseMask;
+            // The request buffer is flushed when we poll for events
+            wt.xconn
+                .select_xinput_events(wt.root, info.deviceid, mask)
+                .queue();
+
+            // Identify scroll axes
+            for class_ptr in Device::classes(info) {
+                let class = unsafe { &**class_ptr };
+                match class._type {
+                    ffi::XIScrollClass => {
+                        let info = unsafe {
+                            mem::transmute::<&ffi::XIAnyClassInfo, &ffi::XIScrollClassInfo>(class)
+                        };
+                        scroll_axes.push((
+                            info.number,
+                            ScrollAxis {
+                                increment: info.increment,
+                                orientation: match info.scroll_type {
+                                    ffi::XIScrollTypeHorizontal => ScrollOrientation::Horizontal,
+                                    ffi::XIScrollTypeVertical => ScrollOrientation::Vertical,
+                                    _ => unreachable!(),
+                                },
+                                position: 0.0,
+                            },
+                        ));
+                    },
+                    _ => {},
+                }
+            }
+        }
+
+        let mut device = Device {
+            name: name.into_owned(),
+            scroll_axes,
+            attachment: info.attachment,
+        };
+        device.reset_scroll_position(info);
+        device
+    }
+
+    fn reset_scroll_position(&mut self, info: &ffi::XIDeviceInfo) {
+        if Device::physical_device(info) {
+            for class_ptr in Device::classes(info) {
+                let class = unsafe { &**class_ptr };
+                match class._type {
+                    ffi::XIValuatorClass => {
+                        let info = unsafe {
+                            mem::transmute::<&ffi::XIAnyClassInfo, &ffi::XIValuatorClassInfo>(class)
+                        };
+                        if let Some(&mut (_, ref mut axis)) = self
+                            .scroll_axes
+                            .iter_mut()
+                            .find(|&&mut (axis, _)| axis == info.number)
+                        {
+                            axis.position = info.value;
+                        }
+                    },
+                    _ => {},
+                }
+            }
+        }
+    }
+
+    #[inline]
+    fn physical_device(info: &ffi::XIDeviceInfo) -> bool {
+        info._use == ffi::XISlaveKeyboard
+            || info._use == ffi::XISlavePointer
+            || info._use == ffi::XIFloatingSlave
+    }
+
+    #[inline]
+    fn classes(info: &ffi::XIDeviceInfo) -> &[*const ffi::XIAnyClassInfo] {
+        unsafe {
+            slice::from_raw_parts(
+                info.classes as *const *const ffi::XIAnyClassInfo,
+                info.num_classes as usize,
+            )
+        }
+    }
+}

src/platform_impl/linux/x11/monitor.rs

@@ -2,15 +2,16 @@ use std::os::raw::*;
 
 use parking_lot::Mutex;
 
-use {PhysicalPosition, PhysicalSize};
-use super::{util, XConnection, XError};
-use super::ffi::{
-    RRCrtcChangeNotifyMask,
-    RROutputPropertyNotifyMask,
-    RRScreenChangeNotifyMask,
-    True,
-    Window,
-    XRRScreenResources,
+use super::{
+    ffi::{
+        RRCrtcChangeNotifyMask, RROutputPropertyNotifyMask, RRScreenChangeNotifyMask, True, Window,
+        XRRScreenResources,
+    },
+    util, XConnection, XError,
+};
+use crate::{
+    dpi::{PhysicalPosition, PhysicalSize},
+    monitor::VideoMode,
 };
 
 // Used to test XRandR < 1.5 code path. This should always be committed as false.
@@ -20,7 +21,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<MonitorId>>> = Mutex::default();
+    static ref MONITORS: Mutex<Option<Vec<MonitorHandle>>> = Mutex::default();
 }
 
 fn version_is_at_least(major: c_int, minor: c_int) -> bool {
@@ -35,13 +36,13 @@ fn version_is_at_least(major: c_int, minor: c_int) -> bool {
     }
 }
 
-pub fn invalidate_cached_monitor_list() -> Option<Vec<MonitorId>> {
+pub fn invalidate_cached_monitor_list() -> Option<Vec<MonitorHandle>> {
     // We update this lazily.
     (*MONITORS.lock()).take()
 }
 
 #[derive(Debug, Clone)]
-pub struct MonitorId {
+pub struct MonitorHandle {
     /// The actual id
     id: u32,
     /// The name of the monitor
@@ -56,20 +57,22 @@ pub struct MonitorId {
     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 MonitorId {
+impl MonitorHandle {
     fn from_repr(
         xconn: &XConnection,
         resources: *mut XRRScreenResources,
         id: u32,
         repr: util::MonitorRepr,
         primary: bool,
-    ) -> Self {
-        let (name, hidpi_factor) = unsafe { xconn.get_output_info(resources, &repr) };
-        let (dimensions, position) = unsafe { (repr.get_dimensions(), repr.get_position()) };
+    ) -> Option<Self> {
+        let (name, hidpi_factor, video_modes) = unsafe { xconn.get_output_info(resources, &repr)? };
+        let (dimensions, position) = unsafe { (repr.size(), repr.position()) };
         let rect = util::AaRect::new(position, dimensions);
-        MonitorId {
+        Some(MonitorHandle {
             id,
             name,
             hidpi_factor,
@@ -77,35 +80,41 @@ impl MonitorId {
             position,
             primary,
             rect,
-        }
+            video_modes,
+        })
     }
 
-    pub fn get_name(&self) -> Option<String> {
+    pub fn name(&self) -> Option<String> {
         Some(self.name.clone())
     }
 
     #[inline]
-    pub fn get_native_identifier(&self) -> u32 {
+    pub fn native_identifier(&self) -> u32 {
         self.id as u32
     }
 
-    pub fn get_dimensions(&self) -> PhysicalSize {
+    pub fn size(&self) -> PhysicalSize {
         self.dimensions.into()
     }
 
-    pub fn get_position(&self) -> PhysicalPosition {
+    pub fn position(&self) -> PhysicalPosition {
         self.position.into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f64 {
+    pub fn 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>) -> MonitorId {
-        let monitors = self.get_available_monitors();
+    pub fn get_monitor_for_window(&self, window_rect: Option<util::AaRect>) -> MonitorHandle {
+        let monitors = self.available_monitors();
         let default = monitors
             .get(0)
             .expect("[winit] Failed to find any monitors using XRandR.");
@@ -128,12 +137,17 @@ impl XConnection {
         matched_monitor.to_owned()
     }
 
-    fn query_monitor_list(&self) -> Vec<MonitorId> {
+    fn query_monitor_list(&self) -> Vec<MonitorHandle> {
         unsafe {
             let root = (self.xlib.XDefaultRootWindow)(self.display);
-            // WARNING: this function is supposedly very slow, on the order of hundreds of ms.
-            // Upon failure, `resources` will be null.
-            let resources = (self.xrandr.XRRGetScreenResources)(self.display, root);
+            let resources = if version_is_at_least(1, 3) {
+                (self.xrandr.XRRGetScreenResourcesCurrent)(self.display, root)
+            } else {
+                // WARNING: this function is supposedly very slow, on the order of hundreds of ms.
+                // Upon failure, `resources` will be null.
+                (self.xrandr.XRRGetScreenResources)(self.display, root)
+            };
+
             if resources.is_null() {
                 panic!("[winit] `XRRGetScreenResources` returned NULL. That should only happen if the root window doesn't exist.");
             }
@@ -146,20 +160,22 @@ 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;
-                    available.push(MonitorId::from_repr(
+                    MonitorHandle::from_repr(
                         self,
                         resources,
                         monitor_index as u32,
                         monitor.into(),
                         is_primary,
-                    ));
+                    )
+                    .map(|monitor_id| available.push(monitor_id));
                 }
                 (xrandr_1_5.XRRFreeMonitors)(monitors);
             } else {
@@ -176,13 +192,8 @@ impl XConnection {
                         let crtc = util::MonitorRepr::from(crtc);
                         let is_primary = crtc.get_output() == primary;
                         has_primary |= is_primary;
-                        available.push(MonitorId::from_repr(
-                            self,
-                            resources,
-                            crtc_id as u32,
-                            crtc,
-                            is_primary,
-                        ));
+                        MonitorHandle::from_repr(self, resources, crtc_id as u32, crtc, is_primary)
+                            .map(|monitor_id| available.push(monitor_id));
                     }
                     (self.xrandr.XRRFreeCrtcInfo)(crtc);
                 }
@@ -201,7 +212,7 @@ impl XConnection {
         }
     }
 
-    pub fn get_available_monitors(&self) -> Vec<MonitorId> {
+    pub fn available_monitors(&self) -> Vec<MonitorHandle> {
         let mut monitors_lock = MONITORS.lock();
         (*monitors_lock)
             .as_ref()
@@ -217,8 +228,8 @@ impl XConnection {
     }
 
     #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        self.get_available_monitors()
+    pub fn primary_monitor(&self) -> MonitorHandle {
+        self.available_monitors()
             .into_iter()
             .find(|monitor| monitor.primary)
             .expect("[winit] Failed to find any monitors using XRandR.")
@@ -230,13 +241,8 @@ 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.");
                 }
@@ -247,11 +253,7 @@ 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 {
@@ -259,9 +261,7 @@ 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_impl/linux/x11/util/atom.rs

@@ -1,7 +1,9 @@
-use std::collections::HashMap;
-use std::ffi::{CStr, CString};
-use std::fmt::Debug;
-use std::os::raw::*;
+use std::{
+    collections::HashMap,
+    ffi::{CStr, CString},
+    fmt::Debug,
+    os::raw::*,
+};
 
 use parking_lot::Mutex;
 
@@ -21,11 +23,9 @@ 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,